@fecp/designer 5.6.28 → 5.6.30

package/lib/packages/vue/src/components/forms/form/Form.vue.js

@@ -600,7 +600,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         (_a = config.labelLinkEventConfig) == null ? void 0 : _a.find((item) => item.name == "Click")
       );
     }
-    const gridLayoutFieldsData = Vue.ref([]);
+    const gridLayoutFieldsData = Vue.shallowRef([]);
     const oriGridLayoutData = Vue.ref([]);
     const formItemRefs = Vue.ref(/* @__PURE__ */ new Map());
     const setFormItemRef = (el, component) => {
@@ -645,6 +645,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         } else if (item.fixedH) {
           item.h = item.h / (localConfig.value.labelPosition == "top" ? 1.5 : 1);
         }
+        item._origX = item.x;
+        item._origY = item.y;
         if (formMode.value == "query") {
           if (item.component.displayMode == "edit") {
             item.hidden = true;
@@ -858,12 +860,66 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     Vue.onBeforeUnmount(() => {
       formItemRefs.value.clear();
     });
-    const findChangedFields = (newData, oldData) => {
+    const linkageTriggerFields = Vue.computed(() => {
+      var _a;
+      const nameSet = /* @__PURE__ */ new Set();
+      const fields = [...fieldsData.value || [], ...hiddenFields.value || []];
+      let undetermined = false;
+      const collectGroup = (group) => {
+        if (!group) {
+          undetermined = true;
+          return;
+        }
+        const conds = group.conditions || [];
+        const groups = group.groups || [];
+        if (conds.length === 0 && groups.length === 0) {
+          undetermined = true;
+        }
+        conds.forEach((cond) => {
+          if (!cond.field) {
+            undetermined = true;
+            return;
+          }
+          const f = fields.find((x) => x.id == cond.field);
+          nameSet.add((f == null ? void 0 : f.fieldName) || cond.field);
+        });
+        groups.forEach(collectGroup);
+      };
+      const walk = (cfg, isConfigItem) => {
+        if (!cfg || typeof cfg !== "object") return;
+        if (Array.isArray(cfg)) {
+          cfg.forEach((item) => walk(item, true));
+          return;
+        }
+        if (cfg.filterConfig !== void 0) {
+          collectGroup(cfg.filterConfig);
+          return;
+        }
+        if (cfg.conditions || cfg.groups) {
+          collectGroup(cfg);
+          return;
+        }
+        if (isConfigItem) {
+          undetermined = true;
+          return;
+        }
+        Object.values(cfg).forEach((v) => walk(v, false));
+      };
+      walk((_a = localConfig.value) == null ? void 0 : _a.linkedConfig, false);
+      return undetermined ? /* @__PURE__ */ new Set() : nameSet;
+    });
+    const findChangedFields = (newData, oldData, onlyFieldNames) => {
       const changedFields = [];
-      const allKeys = /* @__PURE__ */ new Set([
-        ...Object.keys(newData || {}),
-        ...Object.keys(oldData || {})
-      ]);
+      let allKeyList = [
+        .../* @__PURE__ */ new Set([
+          ...Object.keys(newData || {}),
+          ...Object.keys(oldData || {})
+        ])
+      ];
+      if (onlyFieldNames && onlyFieldNames.size > 0) {
+        allKeyList = allKeyList.filter((k) => onlyFieldNames.has(k));
+      }
+      const allKeys = allKeyList;
       let initFlag = false;
       if (Object.keys(oldData || {}).length === 0) {
         initFlag = true;
@@ -883,7 +939,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         if (!newVal && !oldVal && Object.keys(oldData || {}).length === 0) {
           continue;
         }
-        if (JSON.stringify(newVal) != JSON.stringify(oldVal)) {
+        if (newVal === oldVal) {
+          continue;
+        }
+        if (newVal == null || oldVal == null || typeof newVal !== "object" || typeof oldVal !== "object") {
+          changedFields.push(key);
+          continue;
+        }
+        if (!common.isEqual(newVal, oldVal)) {
           changedFields.push(key);
         }
       }
@@ -934,6 +997,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       return result;
     };
     let isApplyingLinkage = false;
+    let __pendingLinkageFields = null;
+    let __pendingLinkageTimer = null;
     const applyLinkageEffectsForChangedFields = (changedFieldNames) => {
       var _a;
       if (isApplyingLinkage) return;
@@ -967,7 +1032,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           });
         }
       });
