@fecp/designer 5.4.75 → 5.4.77

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

@@ -863,6 +863,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const updatedLayoutData = common.cloneDeep(oriGridLayoutData.value || []);
       relevantConfigs.visibility.forEach((item) => {
         const dataLinkFieldList = item.dataLinkFieldList || [];
+        dataLinkFieldList.forEach((fieldId) => {
+          const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+          if (layoutFieldItem) {
+            layoutFieldItem.hidden = true;
+          }
+        });
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
           dataLinkFieldList.forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
@@ -870,17 +876,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               layoutFieldItem.hidden = false;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.hidden = true;
-            }
-          });
         }
       });
       relevantConfigs.required.forEach((item) => {
         const dataLinkFieldList = item.dataLinkFieldList || [];
+        dataLinkFieldList.forEach((fieldId) => {
+          const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+          if (layoutFieldItem) {
+            layoutFieldItem.component.required = false;
+          }
+        });
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
           dataLinkFieldList.forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
@@ -888,13 +893,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               layoutFieldItem.component.required = true;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.component.required = false;
-            }
-          });
         }
       });
       const rules = {};
@@ -912,6 +910,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       formRules.value = rules;
       relevantConfigs.readonly.forEach((item) => {
         const dataLinkFieldList = item.dataLinkFieldList || [];
+        dataLinkFieldList.forEach((fieldId) => {
+          const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+          if (layoutFieldItem) {
+            layoutFieldItem.component.readOnly = false;
+          }
+        });
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
           dataLinkFieldList.forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
@@ -919,17 +923,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               layoutFieldItem.component.readOnly = true;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.component.readOnly = false;
-            }
-          });
         }
       });
       relevantConfigs.disabled.forEach((item) => {
         const dataLinkFieldList = item.dataLinkFieldList || [];
+        dataLinkFieldList.forEach((fieldId) => {
+          const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+          if (layoutFieldItem) {
+            layoutFieldItem.component.disabled = false;
+          }
+        });
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
           dataLinkFieldList.forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
@@ -937,13 +940,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               layoutFieldItem.component.disabled = true;
             }
           });
-        } else {
-          dataLinkFieldList.forEach((fieldId) => {
-            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-            if (layoutFieldItem) {
-              layoutFieldItem.component.disabled = false;
-            }
-          });
         }
       });
       gridLayoutFieldsData.value = updatedLayoutData.filter((item) => !item.hidden);
@@ -1102,5 +1098,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-38bc8c5b"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-48d4542c"]]);
 exports.default = _Form;

package/lib/packages/vue/src/components/forms/subTitle/SubTitle.vue.js

@@ -23,5 +23,5 @@ const _sfc_main = {
     };
   }
 };
-const _SubTitle = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-fa65f3d4"]]);
+const _SubTitle = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-0105f658"]]);
 exports.default = _SubTitle;

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

@@ -276,15 +276,35 @@ const _sfc_main = {
       return parseFilterConfig.checkFilterMatch(item.disableCondition, row, props.fieldsData);
     };
     const optColumnWidth = vue.computed(() => {
-      const padding = 20;
-      const btnWidth = 60;
+      const padding = 12;
+      const labelWidth = 14;
+      const labelMargin = 18;
       if (!props.tableData || props.tableData.length === 0) {
-        return props.optBtns.length * btnWidth + padding;
+        let labelLength = 0;
+        props.optBtns.forEach((btn) => {
+          labelLength += btn.label.length;
+        });
+        if (labelLength > 0) {
+          return labelLength * labelWidth + (props.optBtns.length - 1) * labelMargin + padding * 2 + 6;
+        }
+        return 0;
       }
+      let maxBtnLength = 0;
       const maxVisibleBtns = Math.max(
-        ...props.tableData.map((row) => getVisibleOptBtns(row).length)
+        ...props.tableData.map((row) => {
+          const btnList = getVisibleOptBtns(row);
+          if (btnList.length > maxBtnLength) {
+            maxBtnLength = btnList.length;
+          }
+          let labelLength = 0;
+          btnList.forEach((btn) => {
+            labelLength += btn.label.length;
+          });
+          return labelLength;
+        })
       );
-      return Math.max(maxVisibleBtns, 1) * btnWidth + padding;
+      const maxLength = Math.max(maxVisibleBtns, 1);
+      return maxLength * labelWidth + (maxBtnLength - 1) * labelMargin + padding * 2 + 6;
     });
     const { handleEvent } = eventFlowHandler.useEventFlow({
       fields: props.fieldsData,
@@ -411,5 +431,5 @@ const _sfc_main = {
     };
   }
 };
-const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3e5372d4"]]);
+const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-bee565c6"]]);
 exports.default = TableColumn;

package/package.json

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