cnhis-design-vue 3.1.14-beta.1 → 3.1.14-beta.11.1

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

@@ -1,20 +1,343 @@
-import { defineComponent, openBlock, createElementBlock, Fragment, createCommentVNode, createBlock, normalizeProps, mergeProps } from 'vue';
-import './OldFieldSet.js';
-import './NewFieldSet.js';
-import script$1 from './OldFieldSet.vue_vue_type_script_setup_true_lang.js';
-import script$2 from './NewFieldSet.vue_vue_type_script_setup_true_lang.js';
+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 Draggable from 'vuedraggable';
 
+const _hoisted_1 = { class: "fields-set-content" };
+const _hoisted_2 = { class: "fields-table" };
+const _hoisted_3 = /* @__PURE__ */ createElementVNode("span", {
+  class: "width-show",
+  style: { "width": "4%" }
+}, null, -1);
+const _hoisted_4 = /* @__PURE__ */ createElementVNode("span", { class: "width-large" }, "\u6240\u6709\u5B57\u6BB5", -1);
+const _hoisted_5 = { class: "width-show" };
+const _hoisted_6 = /* @__PURE__ */ createTextVNode(" \u663E\u793A ");
+const _hoisted_7 = { class: "width-show" };
+const _hoisted_8 = /* @__PURE__ */ createTextVNode(" \u6392\u5E8F ");
+const _hoisted_9 = /* @__PURE__ */ createElementVNode("span", { class: "width-showed" }, "\u56FA\u5B9A", -1);
+const _hoisted_10 = /* @__PURE__ */ createElementVNode("span", { class: "width-word" }, "\u81EA\u5B9A\u4E49\u6807\u9898", -1);
+const _hoisted_11 = /* @__PURE__ */ createElementVNode("span", { class: "width-showed" }, "\u5217\u5BBD", -1);
+const _hoisted_12 = ["onClick"];
+const _hoisted_13 = { class: "width-show drag-icon-wrap" };
+const _hoisted_14 = /* @__PURE__ */ createElementVNode("span", {
+  class: "iconfont icon-a-menzhenyishengzhanxitongtubiaotuozhuai",
+  style: { "color": "#000" }
+}, null, -1);
+const _hoisted_15 = /* @__PURE__ */ createElementVNode("span", null, "\u62D6\u62FD\u8C03\u6574\u987A\u5E8F", -1);
+const _hoisted_16 = /* @__PURE__ */ createElementVNode("span", { style: { "width": "14px", "margin-right": "6px" } }, null, -1);
+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 = {
+  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");
 var script = /* @__PURE__ */ defineComponent({
   __name: "FieldSet",
   props: {
-    type: { type: String, required: false, default: "old" }
+    fields: {
+      type: Array,
+      default: function() {
+        return [];
+      }
+    },
+    menuSource: {
+      type: String,
+      default: ""
+    },
+    drawerDirection: {
+      type: String,
+      default: "right"
+    },
+    footerFlag: {
+      type: Boolean,
+      default: true
+    },
+    type: {
+      type: String,
+      default: "old"
+    }
   },
-  setup(__props) {
+  emits: ["onSave", "onClose"],
+  setup(__props, { expose, emit }) {
+    const props = __props;
+    const fieldsMapping = {
+      sid: "id",
+      columnName: "name",
+      isShow: "show",
+      isSort: "sort",
+      isFixed: "fixedShow",
+      colWidth: "columnWidth"
+    };
+    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) => {
+            if (Reflect.has(item, key)) {
+              item[fieldsMapping[key]] = item[key];
+              Reflect.deleteProperty(item, key);
+            }
+          });
+        });
+      }
+      return result;
+    });
+    const state = reactive({
+      spinning: false,
+      isCustomSearch: true,
+      clickItem: {},
+      fields: realityFields.value
+    });
+    const leftStyle = (ele) => {
+      return {
+        background: state.clickItem.id === ele.id ? "#f2f2f2" : void 0
+      };
+    };
+    const showCheckBox = (key) => {
+      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");
+      }
+    };
+    const getTableFields = () => {
+      if (props.type == "old") {
+        let tableFields = [];
+        if (state.fields.length > 0) {
+          state.fields.forEach((item, i) => {
+            tableFields.push({
+              id: item.id,
+              field: item.name,
+              visible: item.show,
+              sequence: i,
+              sortable: item.sort,
+              title: item.alias || item.title,
+              fixed: item.fixedWay,
+              minWidth: item.columnWidth
+            });
+          });
+        }
+        return tableFields;
+      } else {
+        return state.fields;
+      }
+    };
+    const handleFieldSave = () => {
+      emit("onSave", { tableFields: getTableFields() });
+    };
+    const onCancle = () => {
+      emit("onClose");
+    };
+    const calculateCheck = (key) => {
+      if (!state.fields.length)
+        return false;
+      return state.fields.every((i) => {
+        if (!Object.prototype.hasOwnProperty.call(i, key))
+          return true;
+        return i[key];
+      });
+    };
+    const handleAllCheck = (e, key) => {
+      const value = e;
+      const data = state.fields.map((i) => {
+        if (Object.prototype.hasOwnProperty.call(i, key)) {
+          i[key] = value;
+        }
+        return i;
+      });
+      state.fields = data;
+    };
+    const handleFieldClick = (item) => {
+      state.clickItem = item;
+    };
+    onMounted(() => {
+      hideTab();
+    });
+    expose({
+      getTableFields
+    });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock(Fragment, null, [
-        createCommentVNode(' <component :is="currentComp"></component> '),
-        __props.type == "old" ? (openBlock(), createBlock(script$1, normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), null, 16)) : (openBlock(), createBlock(script$2, normalizeProps(mergeProps({ key: 1 }, _ctx.$attrs)), null, 16))
-      ], 2112);
+      return openBlock(), createElementBlock("div", {
+        ref_key: "settingView",
+        ref: settingView,
+        class: "c-field-set"
+      }, [
+        createVNode(unref(NSpin), {
+          show: state.spinning,
+          tip: "...",
+          style: { "width": "100%", "height": "100%" }
+        }, {
+          default: withCtx(() => [
+            createElementVNode("div", _hoisted_1, [
+              createElementVNode("div", _hoisted_2, [
+                createElementVNode("div", {
+                  class: normalizeClass(["setting-title", { "seting-title-api": !state.isCustomSearch }])
+                }, [
+                  _hoisted_3,
+                  createCommentVNode(" \u5B57\u6BB5\u540D\u79F0 "),
+                  _hoisted_4,
+                  createCommentVNode(" \u663E\u793A "),
+                  createElementVNode("span", _hoisted_5, [
+                    showCheckBox("show") ? (openBlock(), createBlock(unref(NCheckbox), {
+                      key: 0,
+                      checked: calculateCheck("show"),
+                      "onUpdate:checked": _cache[0] || (_cache[0] = ($event) => handleAllCheck($event, "show"))
+                    }, null, 8, ["checked"])) : createCommentVNode("v-if", true),
+                    _hoisted_6
+                  ]),
+                  createCommentVNode(" \u6392\u5E8F "),
+                  createElementVNode("span", _hoisted_7, [
+                    showCheckBox("sort") ? (openBlock(), createBlock(unref(NCheckbox), {
+                      key: 0,
+                      checked: calculateCheck("sort"),
+                      "onUpdate:checked": _cache[1] || (_cache[1] = ($event) => handleAllCheck($event, "sort"))
+                    }, null, 8, ["checked"])) : createCommentVNode("v-if", true),
+                    _hoisted_8
+                  ]),
+                  createCommentVNode(" \u56FA\u5B9A "),
+                  _hoisted_9,
+                  createCommentVNode(" \u81EA\u5B9A\u4E49\u6807\u9898 "),
+                  _hoisted_10,
+                  createCommentVNode(" \u5217\u5BBD "),
+                  _hoisted_11
+                ], 2),
+                createElementVNode("div", {
+                  ref: "setShow",
+                  class: normalizeClass(["set-show", { "set-show-api": !state.isCustomSearch }])
+                }, [
+                  createVNode(unref(Draggable), {
+                    list: state.fields,
+                    animation: "150",
+                    "item-key": "id",
+                    tag: "ul"
+                  }, {
+                    item: withCtx(({ element }) => [
+                      createElementVNode("li", {
+                        class: "left-style",
+                        style: normalizeStyle(leftStyle(element)),
+                        onClick: ($event) => handleFieldClick(element)
+                      }, [
+                        createElementVNode("span", _hoisted_13, [
+                          createVNode(unref(NTooltip), { trigger: "hover" }, {
+                            trigger: withCtx(() => [
+                              _hoisted_14
+                            ]),
+                            default: withCtx(() => [
+                              _hoisted_15
+                            ]),
+                            _: 1
+                          })
+                        ]),
+                        createCommentVNode(" \u5B57\u6BB5\u540D\u79F0 "),
+                        createElementVNode("span", {
+                          class: normalizeClass(["width-large title-item", { blue: element.extraField }])
+                        }, [
+                          _hoisted_16,
+                          createElementVNode("span", null, toDisplayString(element.title), 1)
+                        ], 2),
+                        createCommentVNode(" \u663E\u793A "),
+                        createElementVNode("span", _hoisted_17, [
+                          withDirectives(createVNode(unref(NCheckbox), {
+                            checked: element.show,
+                            "onUpdate:checked": ($event) => element.show = $event
+                          }, null, 8, ["checked", "onUpdate:checked"]), [
+                            [vShow, element.id != "0001"]
+                          ])
+                        ]),
+                        createCommentVNode(" \u6392\u5E8F "),
+                        createElementVNode("span", _hoisted_18, [
+                          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_19, [
+                          withDirectives(createElementVNode("select", {
+                            "onUpdate:modelValue": ($event) => element.fixedWay = $event,
+                            class: "is-sort-style"
+                          }, _hoisted_24, 8, _hoisted_20), [
+                            [vModelSelect, element.fixedWay]
+                          ])
+                        ]),
+                        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]
+                          ])
+                        ]),
+                        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]
+                          ])
+                        ])
+                      ], 12, _hoisted_12)
+                    ]),
+                    _: 1
+                  }, 8, ["list"])
+                ], 2)
+              ]),
+              props.footerFlag ? (openBlock(), createElementBlock("div", _hoisted_29, [
+                createElementVNode("div", _hoisted_30, [
+                  renderSlot(_ctx.$slots, "footer", {}, () => [
+                    createVNode(unref(NButton), {
+                      style: { "margin-right": "8px" },
+                      onClick: onCancle
+                    }, {
+                      default: withCtx(() => [
+                        _hoisted_31
+                      ]),
+                      _: 1
+                    }),
+                    createVNode(unref(NButton), {
+                      type: "primary",
+                      onClick: handleFieldSave
+                    }, {
+                      default: withCtx(() => [
+                        _hoisted_32
+                      ]),
+                      _: 1
+                    })
+                  ])
+                ])
+              ])) : createCommentVNode("v-if", true)
+            ])
+          ]),
+          _: 3
+        }, 8, ["show"])
+      ], 512);
     };
   }
 });