-      const updatedLayoutData = common.cloneDeep(oriGridLayoutData.value || []);
+      const updatedLayoutData = oriGridLayoutData.value;
       relevantConfigs.options.forEach((item) => {
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
           const fieldAssignments = item.fieldAssignments || [];
@@ -976,7 +1041,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             const optionsOpt = assignment.optionsOpt || [];
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem && optionsOpt.length > 0) {
-              const oriOptions = layoutFieldItem.component.optionConfig.options;
+              if (!layoutFieldItem.component._oriOptions) {
+                layoutFieldItem.component._oriOptions = [
+                  ...layoutFieldItem.component.optionConfig.options
+                ];
+              }
+              const oriOptions = layoutFieldItem.component._oriOptions;
               layoutFieldItem.component.optionConfig.options = oriOptions.filter(
                 (item2) => optionsOpt.includes(item2.value)
               );
@@ -1018,23 +1088,27 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           });
         }
       });
-      const rules = {};
-      updatedLayoutData.forEach(({ component }) => {
-        if (component.fieldName) {
-          const fieldRules = validation.generateFieldRules(component, formData, fields);
-          if (fieldRules.length > 0) {
-            rules[component.fieldName] = fieldRules;
+      if (((_a = relevantConfigs.required) == null ? void 0 : _a.length) > 0) {
+        const rules = {};
+        updatedLayoutData.forEach(({ component }) => {
+          if (component.fieldName) {
+            const fieldRules = validation.generateFieldRules(component, formData, fields);
+            if (fieldRules.length > 0) {
+              rules[component.fieldName] = fieldRules;
+            }
+          }
+        });
+        for (let fieldName in prodRules.value) {
+          if (rules[fieldName]) {
+            rules[fieldName].push(...prodRules.value[fieldName]);
+          } else {
+            rules[fieldName] = prodRules.value[fieldName];
           }
         }
-      });
-      for (let fieldName in prodRules.value) {
-        if (rules[fieldName]) {
-          rules[fieldName].push(...prodRules.value[fieldName]);
-        } else {
-          rules[fieldName] = prodRules.value[fieldName];
+        if (JSON.stringify(rules) !== JSON.stringify(formRules.value)) {
+          formRules.value = rules;
         }
       }
-      formRules.value = rules;
       if (formMode.value != "query") {
         relevantConfigs.readonly.forEach((item) => {
           const dataLinkFieldList = item.dataLinkFieldList || [];
@@ -1075,18 +1149,46 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           }
         });
       }
-      const fieldsConfigArr = updatedLayoutData.filter((item) => !item.hidden);
-      gridLayoutFieldsData.value = sortLayoutItems(fieldsConfigArr);
-      (_a = gridLayout == null ? void 0 : gridLayout.value) == null ? void 0 : _a.resizeEvent();
+      const oldVisibleKey = gridLayoutFieldsData.value.map((i) => i.id).sort().join(",");
+      const newVisibleKey = updatedLayoutData.filter((item) => !item.hidden).map((i) => i.id).sort().join(",");
+      const rebuild = oldVisibleKey !== newVisibleKey;
+      if (rebuild) {
+        updatedLayoutData.forEach((item) => {
+          if (item._origX !== void 0) item.x = item._origX;
+          if (item._origY !== void 0) item.y = item._origY;
+        });
+        const fieldsConfigArr = updatedLayoutData.filter((item) => !item.hidden);
+        gridLayoutFieldsData.value = compactLayoutVertical(
+          fieldsConfigArr,
+          localConfig.value.columns
+        );
+      }
       isApplyingLinkage = false;
     };
-    function sortLayoutItems(arr) {
-      return [...arr].sort((a, b) => {
-        if (a.y !== b.y) {
-          return a.y - b.y;
-        }
+    function compactLayoutVertical(arr, cols) {
+      const colNum = Math.max(1, Math.floor(cols) || 12);
+      const sorted = [...arr].sort((a, b) => {
+        if (a.y !== b.y) return a.y - b.y;
         return a.x - b.x;
       });
+      const colBottom = new Array(colNum).fill(0);
+      for (let k = 0; k < sorted.length; k++) {
+        const item = sorted[k];
+        let sx = Math.floor(item.x);
+        if (sx < 0) sx = 0;
+        if (sx > colNum - 1) sx = colNum - 1;
+        let sw = Math.floor(item.w);
+        if (sw < 1) sw = 1;
+        if (sx + sw > colNum) sw = colNum - sx;
+        let ny = 0;
+        for (let c = sx, ce = sx + sw; c < ce; c++) {
+          if (colBottom[c] > ny) ny = colBottom[c];
+        }
+        item.y = ny;
+        const bottom = ny + item.h;
+        for (let c = sx, ce = sx + sw; c < ce; c++) colBottom[c] = bottom;
+      }
+      return sorted;
     }
     const subTableCounts = Vue.ref({});
     const navLinkCompId = Vue.ref("");
@@ -1150,12 +1252,18 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           return;
         }
         const lastValue = { ...prevFormData.value };
-        if (common.isEqual(newVal, lastValue)) {
-          return;
-        }
-        const changedFields = findChangedFields(newVal, lastValue);
+        const changedFields = isApplyingLinkage ? [] : findChangedFields(newVal, lastValue, linkageTriggerFields.value);
         if (changedFields.length > 0) {
-          applyLinkageEffectsForChangedFields(changedFields);
+          __pendingLinkageFields = [
+            .../* @__PURE__ */ new Set([...__pendingLinkageFields || [], ...changedFields])
+          ];
+          if (__pendingLinkageTimer) clearTimeout(__pendingLinkageTimer);
+          __pendingLinkageTimer = setTimeout(() => {
+            __pendingLinkageTimer = null;
+            const fields = __pendingLinkageFields;
+            __pendingLinkageFields = null;
+            applyLinkageEffectsForChangedFields(fields);
+          }, 0);
         }
         prevFormData.value = { ...formData.value };
         isSyncingToParent = true;
@@ -1167,7 +1275,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       { deep: true }
     );
     function setFormItemHeight(id, fixedH, h) {
-      var _a;
       const item = gridLayoutFieldsData.value.find((item2) => item2.id == id);
       if (!fixedH) {
         item.h = h * 60;
@@ -1180,7 +1287,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       } else if (fixedH) {
         oriItem.h = h / (localConfig.value.labelPosition == "top" ? 1.5 : 1);
       }
-      (_a = gridLayout == null ? void 0 : gridLayout.value) == null ? void 0 : _a.resizeEvent();
+      Vue.triggerRef(gridLayoutFieldsData);
     }
     Vue.provide("formData", formData);
     Vue.provide("localConfig", localConfig);
@@ -1262,7 +1369,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                         "onUpdate:layout": _cache[1] || (_cache[1] = ($event) => gridLayoutFieldsData.value = $event),
                         "row-height": rowHeight.value,
                         margin: [0, 0],
-                        "use-css-transforms": false,
+                        "use-css-transforms": true,
                         "col-num": localConfig.value.columns,
                         "is-draggable": false,
                         "is-resizable": false,
@@ -1332,5 +1439,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-2a14b0ea"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-46bcf105"]]);
 exports.default = _Form;

