@fecp/designer 5.5.79 → 5.5.80

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.5.79";
+const version = "5.5.80";
 const packageJson = {
   version
 };

package/es/designer/src/packages/dataLinkage/index.vue.mjs

@@ -16,7 +16,7 @@ import "../../../../node_modules/element-plus/theme-chalk/el-tab-pane.css.mjs";
 /* empty css                                                              */
 /* empty css                                                             */
 /* empty css                                                               */
-import { computed, ref, watch, createElementBlock, openBlock, Fragment, createVNode, withCtx, unref, isRef, renderList, createBlock, createElementVNode, createCommentVNode, createTextVNode, toDisplayString } from "vue";
+import { getCurrentInstance, computed, ref, watch, createElementBlock, openBlock, Fragment, createVNode, withCtx, unref, isRef, renderList, createBlock, createElementVNode, createCommentVNode, createTextVNode, toDisplayString } from "vue";
 import { Plus as plus_default } from "../../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
 import { useAdvancedFilterDialog } from "../advancedFilter/useAdvancedFilterDialog.mjs";
 import { getEditConfigDataFields, getEditConfigData, cloneDeep } from "../utils/common.mjs";
@@ -31,6 +31,7 @@ import "../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.mjs
 /* empty css                                         */
 import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";
 /* empty css                                   */
+import api from "../../api/index.mjs";
 /* empty css                                                              */
 /* empty css                                                                */
 /* empty css                                */
@@ -69,20 +70,35 @@ const _hoisted_14 = { class: "field-name" };
 const _hoisted_15 = { class: "field-value-display" };
 const _hoisted_16 = {
   key: 1,
+  class: "field-assignments-display"
+};
+const _hoisted_17 = { class: "field-name" };
+const _hoisted_18 = { class: "field-value-display" };
+const _hoisted_19 = {
+  key: 2,
   class: "field-value-item"
 };
