cnhis-design-vue 3.1.18-beta.0 → 3.1.18-beta.10

package/es/components/field-set/index.js

@@ -1,10 +1 @@
-import { COMPONENT_NAMESPACE } from '../../shared/global/variable.js';
-import { safeComponentRegister } from '../../shared/utils/index.js';
-import script from './src/FieldSet.js';
-
-const FieldSet = script;
-FieldSet.install = function(app) {
-  safeComponentRegister(app, FieldSet, COMPONENT_NAMESPACE + "FieldSet");
-};
-
-export { FieldSet as default };
+export { default } from './index2.js';

package/es/components/field-set/index2.js

@@ -0,0 +1,10 @@
+import { COMPONENT_NAMESPACE } from '../../shared/global/variable2.js';
+import { safeComponentRegister } from '../../shared/utils/index2.js';
+import script from './src/FieldSet.js';
+
+const FieldSet = script;
+FieldSet.install = function(app) {
+  safeComponentRegister(app, FieldSet, COMPONENT_NAMESPACE + "FieldSet");
+};
+
+export { FieldSet as default };

package/es/components/field-set/src/FieldSet.js

@@ -36,15 +36,15 @@ const _hoisted_18 = /* @__PURE__ */ createElementVNode("span", {
 const _hoisted_19 = /* @__PURE__ */ createElementVNode("span", null, "\u62D6\u62FD\u8C03\u6574\u987A\u5E8F", -1);
 const _hoisted_20 = /* @__PURE__ */ createElementVNode("span", { style: { "width": "14px", "margin-right": "6px" } }, null, -1);
 const _hoisted_21 = { class: "width-show" };
-const _hoisted_22 = { class: "width-show" };
-const _hoisted_23 = {
+const _hoisted_22 = {
   key: 0,
   class: "width-show"
 };
-const _hoisted_24 = {
+const _hoisted_23 = {
   key: 1,
   class: "width-show"
 };
+const _hoisted_24 = { class: "width-show" };
 const _hoisted_25 = { class: "width-showed" };
 const _hoisted_26 = { class: "width-word" };
 const _hoisted_27 = { class: "width-showed" };
@@ -86,7 +86,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       columnName: "name",
       isShow: "show",
       isSort: "sort",
-      isFixed: "fixedShow",
+      isFixed: "fixedWay",
       colWidth: "columnWidth"
     };
     const selectOptions = [
@@ -110,11 +110,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         result.forEach((item) => {
           if (props.type == "old") {
             if (Reflect.has(item, key)) {
-              item[fieldsMapping[key]] = item[key];
+              if (key == "isFixed") {
+                item["fixedWay"] = item[key] == 1 ? "LEFT" : item[key] == 2 ? "RIGHT" : "NONE";
+              } else {
+                item[fieldsMapping[key]] = item[key];
+              }
               Reflect.deleteProperty(item, key);
             }
           }
-          item.columnWidth = Number(item.columnWidth);
+          item.columnWidth = +item.columnWidth;
+          if (!Reflect.has(item, "alias")) {
+            item.alias = "";
+          }
         });
       });
       return result;
@@ -151,7 +158,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               visible: item.show,
               sequence: i,
               sortable: item.sort,
-              title: item.alias || item.title,
+              title: item.alias,
               fixed: item.fixedWay,
               minWidth: item.columnWidth,
               ...props.isEdit ? {
@@ -317,18 +324,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                             [vShow, element.id != "0001"]
                           ])
                         ]),
-                        createCommentVNode(" \u6392\u5E8F "),
-                        createElementVNode("span", _hoisted_22, [
-                          withDirectives(createVNode(unref(NCheckbox), {
-                            checked: element.sort,
-                            "onUpdate:checked": ($event) => element.sort = $event,
-                            disabled: element.notParticipatingSort == 1
-                          }, null, 8, ["checked", "onUpdate:checked", "disabled"]), [
-                            [vShow, element.id != "0001"]
-                          ])
-                        ]),
                         createCommentVNode(" \u662F\u5426\u53EF\u7F16\u8F91 "),
-                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_23, [
+                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_22, [
                           withDirectives(createVNode(unref(NCheckbox), {
                             checked: element.editable,
                             "onUpdate:checked": ($event) => element.editable = $event
@@ -337,7 +334,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           ])
                         ])) : createCommentVNode("v-if", true),
                         createCommentVNode(" \u662F\u5426\u5FC5\u586B "),
-                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_24, [
+                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_23, [
                           withDirectives(createVNode(unref(NCheckbox), {
                             checked: element.required,
                             "onUpdate:checked": ($event) => element.required = $event
@@ -345,6 +342,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                             [vShow, element.id != "0001"]
                           ])
                         ])) : createCommentVNode("v-if", true),
+                        createCommentVNode(" \u6392\u5E8F "),
+                        createElementVNode("span", _hoisted_24, [
+                          withDirectives(createVNode(unref(NCheckbox), {
+                            checked: element.sort,
+                            "onUpdate:checked": ($event) => element.sort = $event,
+                            disabled: element.notParticipatingSort == 1
+                          }, null, 8, ["checked", "onUpdate:checked", "disabled"]), [
+                            [vShow, element.id != "0001"]
+                          ])
+                        ]),
                         createCommentVNode(" \u56FA\u5B9A "),
                         createElementVNode("span", _hoisted_25, [
                           createVNode(unref(NSelect), {