package/lib/packages/vue/src/components/forms/roleSelect/RoleSelect.vue.js

@@ -10,6 +10,7 @@ const index$2 = require("../../dialog/index.js");
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../../../../node_modules/element-plus/es/components/input/index.js");
 const index$1 = require("../../../../../../node_modules/element-plus/es/components/button/index.js");
+const VALUE_FIELD = "roleNo";
 const _sfc_main = /* @__PURE__ */ Object.assign({
   inheritAttrs: false
 }, {
@@ -82,9 +83,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         instance,
         formCtx,
         fieldsList,
-        formData.value
+        formData.value,
+        {
+          // 真实值字段与表单字段的映射，用于打开弹层时反向勾选已选项
+          valueField: VALUE_FIELD,
+          formField: props.config.fieldName
+        }
       ).then((result) => {
-        const values = result.map((row) => row.roleNo);
+        const values = result.map((row) => row[VALUE_FIELD]);
         formData.value[props.config.fieldName] = values.join("|");
         console.log("确定", result);
       }).catch(() => {
@@ -123,5 +129,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _RoleSelect = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-ec160822"]]);
+const _RoleSelect = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-5ebf9681"]]);
 exports.default = _RoleSelect;

package/lib/packages/vue/src/components/forms/userSelect/UserSelect.vue.js

@@ -10,6 +10,7 @@ const index$2 = require("../../dialog/index.js");
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../../../../node_modules/element-plus/es/components/input/index.js");
 const index$1 = require("../../../../../../node_modules/element-plus/es/components/button/index.js");
+const VALUE_FIELD = "opNo";
 const _sfc_main = /* @__PURE__ */ Object.assign({
   inheritAttrs: false
 }, {
@@ -82,9 +83,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         instance,
         formCtx,
         fieldsList,
-        formData.value
+        formData.value,
+        {
+          // 真实值字段与表单字段的映射，用于打开弹层时反向勾选已选项
+          valueField: VALUE_FIELD,
+          formField: props.config.fieldName
+        }
       ).then((result) => {
-        const values = result.map((row) => row.opNo);
+        const values = result.map((row) => row[VALUE_FIELD]);
         formData.value[props.config.fieldName] = values.join("|");
         console.log("确定", result);
       }).catch(() => {
@@ -123,5 +129,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _UserSelect = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-e9403912"]]);
+const _UserSelect = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-661d709f"]]);
 exports.default = _UserSelect;

package/lib/packages/vue/src/components/table/Table.vue.js

@@ -118,6 +118,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       default: "",
       validator: (value) => ["", "none", "single", "multiple"].includes(value)
     },
+    // 打开时回显已选项：{ field: 列表字段名, values: [真实值...] }
+    // 仅在弹层等"打开即勾中已保存项"的场景传入；为 null 时不回显
+    initialSelected: {
+      type: Object,
+      default: null
+    },
     initHiddenData: {
       type: Object,
       default: {}
@@ -549,20 +555,97 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       emit("page-change", { pageNo, pageSize });
     };
     const selectedRows = Vue.ref([]);
-    const handleCheckboxChange = (checked) => {
-      selectedRows.value = checked.records;
-      emit("selection-change", checked.records);
+    let userInteracted = false;
+    const handleCheckboxChange = () => {
+      userInteracted = true;
+      selectedRows.value = collectSelectionWithBaseline();
+      emit("selection-change", selectedRows.value);
     };
-    const handleCheckboxAll = (checked) => {
-      selectedRows.value = checked.records;
-      emit("selection-change", checked.records);
+    const handleCheckboxAll = () => {
+      userInteracted = true;
+      selectedRows.value = collectSelectionWithBaseline();
+      emit("selection-change", selectedRows.value);
     };
     const handleRadioChange = (checked) => {
+      userInteracted = true;
       emit("selection-change", [checked.row]);
     };
+    const appliedInitialValues = /* @__PURE__ */ new Set();
+    const renderedKeys = /* @__PURE__ */ new Set();
+    function mergeRowsByKey(primary, extra, keyOf) {
+      const merged = [];
+      const seen = /* @__PURE__ */ new Set();
+      primary.forEach((row) => {
+        const key = keyOf(row);
+        if (seen.has(key)) return;
+        seen.add(key);
+        merged.push(row);
+      });
+      extra.forEach((row) => {
+        const key = keyOf(row);
+        if (seen.has(key)) return;
+        seen.add(key);
+        merged.push(row);
+      });
+      return merged;
+    }
+    function collectSelectionWithBaseline() {
+      const checked = collectCheckboxSelection();
+      const cfg = props.initialSelected;
+      if (!(cfg == null ? void 0 : cfg.field) || !Array.isArray(cfg.rows) || cfg.rows.length === 0) {
+        return checked;
+      }
+      const keyOf = (row) => String((row == null ? void 0 : row[cfg.field]) ?? "");
+      const allowed = new Set((cfg.values || []).map((v) => String(v)));
+      const unseen = cfg.rows.filter(
+        (row) => allowed.has(keyOf(row)) && !renderedKeys.has(keyOf(row))
+      );
+      return mergeRowsByKey(checked, unseen, keyOf);
+    }
+    function applyInitialSelected() {
+      var _a;
+      const cfg = props.initialSelected;
+      const $table = tableRef.value;
+      if (!$table || userInteracted) return;
+      if (!(cfg == null ? void 0 : cfg.field) || !Array.isArray(cfg.values) || cfg.values.length === 0)
+        return;
+      const mode = props.selectMode || ((_a = localConfig.value) == null ? void 0 : _a.selectMode);
+      if (mode !== "single" && mode !== "multiple") return;
+      const keyOf = (row) => String((row == null ? void 0 : row[cfg.field]) ?? "");
+      displayData.value.forEach((row) => {
+        const key = keyOf(row);
+        if (key) renderedKeys.add(key);
+      });
+      const pendingValues = cfg.values.map((v) => String(v)).filter((v) => !appliedInitialValues.has(v));
+      const rows = pendingValues.length ? displayData.value.filter((row) => pendingValues.includes(keyOf(row))) : [];
+      if (rows.length > 0) {
+        rows.forEach((row) => appliedInitialValues.add(keyOf(row)));
+      }
+      if (mode === "single") {
+        if (rows.length === 0) return;
+        $table.setRadioRow(rows[0]);
+        selectedRows.value = [rows[0]];
+      } else {
+        if (rows.length > 0) $table.setCheckboxRow(rows, true);
+        selectedRows.value = collectSelectionWithBaseline();
+      }
+      if (selectedRows.value.length > 0) {
+        emit("selection-change", selectedRows.value);
+      }
+    }
+    Vue.watch(
+      () => props.initialSelected,
+      () => {
+        appliedInitialValues.clear();
+        renderedKeys.clear();
+        userInteracted = false;
+      },
+      { deep: true }
+    );
     const handleInitRendered = ({ visibleColumn, visibleData, $event }) => {
       const offsetHeight = fecTableContainerRef.value.$el.offsetHeight;
       emit("height-loaded", localConfig.value, offsetHeight);
+      applyInitialSelected();
       if ((visibleData == null ? void 0 : visibleData.length) > 0) {
         eventBus.default.emit("onSubTableDataLoaded", {
           subTableConfig: props.subTableConfig,
@@ -578,6 +661,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     }) => {
       const offsetHeight = fecTableContainerRef.value.$el.offsetHeight;
       emit("height-loaded", localConfig.value, offsetHeight);
+      applyInitialSelected();
       if ((visibleData == null ? void 0 : visibleData.length) > 0) {
         eventBus.default.emit("onSubTableDataLoaded", {
           subTableConfig: props.subTableConfig,
@@ -743,9 +827,26 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         isHover: true
       };
     });
+    function collectCheckboxSelection() {
+      var _a, _b;
+      const $table = tableRef.value;
+      if (!$table) return [];
+      const current = ((_a = $table.getCheckboxRecords) == null ? void 0 : _a.call($table)) || [];
+      const reserve = ((_b = $table.getCheckboxReserveRecords) == null ? void 0 : _b.call($table)) || [];
+      const keyField = rowConfig.value.keyField;
+      if (!keyField) return [...current, ...reserve];
+      const seen = /* @__PURE__ */ new Set();
+      return [...current, ...reserve].filter((row) => {
+        const key = String((row == null ? void 0 : row[keyField]) ?? "");
+        if (seen.has(key)) return false;
+        seen.add(key);
+        return true;
+      });
+    }
     const radioConfig = Vue.ref({
       trigger: "row",
-      highlight: true
+      highlight: true,
+      reserve: true
     });
     const checkboxConfig = Vue.ref({
       showHeader: true,
@@ -770,8 +871,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       currentMode.value = modeKey;
     };
     const getSelection = () => {
-      if (!tableRef.value) return [];
-      return tableRef.value.getCheckboxRecords() || tableRef.value.getRadioRecord() || [];
+      var _a, _b, _c;
+      const $table = tableRef.value;
+      if (!$table) return [];
+      const mode = props.selectMode || ((_a = localConfig.value) == null ? void 0 : _a.selectMode);
+      if (mode === "single") {
+        const row = ((_b = $table.getRadioRecord) == null ? void 0 : _b.call($table)) || ((_c = $table.getRadioReserveRecord) == null ? void 0 : _c.call($table));
+        return row ? [row] : [];
+      }
+      return collectSelectionWithBaseline();
     };
     const clearSelection = () => {
       if (tableRef.value) {
@@ -1032,5 +1140,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-80e86615"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-63047ad0"]]);
 exports.default = _Table;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/designer",
-  "version": "5.6.28",
+  "version": "5.6.30",
   "main": "lib/designer/index.js",
   "module": "es/designer/index.mjs",
   "files": [