package/es/packages/form-render/index.d.ts

@@ -409,7 +409,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     }[]>;
     formHeight: import("vue").ComputedRef<any>;
     scrollTo: (id: string) => Promise<void>;
-    onScroll: () => Promise<void>;
+    onScroll: () => void;
     bindInfo: (info: import("../../../es/src/types").AnyObject) => import("../../../es/src/types").AnyObject;
     queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("./src/types").FieldItem[]) => Promise<{
         widgetElement: HTMLInputElement | null | undefined;

package/es/packages/form-render/src/FormRender.vue.d.ts

@@ -409,7 +409,7 @@ declare const _default: import("vue").DefineComponent<{
     }[]>;
     formHeight: import("vue").ComputedRef<any>;
     scrollTo: (id: string) => Promise<void>;
-    onScroll: () => Promise<void>;
+    onScroll: () => void;
     bindInfo: (info: AnyObject) => AnyObject;
     queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: FieldItem[]) => Promise<{
         widgetElement: HTMLInputElement | null | undefined;

package/es/packages/form-render/src/components/renderer/cascader.d.ts

@@ -8,7 +8,7 @@ declare type DependKeyObj = {
 declare type UrlConfig = {
     method: FormRequestType;
     nameKey: string;
-    dependKey: ArrayAble<string> | ArrayAble<DependKeyObj>;
+    dependKey: ArrayAble<string> | Record<string, string> | ArrayAble<DependKeyObj>;
     url: string;
     valueKey: string;
 };
@@ -17,7 +17,7 @@ export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
-    deep: {
+    depth: {
         type: (NumberConstructor | StringConstructor)[];
         required: true;
     };
@@ -34,7 +34,7 @@ export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
-    deep: {
+    depth: {
         type: (NumberConstructor | StringConstructor)[];
         required: true;
     };

package/es/packages/form-render/src/components/renderer/cascader.js

@@ -1,8 +1,8 @@
 import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
-import { isObject, isString } from 'lodash-es';
+import { isEqual } from 'lodash-es';
 import { InjectAsyncQueue } from '../../constants/index.js';
-import { assignUpdateValue, formRenderLog, arrayed } from '../../utils/index.js';
+import { assignUpdateValue, traverseDependKey } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCascader } from 'naive-ui';
 import { useFormField } from '../../hooks/useFormField.js';
@@ -14,7 +14,7 @@ const script = defineComponent({
       type: Array,
       default: () => []
     },
-    deep: {
+    depth: {
       type: [Number, String],
       required: true
     },
@@ -32,59 +32,41 @@ const script = defineComponent({
     slots,
     emit
   }) {
-    const _options = ref(null);
+    const remoteOptions = ref(null);
     const asyncQueue = inject(InjectAsyncQueue);
     const {
       field,
       title
     } = useFormField();
     async function fetchData(option) {
-      if (!option && _options.value)
+      if (!option && remoteOptions.value)
         return;
-      const config = props.urlConfig;
-      if (!config)
+      if (!configFor(props))
         return;
-      if (!isObject(config)) {
-        formRenderLog(`invalid urlConfig (${config}) in CASCADER => ${title.value}`, "warn");
+      if (deepFor(option) + 1 >= deepFor(props))
         return;
-      }
-      if (deepFor(option) + 1 >= props.deep)
-        return;
-      let data = await asyncQueue.addAsync({
-        ...createRequestParams(deepFor(option), config, option),
-        key: title.value
-      });
-      if (!Array.isArray(data)) {
-        data = [];
-      }
-      if (!data.length && isObject(option)) {
+      const data = await asyncQueue.addAsync(createRequestParams(deepFor(option), configFor(props), title.value, option));
+      if (!data.length && option) {
         option.isLeaf = true;
         updateValue(null, null, getOptionChain(option));
         show.value = false;
         return;
       }
       const result = data.map((item) => optionNormalize(item, deepFor(option)));
-      option ? option.children = result : _options.value = result;
-      function deepFor(option2) {
-        var _a;
-        return (_a = option2 == null ? void 0 : option2.depth) != null ? _a : -1;
-      }
-      function createRequestParams(deep, config2, option2) {
+      option ? option.children = result : remoteOptions.value = result;
+      function createRequestParams(deep, config, key, option2) {
         const params = {
           lvlnr: deep + 1 + ""
         };
-        if (option2 && config2.dependKey) {
-          arrayed(config2.dependKey).forEach((key) => {
-            if (isString(key)) {
-              params[key] = option2[valueKey.value];
-            } else if (isObject(key)) {
-              params[key.paramName] = option2[key.paramValue];
-            }
+        if (option2 && config.dependKey) {
+          traverseDependKey(config.dependKey, (dependKey, valueKey2) => {
+            params[valueKey2] = option2[dependKey];
           });
         }
         return {
           params,
-          ...config2
+          ...config,
+          key
         };
       }
       function getOptionChain(option2) {
@@ -96,30 +78,39 @@ const script = defineComponent({
         }
         return result2;
       }
-      function optionNormalize(data2, deep) {
+      function optionNormalize(data2, depth) {
         return {
           [labelKey.value]: data2[labelKey.value],
           [valueKey.value]: data2[valueKey.value],
-          depth: deep + 1,
+          depth: depth + 1,
           parent: option,
-          isLeaf: deep + 2 >= props.deep
+          isLeaf: depth + 2 >= deepFor(props)
         };
       }
+      function configFor(target) {
+        return target.urlConfig;
+      }
+      function deepFor(target) {
+        var _a;
+        return (_a = target == null ? void 0 : target.depth) != null ? _a : -1;
+      }
     }
-    const renderOptions = computed(() => {
-      return _options.value || props.options || [];
+    const parsedOptions = computed(() => {
+      return remoteOptions.value || props.options || [];
     });
     watch(() => props.value, (n, o) => {
       var _a, _b;
-      if (n != null && o == null) {
-        fetchData();
-      }
-      if (isField(field.value) && field.value.visited) {
-        (_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a);
-      }
+      n != null && o == null && fetchData();
+      isField(field.value) && field.value.visited && ((_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a));
     }, {
       immediate: true
     });
+    watch(() => props.urlConfig, async (config, oldConfig) => {
+      if (isEqual(config, oldConfig))
+        return;
+      remoteOptions.value = null;
+      await fetchData();
+    });
     const labelKey = computed(() => {
       var _a, _b;
       return (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text";
@@ -131,13 +122,11 @@ const script = defineComponent({
     const _value = computed(() => {
       try {
         const parsed = Array.isArray(props.value) ? props.value : JSON.parse(props.value || "");
-        if (Array.isArray(parsed)) {
-          return parsed.map((option) => option[labelKey.value]).join(" / ");
-        } else {
-          return [];
-        }
+        if (!Array.isArray(parsed) || !parsed.length)
+          return null;
+        return parsed.map((option) => option[labelKey.value]).join(" / ");
       } catch (e) {
-        return "";
+        return null;
       }
     });
     function updateValue(_, __, options) {
@@ -172,7 +161,7 @@ const script = defineComponent({
         "remote": true,
         "labelField": labelKey.value,
         "valueField": valueKey.value,
-        "options": renderOptions.value,
+        "options": parsedOptions.value,
         "checkStrategy": "child",
         "onLoad": fetchData,
         "onFocus": focusDecorator(props.onFocus),