form-custom-test 3.0.214 → 3.0.216

package/dist/render.es.js

@@ -9050,6 +9050,9 @@ var fieldMixin = {
       if (!foundRef && (!this.subFormItemFlag || this.designState)) {
         foundRef = this.refList[widgetName];
       }
+      if (!foundRef) {
+        foundRef = this.refList[widgetName];
+      }
       if (!foundRef && !!showError) {
         this.$message.error(this.i18nt("render.hint.refNotFound") + widgetName);
       }
@@ -9372,7 +9375,10 @@ const _sfc_main$1e = {
     },
     rules: Array
   },
-  inject: ["getFormConfig"],
+  inject: {
+    getFormConfig: { from: "getFormConfig" },
+    getCustomSubFormFieldLabelHidden: { default: null }
+  },
   computed: {
     formConfig() {
       return this.getFormConfig();
@@ -9381,13 +9387,13 @@ const _sfc_main$1e = {
       return !!this.designer && this.field.id === this.designer.selectedId;
     },
     label() {
-      if (!!this.field.options.labelHidden) {
+      if (!!this.field.options.labelHidden || this.isParentSubFormLabelHidden) {
         return "";
       }
       return this.field.options.label;
     },
     labelWidth() {
-      if (!!this.field.options.labelHidden) {
+      if (!!this.field.options.labelHidden || this.isParentSubFormLabelHidden) {
         return 0;
       }
       if (!!this.field.options.labelWidth) {
@@ -9417,6 +9423,12 @@ const _sfc_main$1e = {
     },
     subFormItemFlag() {
       return !!this.parentWidget ? this.parentWidget.type === "sub-form" || this.parentWidget.type === "custom-sub-form" : false;
+    },
+    isParentSubFormLabelHidden() {
+      if (typeof this.getCustomSubFormFieldLabelHidden === "function") {
+        return !!this.getCustomSubFormFieldLabelHidden();
+      }
+      return false;
     }
   },
   created() {
@@ -9608,7 +9620,7 @@ function _sfc_render$1e(_ctx, _cache, $props, $setup, $data, $options) {
     ], 64)) : createCommentVNode("", true)
   ], 2);
 }
-var FormItemWrapper = /* @__PURE__ */ _export_sfc$1(_sfc_main$1e, [["render", _sfc_render$1e], ["__scopeId", "data-v-a42827ee"]]);
+var FormItemWrapper = /* @__PURE__ */ _export_sfc$1(_sfc_main$1e, [["render", _sfc_render$1e], ["__scopeId", "data-v-3cbbbdb2"]]);
 var __glob_0_8 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": FormItemWrapper
@@ -26591,13 +26603,13 @@ function registerIcon(app) {
 if (typeof window !== "undefined") {
   let loadSvg = function() {
     var body = document.body;
-    var svgDom = document.getElementById("__svg__icons__dom__1782180404758__");
+    var svgDom = document.getElementById("__svg__icons__dom__1782204519073__");
     if (!svgDom) {
       svgDom = document.createElementNS("http://www.w3.org/2000/svg", "svg");
       svgDom.style.position = "absolute";
       svgDom.style.width = "0";
       svgDom.style.height = "0";
-      svgDom.id = "__svg__icons__dom__1782180404758__";
+      svgDom.id = "__svg__icons__dom__1782204519073__";
       svgDom.setAttribute("xmlns", "http://www.w3.org/2000/svg");
       svgDom.setAttribute("xmlns:link", "http://www.w3.org/1999/xlink");
     }
@@ -34683,6 +34695,15 @@ const _sfc_main$m = {
       return this.widget.options.customClass || "";
     }
   },
+  provide() {
+    const vm = this;
+    return {
+      getCustomSubFormFieldLabelHidden() {
+        var _a, _b;
+        return !!((_b = (_a = vm.widget) == null ? void 0 : _a.options) == null ? void 0 : _b.labelHidden);
+      }
+    };
+  },
   created() {
     this.initRefList();
   },
@@ -34703,7 +34724,10 @@ const _sfc_main$m = {
   }
 };
 const _hoisted_1$j = { class: "sub-form-header" };
-const _hoisted_2$e = { class: "sub-form-label" };
+const _hoisted_2$e = {
+  key: 0,
+  class: "sub-form-label"
+};
 const _hoisted_3$b = { class: "group-header" };
 const _hoisted_4$9 = { class: "group-title" };
 const _hoisted_5$7 = {
@@ -34740,7 +34764,7 @@ function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
         onClick: _cache[1] || (_cache[1] = withModifiers(($event) => _ctx.selectWidget($props.widget), ["stop"]))
       }, [
         createElementVNode("div", _hoisted_1$j, [
-          createElementVNode("span", _hoisted_2$e, toDisplayString($props.widget.options.label || "\u81EA\u5B9A\u4E49\u5B50\u8868\u5355"), 1)
+          !$props.widget.options.labelHidden ? (openBlock(), createElementBlock("span", _hoisted_2$e, toDisplayString($props.widget.options.label || "\u81EA\u5B9A\u4E49\u5B50\u8868\u5355"), 1)) : createCommentVNode("", true)
         ]),
         (openBlock(true), createElementBlock(Fragment, null, renderList($data.previewRows, (row, rowIdx) => {
           return openBlock(), createElementBlock("div", {
@@ -34828,7 +34852,7 @@ function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["designer", "widget", "parent-widget", "parent-list", "index-of-parent-list"]);
 }
-var CustomSubFormWidget = /* @__PURE__ */ _export_sfc$1(_sfc_main$m, [["render", _sfc_render$m], ["__scopeId", "data-v-787fff1a"]]);
+var CustomSubFormWidget = /* @__PURE__ */ _export_sfc$1(_sfc_main$m, [["render", _sfc_render$m], ["__scopeId", "data-v-0d784fb7"]]);
 var customSubFormItem_vue_vue_type_style_index_0_scoped_true_lang = "";
 const _sfc_main$l = {
   name: "custom-sub-form-item",
@@ -34843,6 +34867,15 @@ const _sfc_main$l = {
     widget: Object
   },
   inject: ["refList", "sfRefList", "globalModel"],
+  provide() {
+    const vm = this;
+    return {
+      getCustomSubFormFieldLabelHidden() {
+        var _a, _b;
+        return !!((_b = (_a = vm.widget) == null ? void 0 : _a.options) == null ? void 0 : _b.labelHidden);
+      }
+    };
+  },
   data() {
     return {
       rowIdData: [],
@@ -35197,7 +35230,10 @@ const _sfc_main$l = {
     }
   }
 };
-const _hoisted_1$i = { class: "sub-form-header" };
+const _hoisted_1$i = {
+  key: 0,
+  class: "sub-form-header"
+};
 const _hoisted_2$d = { class: "sub-form-label" };
 const _hoisted_3$a = { class: "group-header" };
 const _hoisted_4$8 = { class: "group-title" };
@@ -35205,29 +35241,25 @@ const _hoisted_5$6 = {
   key: 0,
   class: "row-number-span"
 };
-const _hoisted_6$6 = {
-  key: 1,
-  class: "row-number-span"
-};
-const _hoisted_7$5 = { class: "group-actions" };
-const _hoisted_8$3 = { class: "group-content" };
-const _hoisted_9$2 = {
+const _hoisted_6$6 = { class: "group-actions" };
+const _hoisted_7$5 = { class: "group-content" };
+const _hoisted_8$3 = {
   key: 1,
   class: "field-loading",
   style: { "color": "#909399", "font-size": "12px", "padding": "8px" }
 };
-const _hoisted_10$1 = {
+const _hoisted_9$2 = {
   key: 1,
   class: "empty-hint"
 };
-const _hoisted_11 = { key: 0 };
-const _hoisted_12 = { key: 1 };
-const _hoisted_13 = {
-  key: 0,
+const _hoisted_10$1 = { key: 0 };
+const _hoisted_11 = { key: 1 };
+const _hoisted_12 = {
+  key: 1,
   class: "empty-hint"
 };
-const _hoisted_14 = {
-  key: 1,
+const _hoisted_13 = {
+  key: 2,
   class: "empty-hint"
 };
 function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
@@ -35240,9 +35272,9 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
         key: $props.widget.id,
         class: normalizeClass(["custom-sub-form-container", $options.customClass])
       }, [
-        createElementVNode("div", _hoisted_1$i, [
+        !$props.widget.options.labelHidden ? (openBlock(), createElementBlock("div", _hoisted_1$i, [
           createElementVNode("span", _hoisted_2$d, toDisplayString($props.widget.options.label || "\u81EA\u5B9A\u4E49\u5B50\u8868\u5355"), 1)
-        ]),
+        ])) : createCommentVNode("", true),
         (openBlock(true), createElementBlock(Fragment, null, renderList($data.rowIdData, (subFormRowId, sfrIdx) => {
           return openBlock(), createElementBlock("div", {
             class: "form-group-row",
@@ -35250,9 +35282,9 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
           }, [
             createElementVNode("div", _hoisted_3$a, [
               createElementVNode("div", _hoisted_4$8, [
-                $props.widget.options.showRowNumber ? (openBlock(), createElementBlock("span", _hoisted_5$6, toDisplayString($props.widget.options.label || "\u81EA\u5B9A\u4E49\u5B50\u8868\u5355") + " " + toDisplayString(sfrIdx + 1), 1)) : (openBlock(), createElementBlock("span", _hoisted_6$6, "\u8868\u5355\u7EC4"))
+                $props.widget.options.showRowNumber && !$props.widget.options.labelHidden ? (openBlock(), createElementBlock("span", _hoisted_5$6, toDisplayString($props.widget.options.label || "\u81EA\u5B9A\u4E49\u5B50\u8868\u5355") + " " + toDisplayString(sfrIdx + 1), 1)) : createCommentVNode("", true)
               ]),
-              createElementVNode("div", _hoisted_7$5, [
+              createElementVNode("div", _hoisted_6$6, [
                 sfrIdx > 0 && !$props.widget.options.disabled ? (openBlock(), createBlock(_component_el_button, {
                   key: 0,
                   size: "small",
@@ -35268,7 +35300,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
                 }, 8, ["onClick"])) : createCommentVNode("", true)
               ])
             ]),
-            createElementVNode("div", _hoisted_8$3, [
+            createElementVNode("div", _hoisted_7$5, [
               $props.widget && $props.widget.widgetList && $props.widget.widgetList.length > 0 ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList($props.widget.widgetList, (subWidget, swIdx) => {
                 return openBlock(), createElementBlock(Fragment, {
                   key: subWidget ? subWidget.id + "gc" + subFormRowId + "-" + swIdx : "gc" + subFormRowId + "-" + swIdx
@@ -35295,18 +35327,18 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
                       "sub-form-row-index": sfrIdx,
                       "sub-form-col-index": swIdx,
                       "sub-form-disabled": $props.widget.options.disabled
-                    }, null, 8, ["field", "parent-list", "index-of-parent-list", "parent-widget", "sub-form-row-id", "sub-form-row-index", "sub-form-col-index", "sub-form-disabled"])) : (openBlock(), createElementBlock("div", _hoisted_9$2, " \u5B57\u6BB5\u52A0\u8F7D\u4E2D... "))
+                    }, null, 8, ["field", "parent-list", "index-of-parent-list", "parent-widget", "sub-form-row-id", "sub-form-row-index", "sub-form-col-index", "sub-form-disabled"])) : (openBlock(), createElementBlock("div", _hoisted_8$3, " \u5B57\u6BB5\u52A0\u8F7D\u4E2D... "))
                   ], 64)) : createCommentVNode("", true)
                 ], 64);
-              }), 128)) : (openBlock(), createElementBlock("div", _hoisted_10$1, [
-                !$props.widget ? (openBlock(), createElementBlock("div", _hoisted_11, "\u7EC4\u4EF6\u672A\u521D\u59CB\u5316")) : !$props.widget.widgetList || $props.widget.widgetList.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_12, " \u8BF7\u5148\u5728\u8BBE\u8BA1\u5668\u4E2D\u62D6\u62FD\u7EC4\u4EF6\u5230\u5B50\u8868\u5355\u4E2D ")) : createCommentVNode("", true)
+              }), 128)) : (openBlock(), createElementBlock("div", _hoisted_9$2, [
+                !$props.widget ? (openBlock(), createElementBlock("div", _hoisted_10$1, "\u7EC4\u4EF6\u672A\u521D\u59CB\u5316")) : !$props.widget.widgetList || $props.widget.widgetList.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_11, " \u8BF7\u5148\u5728\u8BBE\u8BA1\u5668\u4E2D\u62D6\u62FD\u7EC4\u4EF6\u5230\u5B50\u8868\u5355\u4E2D ")) : createCommentVNode("", true)
               ]))
             ])
           ]);
         }), 128)),