-const _hoisted_17 = {
+const _hoisted_20 = {
   key: 1,
   class: "tab-empty-state"
 };
-const _hoisted_18 = { class: "advanced-title" };
-const _hoisted_19 = { key: 0 };
-const _hoisted_20 = {
+const _hoisted_21 = { class: "advanced-title" };
+const _hoisted_22 = { key: 0 };
+const _hoisted_23 = {
   key: 1,
   class: "field-assignment-area"
 };
-const _hoisted_21 = { class: "field-assignment-list" };
-const _hoisted_22 = {
+const _hoisted_24 = { class: "field-assignment-list" };
+const _hoisted_25 = {
+  key: 0,
+  class: "field-value-input"
+};
+const _hoisted_26 = {
+  key: 2,
+  class: "field-assignment-area"
+};
+const _hoisted_27 = { class: "field-assignment-list" };
+const _hoisted_28 = {
   key: 0,
   class: "field-value-input"
 };
@@ -97,10 +113,24 @@ const _sfc_main = {
   emits: ["update:linkedConfig"],
   setup(__props, { emit: __emit }) {
     const props = __props;
+    const currentInstance = getCurrentInstance();
+    const ctx = currentInstance.proxy;
     const emit = __emit;
     const fieldsData = computed(() => {
       return getEditConfigDataFields();
     });
+    const optionsFieldsData = computed(() => {
+      const list = ["select", "multipleSelection", "radio", "checkbox"];
+      const fieldList = getEditConfigDataFields().filter(
+        (item) => list.includes(item.fieldType)
+      );
+      return fieldList.filter(
+        (item) => {
+          var _a;
+          return ((_a = item.optionConfig) == null ? void 0 : _a.optionSource) != "dataSource";
+        }
+      );
+    });
     const hiddenFields = computed(() => {
       const editConfigData = getEditConfigData();
       const fields = (editConfigData == null ? void 0 : editConfigData.hiddenFields) || [];
@@ -128,7 +158,7 @@ const _sfc_main = {
         desc: "让字段在特定条件成立时变为不可编辑"
       },
       // { label: "禁用", name: "disabled", desc: "让字段在特定条件成立时变为禁用" },
-      { label: "属性", name: "property", desc: "让字段的其他属性根据条件动态变化" }
+      { label: "可选项", name: "options", desc: "让字段的选择项根据条件动态变化" }
     ]);
     const activeTab = ref("dataLink");
     const currentTab = computed(() => {
@@ -138,6 +168,38 @@ const _sfc_main = {
     const filterConfig = ref();
     const editingRuleIndex = ref(-1);
     const fieldAssignments = ref([]);
+    const optionsFieldsOptionsCache = ref({});
+    async function loadOptionsFieldsOptions(fieldId) {
+      if (!fieldId) return [];
+      if (optionsFieldsOptionsCache.value[fieldId]) {
+        return optionsFieldsOptionsCache.value[fieldId];
+      }
+      const options = await getOptionsFieldsOptions(
+        optionsFieldsData.value,
+        fieldId
+      );
+      optionsFieldsOptionsCache.value[fieldId] = options;
+      return options;
+    }
+    watch(
+      () => fieldAssignments.value.map((a) => a.fieldId).filter(Boolean).join(","),
+      async () => {
+        if (currentTab.value.name == "options") {
+          for (const assignment of fieldAssignments.value) {
+            if (assignment.fieldId && !optionsFieldsOptionsCache.value[assignment.fieldId]) {
+              await loadOptionsFieldsOptions(assignment.fieldId);
+            }
+          }
+        }
+      },
+      { immediate: true }
+    );
+    function getOptionsFieldsOptionsByCache(fieldId) {
+      return optionsFieldsOptionsCache.value[fieldId] || [];
+    }
+    function onFieldIdChange(index) {
+      fieldAssignments.value[index].optionsOpt = null;
+    }
     const filterTitle = ref("");
     const filterSuccessDesc = ref("条件满足时或不设置条件，数据联动赋值以下字段");
     function handleAddRule(tab) {
@@ -159,6 +221,9 @@ const _sfc_main = {
         case "property":
           filterSuccessDesc.value = `条件满足时，${tab.label}以下字段的属性`;
           break;
+        case "options":
+          filterSuccessDesc.value = `条件满足时，可显示以下字段的可选项`;
+          break;
       }
       filterConfig.value = {
         operator: "and",
@@ -188,7 +253,7 @@ const _sfc_main = {
         dataLinkFieldList: dataLinkFieldList.value,
         filterConfig: data
       };
-      if (currentTab.value.name == "dataLink") {
+      if (currentTab.value.name == "dataLink" || currentTab.value.name == "options") {
         newRule.fieldAssignments = cloneDeep(fieldAssignments.value);
       }
       if (editingRuleIndex.value == -1) {
@@ -214,7 +279,7 @@ const _sfc_main = {
         required: "必填字段",
         readonly: "只读字段",
         disabled: "禁用字段",
-        property: "属性字段"
+        options: "字段显示可选项"
       };
       return titleMap[tabName] || "联动字段";
     };
@@ -229,6 +294,8 @@ const _sfc_main = {
       fieldAssignments.value.push({
         fieldId: null,
         value: null,
+        optionsOpt: null,
+        optionsLabel: "",
         isField: false,
         operator: "eq",
         formula: {
@@ -240,6 +307,19 @@ const _sfc_main = {
         }
       });
     };
+    function onOptionsOptChange(index) {
+      const assignment = fieldAssignments.value[index];
+      if (!assignment.optionsOpt || !assignment.optionsOpt.length) {
+        assignment.optionsLabel = "";
+        return;
+      }
+      const options = optionsFieldsOptionsCache.value[assignment.fieldId] || [];
+      const labels = assignment.optionsOpt.map((val) => {
+        const opt = options.find((o) => o.value === val);
+        return opt ? opt.label : val;
+      });
+      assignment.optionsLabel = labels.join(", ");
+    }
     const removeFieldAssignment = (index) => {
       fieldAssignments.value.splice(index, 1);
     };
@@ -247,9 +327,9 @@ const _sfc_main = {
       filterTitle.value = `${tab.label}联动规则`;
       filterConfig.value = cloneDeep(item.filterConfig);
       dataLinkFieldList.value = [...item.dataLinkFieldList.map(String)];
-      if (tab.name == "dataLink" && item.fieldAssignments) {
+      if ((tab.name == "dataLink" || tab.name == "options") && item.fieldAssignments) {
         fieldAssignments.value = cloneDeep(item.fieldAssignments);
-      } else if (tab.name == "dataLink") {
+      } else if (tab.name == "dataLink" || tab.name == "options") {
         fieldAssignments.value = [];
       }
       editingRuleIndex.value = index;
@@ -265,6 +345,26 @@ const _sfc_main = {
       };
       emit("update:linkedConfig", newLinkedConfig);
     };
+    async function getOptionsFieldsOptions(optionsFieldsData2, fieldId) {
+      var _a;
+      const optionConfig = (_a = optionsFieldsData2.find(
+        (item) => item.id == fieldId
+      )) == null ? void 0 : _a.optionConfig;
+      if (!(optionConfig == null ? void 0 : optionConfig.optionSource)) return [];
+      if (optionConfig.optionSource == "custom") {
+        return optionConfig.options.map((item) => ({
+          label: item.label,
+          value: item.value
+        }));
+      } else if (optionConfig.optionSource == "dictionary") {
+        const data = await api.getDicDataByKey(
+          ctx.$http,
+          optionConfig.dictionaryValue
+        );
+        return Object.entries(data).map(([value, label]) => ({ label, value }));
+      }
+      return [];
+    }
     return (_ctx, _cache) => {
       const _component_el_button = ElButton;
       const _component_el_card = ElCard;
@@ -381,7 +481,18 @@ const _sfc_main = {
                                                           ])
                                                         ]);
                                                       }), 128))
-                                                    ])) : (openBlock(), createElementBlock("span", _hoisted_16, toDisplayString(item.dataLinkFieldList.map((fieldId) => `${getFieldLabel(fieldId)}`).join(", ")), 1))
+                                                    ])) : tab.name == "options" && item.fieldAssignments && item.fieldAssignments.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_16, [
+                                                      (openBlock(true), createElementBlock(Fragment, null, renderList(item.fieldAssignments, (assignment, index) => {
+                                                        return openBlock(), createElementBlock("div", {
+                                                          key: index,
+                                                          class: "field-assignment-display-item"
+                                                        }, [
+                                                          createElementVNode("span", _hoisted_17, "「" + toDisplayString(getFieldLabel(assignment.fieldId)) + "」", 1),
+                                                          _cache[7] || (_cache[7] = createElementVNode("span", { class: "field-operator" }, "→", -1)),
+                                                          createElementVNode("span", _hoisted_18, toDisplayString(assignment.optionsLabel), 1)
+                                                        ]);
+                                                      }), 128))
+                                                    ])) : (openBlock(), createElementBlock("span", _hoisted_19, toDisplayString(item.dataLinkFieldList.map((fieldId) => `${getFieldLabel(fieldId)}`).join(", ")), 1))
                                                   ])
                                                 ])
                                               ])
