cnhis-design-vue 3.1.15-beta.4 → 3.1.15-beta.5

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

@@ -1,5 +1,5 @@
-import { defineComponent, ref, computed, reactive, onMounted, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, normalizeClass, createCommentVNode, createBlock, normalizeStyle, toDisplayString, withDirectives, vShow, vModelSelect, vModelText, renderSlot, createTextVNode } from 'vue';
-import { NSpin, NCheckbox, NTooltip, NButton } from 'naive-ui';
+import { defineComponent, ref, computed, reactive, onMounted, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, normalizeClass, createCommentVNode, createBlock, normalizeStyle, toDisplayString, withDirectives, vShow, renderSlot, createTextVNode } from 'vue';
+import { NSpin, NCheckbox, NTooltip, NSelect, NInput, NInputNumber, NButton } from 'naive-ui';
 import Draggable from 'vuedraggable';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 
@@ -28,26 +28,15 @@ const _hoisted_16 = /* @__PURE__ */ createElementVNode("span", { style: { "width
 const _hoisted_17 = { class: "width-show" };
 const _hoisted_18 = { class: "width-show" };
 const _hoisted_19 = { class: "width-showed" };
-const _hoisted_20 = ["onUpdate:modelValue"];
-const _hoisted_21 = /* @__PURE__ */ createElementVNode("option", { value: "NONE" }, "\u4E0D\u56FA\u5B9A", -1);
-const _hoisted_22 = /* @__PURE__ */ createElementVNode("option", { value: "LEFT" }, "\u5DE6\u56FA\u5B9A", -1);
-const _hoisted_23 = /* @__PURE__ */ createElementVNode("option", { value: "RIGHT" }, "\u53F3\u56FA\u5B9A", -1);
-const _hoisted_24 = [
-  _hoisted_21,
-  _hoisted_22,
-  _hoisted_23
-];
-const _hoisted_25 = { class: "width-word" };
-const _hoisted_26 = ["onUpdate:modelValue"];
-const _hoisted_27 = { class: "width-showed" };
-const _hoisted_28 = ["onUpdate:modelValue"];
-const _hoisted_29 = {
+const _hoisted_20 = { class: "width-word" };
+const _hoisted_21 = { class: "width-showed" };
+const _hoisted_22 = {
   key: 0,
   class: "check-options"
 };
-const _hoisted_30 = { class: "btn-operate" };
-const _hoisted_31 = /* @__PURE__ */ createTextVNode("\u53D6\u6D88");
-const _hoisted_32 = /* @__PURE__ */ createTextVNode("\u4FDD\u5B58");
+const _hoisted_23 = { class: "btn-operate" };
+const _hoisted_24 = /* @__PURE__ */ createTextVNode("\u53D6\u6D88");
+const _hoisted_25 = /* @__PURE__ */ createTextVNode("\u4FDD\u5B58");
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "FieldSet",
   props: {
@@ -85,19 +74,34 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       isFixed: "fixedShow",
       colWidth: "columnWidth"
     };
+    const selectOptions = [
+      {
+        label: "\u4E0D\u56FA\u5B9A",
+        value: "NONE"
+      },
+      {
+        label: "\u5DE6\u56FA\u5B9A",
+        value: "LEFT"
+      },
+      {
+        label: "\u53F3\u56FA\u5B9A",
+        value: "RIGHT"
+      }
+    ];
     const settingView = ref(null);
     const realityFields = computed(() => {
       const result = props.fields ? JSON.parse(JSON.stringify(props.fields)) : [];
-      if (props.type == "old") {
-        Object.keys(fieldsMapping).forEach((key) => {
-          result.forEach((item) => {
+      Object.keys(fieldsMapping).forEach((key) => {
+        result.forEach((item) => {
+          if (props.type == "old") {
             if (Reflect.has(item, key)) {
               item[fieldsMapping[key]] = item[key];
               Reflect.deleteProperty(item, key);
             }
-          });
+          }
+          item.columnWidth = Number(item.columnWidth);
         });
-      }
+      });
       return result;
     });
     const state = reactive({
@@ -115,12 +119,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return state.fields.some((i) => Object.prototype.hasOwnProperty.call(i, key));
     };
     const hideTab = () => {
-      var _a, _b;
-      if (props.drawerDirection === "right") {
-        (_a = settingView.value) == null ? void 0 : _a.style.setProperty("margin", "auto");
-      } else {
-        (_b = settingView.value) == null ? void 0 : _b.style.setProperty("margin", "auto");
-      }
+      var _a;
+      (_a = settingView.value) == null ? void 0 : _a.style.setProperty("margin", "auto");
     };
     const getTableFields = () => {
       if (props.type == "old") {
@@ -278,31 +278,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         ]),
                         createCommentVNode(" \u56FA\u5B9A "),
                         createElementVNode("span", _hoisted_19, [
-                          withDirectives(createElementVNode("select", {
-                            "onUpdate:modelValue": ($event) => element.fixedWay = $event,
-                            class: "is-sort-style"
-                          }, _hoisted_24, 8, _hoisted_20), [
-                            [vModelSelect, element.fixedWay]
-                          ])
+                          createVNode(unref(NSelect), {
+                            value: element.fixedWay,
+                            "onUpdate:value": ($event) => element.fixedWay = $event,
+                            options: selectOptions,
+                            style: { width: "90%", display: "flex" }
+                          }, null, 8, ["value", "onUpdate:value"])
                         ]),
                         createCommentVNode(" \u81EA\u5B9A\u4E49\u6807\u9898 "),
-                        createElementVNode("span", _hoisted_25, [
-                          withDirectives(createElementVNode("input", {
-                            "onUpdate:modelValue": ($event) => element.alias = $event,
-                            class: "alias-style"
-                          }, null, 8, _hoisted_26), [
-                            [vShow, element.id != "0001"],
-                            [vModelText, element.alias]
+                        createElementVNode("span", _hoisted_20, [
+                          withDirectives(createVNode(unref(NInput), {
+                            value: element.alias,
+                            "onUpdate:value": ($event) => element.alias = $event,
+                            style: { width: "90%" }
+                          }, null, 8, ["value", "onUpdate:value"]), [
+                            [vShow, element.id != "0001"]
                           ])
                         ]),
                         createCommentVNode(" \u5217\u5BBD "),
-                        createElementVNode("span", _hoisted_27, [
-                          withDirectives(createElementVNode("input", {
-                            "onUpdate:modelValue": ($event) => element.columnWidth = $event,
-                            class: "alias-style col-width-style"
-                          }, null, 8, _hoisted_28), [
-                            [vModelText, element.columnWidth]
-                          ])
+                        createElementVNode("span", _hoisted_21, [
+                          createVNode(unref(NInputNumber), {
+                            value: element.columnWidth,
+                            "onUpdate:value": ($event) => element.columnWidth = $event,
+                            style: { width: "120px" }
+                          }, null, 8, ["value", "onUpdate:value"])
                         ])
                       ], 12, _hoisted_12)
                     ]),
@@ -310,15 +309,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   }, 8, ["list"])
                 ], 2)
               ]),
-              props.footerFlag ? (openBlock(), createElementBlock("div", _hoisted_29, [
-                createElementVNode("div", _hoisted_30, [
+              props.footerFlag ? (openBlock(), createElementBlock("div", _hoisted_22, [
+                createElementVNode("div", _hoisted_23, [
                   renderSlot(_ctx.$slots, "footer", {}, () => [
                     createVNode(unref(NButton), {
                       style: { "margin-right": "8px" },
                       onClick: onCancle
                     }, {
                       default: withCtx(() => [
-                        _hoisted_31
+                        _hoisted_24
                       ]),
                       _: 1
                     }),
@@ -327,7 +326,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       onClick: handleFieldSave
                     }, {
                       default: withCtx(() => [
-                        _hoisted_32
+                        _hoisted_25
                       ]),
                       _: 1
                     })