-        !$props.widget.widgetList || $props.widget.widgetList.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_13, " \u8BF7\u5148\u5728\u8BBE\u8BA1\u5668\u4E2D\u62D6\u62FD\u7EC4\u4EF6\u5230\u5B50\u8868\u5355\u4E2D ")) : $data.rowIdData.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_14, ' \u70B9\u51FB"\u6DFB\u52A0"\u6309\u94AE\u6DFB\u52A0\u6570\u636E\u884C ')) : createCommentVNode("", true),
+        !$props.widget.widgetList || $props.widget.widgetList.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_12, " \u8BF7\u5148\u5728\u8BBE\u8BA1\u5668\u4E2D\u62D6\u62FD\u7EC4\u4EF6\u5230\u5B50\u8868\u5355\u4E2D ")) : $data.rowIdData.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_13, ' \u70B9\u51FB"\u6DFB\u52A0"\u6309\u94AE\u6DFB\u52A0\u6570\u636E\u884C ')) : createCommentVNode("", true),
         !$props.widget.options.disabled ? (openBlock(), createBlock(_component_el_button, {
-          key: 2,
+          key: 3,
           disabled: $data.actionDisabled,
           type: "primary",
           plain: "",
@@ -35326,7 +35358,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["widget"]);
 }
-var CustomSubFormItem = /* @__PURE__ */ _export_sfc$1(_sfc_main$l, [["render", _sfc_render$l], ["__scopeId", "data-v-6bd07e4e"]]);
+var CustomSubFormItem = /* @__PURE__ */ _export_sfc$1(_sfc_main$l, [["render", _sfc_render$l], ["__scopeId", "data-v-09af068c"]]);
 var customTableCellWidget_vue_vue_type_style_index_0_scoped_true_lang = "";
 const _sfc_main$k = {
   name: "custom-table-cell-widget",
@@ -63147,10 +63179,96 @@ function _sfc_render$a(_ctx, _cache, $props, $setup, $data, $options) {
   }, 8, ["designer", "field", "rules", "design-state", "parent-widget", "parent-list", "index-of-parent-list", "sub-form-row-index", "sub-form-col-index", "sub-form-row-id"]);
 }
 var AssetSelectWidget = /* @__PURE__ */ _export_sfc$1(_sfc_main$a, [["render", _sfc_render$a]]);