@@ -395,7 +506,7 @@ const _sfc_main = {
                                   _: 2
                                 }, 1024)
                               ])) : createCommentVNode("", true),
-                              !((_d = (_c = props.linkedConfig) == null ? void 0 : _c[tab.name]) == null ? void 0 : _d.length) ? (openBlock(), createElementBlock("div", _hoisted_17, [
+                              !((_d = (_c = props.linkedConfig) == null ? void 0 : _c[tab.name]) == null ? void 0 : _d.length) ? (openBlock(), createElementBlock("div", _hoisted_20, [
                                 createVNode(_component_el_empty, {
                                   description: tab.desc
                                 }, {
@@ -439,8 +550,8 @@ const _sfc_main = {
           default: withCtx(({ filterConfigData }) => {
             var _a, _b;
             return [
-              createElementVNode("span", _hoisted_18, toDisplayString(unref(filterSuccessDesc)), 1),
-              unref(currentTab).name !== "dataLink" ? (openBlock(), createElementBlock("div", _hoisted_19, [
+              createElementVNode("span", _hoisted_21, toDisplayString(unref(filterSuccessDesc)), 1),
+              unref(currentTab).name !== "dataLink" && unref(currentTab).name !== "options" ? (openBlock(), createElementBlock("div", _hoisted_22, [
                 createVNode(_component_el_select, {
                   modelValue: unref(dataLinkFieldList),
                   "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isRef(dataLinkFieldList) ? dataLinkFieldList.value = $event : null),
@@ -460,8 +571,80 @@ const _sfc_main = {
                   ]),
                   _: 2
                 }, 1032, ["modelValue", "placeholder", "disabled"])
-              ])) : (openBlock(), createElementBlock("div", _hoisted_20, [
-                createElementVNode("div", _hoisted_21, [
+              ])) : unref(currentTab).name == "options" ? (openBlock(), createElementBlock("div", _hoisted_23, [
+                createElementVNode("div", _hoisted_24, [
+                  (openBlock(true), createElementBlock(Fragment, null, renderList(unref(fieldAssignments), (assignment, index) => {
+                    return openBlock(), createElementBlock("div", {
+                      key: index,
+                      class: "field-assignment-item"
+                    }, [
+                      createVNode(_component_el_select, {
+                        modelValue: assignment.fieldId,
+                        "onUpdate:modelValue": ($event) => assignment.fieldId = $event,
+                        filterable: "",
+                        placeholder: "请选择字段",
+                        style: { "width": "200px", "margin-right": "12px" },
+                        onChange: ($event) => onFieldIdChange(index)
+                      }, {
+                        default: withCtx(() => [
+                          (openBlock(true), createElementBlock(Fragment, null, renderList(unref(optionsFieldsData), (item) => {
+                            return openBlock(), createBlock(_component_el_option, {
+                              key: item.id,
+                              label: item.label,
+                              value: item.id
+                            }, null, 8, ["label", "value"]);
+                          }), 128))
+                        ]),
+                        _: 2
+                      }, 1032, ["modelValue", "onUpdate:modelValue", "onChange"]),
+                      assignment.fieldId ? (openBlock(), createElementBlock("div", _hoisted_25, [
+                        createVNode(_component_el_select, {
+                          modelValue: assignment.optionsOpt,
+                          "onUpdate:modelValue": ($event) => assignment.optionsOpt = $event,
+                          multiple: "",
+                          placeholder: "请选择可选项",
+                          style: { "width": "100%", "margin-right": "12px" },
+                          loading: !unref(optionsFieldsOptionsCache)[assignment.fieldId],
+                          onChange: ($event) => onOptionsOptChange(index)
+                        }, {
+                          default: withCtx(() => [
+                            (openBlock(true), createElementBlock(Fragment, null, renderList(getOptionsFieldsOptionsByCache(
+                              assignment.fieldId
+                            ), (item) => {
+                              return openBlock(), createBlock(_component_el_option, {
+                                key: item.value,
+                                label: item.label,
+                                value: item.value
+                              }, null, 8, ["label", "value"]);
+                            }), 128))
+                          ]),
+                          _: 2
+                        }, 1032, ["modelValue", "onUpdate:modelValue", "loading", "onChange"])
+                      ])) : createCommentVNode("", true),
+                      createVNode(_component_el_button, {
+                        type: "danger",
+                        link: "",
+                        icon: "Delete",
+                        onClick: ($event) => removeFieldAssignment(index),
+                        style: { "margin-left": "8px" }
+                      }, null, 8, ["onClick"])
+                    ]);
+                  }), 128))
+                ]),
+                createVNode(_component_el_button, {
+                  type: "primary",
+                  link: "",
+                  icon: "CirclePlus",
+                  onClick: addFieldAssignment,
+                  class: "add-assignment-btn"
+                }, {
+                  default: withCtx(() => _cache[8] || (_cache[8] = [
+                    createTextVNode(" 添加可选项字段 ")
+                  ])),
+                  _: 1
+                })
+              ])) : (openBlock(), createElementBlock("div", _hoisted_26, [
+                createElementVNode("div", _hoisted_27, [
                   (openBlock(true), createElementBlock(Fragment, null, renderList(unref(fieldAssignments), (assignment, index) => {
                     return openBlock(), createElementBlock("div", {
                       key: index,
@@ -508,7 +691,7 @@ const _sfc_main = {
                         ]),
                         _: 2
                       }, 1032, ["modelValue", "onUpdate:modelValue"]),
-                      assignment.fieldId ? (openBlock(), createElementBlock("div", _hoisted_22, [
+                      assignment.fieldId ? (openBlock(), createElementBlock("div", _hoisted_28, [
                         createVNode(unref(_sfc_main$1), {
                           title: "公式配置",
                           formulaConf: assignment.formula.value,
@@ -534,7 +717,7 @@ const _sfc_main = {
                   onClick: addFieldAssignment,
                   class: "add-assignment-btn"
                 }, {
-                  default: withCtx(() => _cache[7] || (_cache[7] = [
+                  default: withCtx(() => _cache[9] || (_cache[9] = [
                     createTextVNode(" 添加字段赋值 ")
                   ])),
                   _: 1
@@ -548,7 +731,7 @@ const _sfc_main = {
     };
   }
 };
-const DataLinkage = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-889ebf8b"]]);
+const DataLinkage = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-35097e4f"]]);
 export {
   DataLinkage as default
 };

package/es/designer/src/packages/dialog/useDialogDialog.mjs

@@ -1,4 +1,4 @@
-import DialogDialog from "./index.vue2.mjs";
+import DialogDialog from "./index.vue.mjs";
 import { ref } from "vue";
 function useDialogDialog() {
   const dialogDialogVisible = ref(false);

package/es/designer/src/packages/dialogGlobal/index.vue.mjs

@@ -84,7 +84,7 @@ import widgets from "../table/property/widgets.vue.mjs";
 import "../../../../node_modules/element-plus/theme-chalk/el-tab-pane.css.mjs";
 /* empty css                                                              */
 /* empty css                                         */
-/* empty css                                  */
+/* empty css                                   */
 /* empty css                                                            */
 /* empty css                                                            */
 /* empty css                             */

package/es/designer/src/packages/dialogGlobal/useDialogGlobalDialog.mjs

@@ -1,4 +1,4 @@
-import DialogGlobalDialog from "./index.vue2.mjs";
+import DialogGlobalDialog from "./index.vue.mjs";
 import { ref } from "vue";
 function useDialogGlobalDialog() {
   const dialogGlobalDialogVisible = ref(false);

package/es/designer/src/packages/form/property/widgets.vue.mjs

@@ -52,8 +52,8 @@ import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import "../../../components/TemplateSelector.vue.mjs";
 import "../../table/default.mjs";
 /* empty css                                 */
-/* empty css                      */
-/* empty css                            */
+/* empty css                       */
+/* empty css                             */
 import "../../../store/index.mjs";
 /* empty css              */
 import { ElCollapse, ElCollapseItem } from "../../../../../node_modules/element-plus/es/components/collapse/index.mjs";