+const DEFAULT_DICT_API = "/unified-dict/sysItemDict/page";
+const DEFAULT_DICT_PARAMS = { current: 1, size: 1e4 };
+function normalizeDictRecords(records) {
+  if (!Array.isArray(records)) {
+    return {};
+  }
+  return records.reduce((prev, cur) => {
+    var _a, _b, _c, _d, _e;
+    const dictType = cur.dictType;
+    if (!dictType) {
+      return prev;
+    }
+    if (!prev[dictType]) {
+      prev[dictType] = [];
+    }
+    prev[dictType].push(__spreadValues({
+      label: (_b = (_a = cur.label) != null ? _a : cur.dictLabel) != null ? _b : "",
+      value: (_e = (_d = (_c = cur.itemValue) != null ? _c : cur.dictValue) != null ? _d : cur.value) != null ? _e : ""
+    }, cur));
+    return prev;
+  }, {});
+}
 class DictManager {
   constructor() {
     this.dictCache = {};
     this.loading = false;
+    this._loaded = false;
+    this._listeners = [];
+    this._fetchPromise = null;
+  }
+  onLoaded(fn) {
+    if (typeof fn !== "function") {
+      return () => {
+      };
+    }
+    if (this._loaded) {
+      fn(this.dictCache);
+      return () => {
+      };
+    }
+    this._listeners.push(fn);
+    return () => {
+      this._listeners = this._listeners.filter((item) => item !== fn);
+    };
+  }
+  _notifyLoaded() {
+    this._loaded = true;
+    this._listeners.forEach((fn) => {
+      try {
+        fn(this.dictCache);
+      } catch (error) {
+        console.error("[dictManager] onLoaded callback error:", error);
+      }
+    });
+  }
+  fetchFromApi(service2, options = {}) {
+    const {
+      url = DEFAULT_DICT_API,
+      params = DEFAULT_DICT_PARAMS,
+      force = false,
+      customFetch
+    } = options;
+    if (this._fetchPromise && !force) {
+      return this._fetchPromise;
+    }
+    if (this._loaded && Object.keys(this.dictCache).length > 0 && !force) {
+      return Promise.resolve(this.dictCache);
+    }
+    this.loading = true;
+    const requestPromise = typeof customFetch === "function" ? Promise.resolve().then(() => customFetch()).then((result) => {
+      if (result && !Array.isArray(result) && typeof result === "object") {
+        return result;
+      }
+      return normalizeDictRecords(Array.isArray(result) ? result : []);
+    }) : service2.post(url, params).then((res) => {
+      var _a, _b, _c, _d;
+      const records = (_d = (_c = (_b = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.records) != null ? _b : res == null ? void 0 : res.records) != null ? _c : res == null ? void 0 : res.data) != null ? _d : [];
+      return normalizeDictRecords(Array.isArray(records) ? records : []);
+    });
+    this._fetchPromise = requestPromise.then((dictData) => {
+      this.init(dictData || {});
+      this._notifyLoaded();
+      return dictData;
+    }).catch((error) => {
+      console.warn("[form-custom-test] \u5B57\u5178\u6570\u636E\u52A0\u8F7D\u5931\u8D25:", error);
+      return {};
+    }).finally(() => {
+      this.loading = false;
+    });
+    return this._fetchPromise;
   }
   init(dictData) {
     this.dictCache = dictData || {};
@@ -63203,7 +63321,6 @@ class DictManager {
     return this.mapToOptionItems(this.getDictData(dictCode));
   }
   getDictTypeOptions() {
-    console.log("this.dictCache", this.dictCache);
     return Object.keys(this.dictCache || {}).map((dictType) => ({
       label: dictType,
       value: dictType
@@ -63211,6 +63328,8 @@ class DictManager {
   }
   clear() {
     this.dictCache = {};
+    this._loaded = false;
+    this._fetchPromise = null;
     if (typeof window !== "undefined") {
       window.dictCache = {};
     }
@@ -63307,8 +63426,14 @@ const _sfc_main$9 = {
   },
   mounted() {
     this.handleOnMounted();
+    this._offDictLoaded = dictManager.onLoaded(() => {
+      this.loadDictOptions();
+    });
   },
   beforeUnmount() {
+    if (this._offDictLoaded) {
+      this._offDictLoaded();
+    }
     this.unregisterFromRefList();
   },
   methods: {
@@ -63505,7 +63630,7 @@ function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["designer", "field", "rules", "design-state", "parent-widget", "parent-list", "index-of-parent-list", "sub-form-row-index", "sub-form-col-index", "sub-form-row-id"]);
 }
-var DictSelectWidget = /* @__PURE__ */ _export_sfc$1(_sfc_main$9, [["render", _sfc_render$9], ["__scopeId", "data-v-07bda0ac"]]);
+var DictSelectWidget = /* @__PURE__ */ _export_sfc$1(_sfc_main$9, [["render", _sfc_render$9], ["__scopeId", "data-v-6f18008b"]]);
 var dictSelectDictCodeEditor_vue_vue_type_style_index_0_scoped_true_lang = "";
 const _sfc_main$8 = {
   name: "dict-select-dictCode-editor",
@@ -63534,6 +63659,15 @@ const _sfc_main$8 = {
   },
   mounted() {
     this.$nextTick(() => this.refreshDictTypeOptions());
+    this._offDictLoaded = dictManager.onLoaded(() => {
+      this.refreshDictTypeOptions();
+      this.syncOptionItemsFromDict();
+    });
+  },
+  beforeUnmount() {
+    if (this._offDictLoaded) {
+      this._offDictLoaded();
+    }
   },
   methods: {
     refreshDictTypeOptions() {
@@ -63593,7 +63727,7 @@ function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["label"]);
 }
-var DictSelectDictCodeEditor = /* @__PURE__ */ _export_sfc$1(_sfc_main$8, [["render", _sfc_render$8], ["__scopeId", "data-v-5b750108"]]);
+var DictSelectDictCodeEditor = /* @__PURE__ */ _export_sfc$1(_sfc_main$8, [["render", _sfc_render$8], ["__scopeId", "data-v-2dfeafae"]]);
 var detailDialog_vue_vue_type_style_index_0_scoped_true_lang = "";
 const _sfc_main$7 = {
   name: "detail-dialog",
@@ -65794,6 +65928,18 @@ const loadExtension = function(app) {
   registerCPEditor(app, "asset-type-assetTypeValue", "asset-type-assetTypeValue-editor", createInputTextEditor("assetTypeValue", "extension.setting.assetTypeAssetTypeValue"));
   app.component(CustomInputWidget.name, CustomInputWidget);
 };
+function setupDict(app, service2, options = {}) {
+  const dictConfig = options.dict || {};
+  app.config.globalProperties.$dictManager = dictManager;
+  app.provide("dictManager", dictManager);
+  if (typeof window !== "undefined") {
+    window.dictManager = dictManager;
+  }
+  if (dictConfig.autoLoad !== false && service2) {
+    dictManager.fetchFromApi(service2, dictConfig);
+  }
+  return dictManager;
+}
 function getElMessage(app) {
   var _a, _b, _c;
   try {
@@ -65806,7 +65952,7 @@ function getElMessage(app) {
   }
   return null;
 }
-VFormRender.install = function(app) {
+VFormRender.install = function(app, options = {}) {
   loadExtension(app);
   app.use(ContainerItems);
   registerIcon(app);
@@ -65814,11 +65960,12 @@ VFormRender.install = function(app) {
   app.config.globalProperties.$service = service$1;
   app.provide("service", service$1);
   app.provide("ElMessage", getElMessage(app));
+  setupDict(app, service$1, options);
 };
 const components = [
   VFormRender
 ];
-const install = (app) => {
+const install = (app, options = {}) => {
   loadExtension(app);
   app.use(ContainerItems);
   registerIcon(app);
@@ -65831,9 +65978,11 @@ const install = (app) => {
   if (typeof window !== "undefined") {
     window.service = service$1;
   }
+  setupDict(app, service$1, options);
 };
 var installRender = {
   install,
-  VFormRender
+  VFormRender,
+  dictManager
 };
 export { installRender as default };