@fecp/designer 5.5.50 → 5.5.53

package/lib/packages/vue/src/components/forms/subTable/SubTable.vue.js

@@ -38,6 +38,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     Vue.inject("gridLayout");
     const setFormItemHeight = Vue.inject("setFormItemHeight");
     const handleEvent = Vue.inject("handleEvent");
+    const heightMode = Vue.computed(() => {
+      return props.config.subTableHeightType || "auto";
+    });
     const btnRollbackEvent = Vue.computed(() => {
       const btnRollback = props.config.btnRollback || [];
       const data = {};
@@ -106,7 +109,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         );
       });
     });
-    function subTableLoaded(subOption) {
+    function subTableLoaded(subOption, tableHeight) {
       subTableOption.value = subOption;
       const foundItem = props.localConfig.fieldsData.find(
         (item) => item.id == props.config.id
@@ -114,12 +117,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const titleHeight = props.config.titleMode != "none" ? 60 : 0;
       if (foundItem) {
         foundItem.fixedH = true;
-        foundItem.h = props.config.subTableHeight + titleHeight;
-        setFormItemHeight(
-          props.config.id,
-          true,
-          props.config.subTableHeight + titleHeight
-        );
+        foundItem.h = tableHeight + titleHeight;
+        setFormItemHeight(props.config.id, true, foundItem.h);
       }
     }
     const tableRef = Vue.ref();
@@ -193,17 +192,19 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           ref: tableRef,
           templateKey: __props.config.subTableKey,
           isSubTable: "",
-          onLoaded: subTableLoaded,
+          onHeightLoaded: subTableLoaded,
           mode: __props.config.subTableMode,
           titleMode: __props.config.titleMode,
           hasPagination: __props.config.isSubTablePagination,
+          heightMode: Vue.unref(heightMode),
           height: __props.config.subTableHeight,
+          maxHeight: __props.config.subTableMaxHeight,
           tableData: Vue.unref(subTableData),
           initSearchData: Vue.unref(initSearchData),
           canLoadBySearchData: __props.config.reloadOnParamsChange,
           readonly: __props.config.isSubTableReadOnly || __props.formMode == "query",
           btnRollbackEvent: Vue.unref(btnRollbackEvent)
-        }, null, 8, ["templateKey", "mode", "titleMode", "hasPagination", "height", "tableData", "initSearchData", "canLoadBySearchData", "readonly", "btnRollbackEvent"])
+        }, null, 8, ["templateKey", "mode", "titleMode", "hasPagination", "heightMode", "height", "maxHeight", "tableData", "initSearchData", "canLoadBySearchData", "readonly", "btnRollbackEvent"])
       ], 64);
     };
   }

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

@@ -94,10 +94,18 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       type: Boolean,
       default: false
     },
+    heightMode: {
+      type: String,
+      default: ""
+    },
     height: {
       type: Number,
       default: null
     },
+    maxHeight: {
+      type: Number,
+      default: null
+    },
     readonly: {
       type: Boolean,
       default: false
@@ -123,11 +131,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     "selection-change",
     "sort-change",
     "page-change",
-    "loaded"
+    "loaded",
+    "height-loaded"
   ],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
+    const fecTableContainerRef = Vue.ref(null);
     const tableRef = Vue.ref(null);
     const tableContainer = Vue.ref(null);
     const currentMode = Vue.ref("");
@@ -189,13 +199,43 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       };
     });
     const autoResize = Vue.computed(() => {
-      return localConfig.value.heightMode === "auto";
+      if (props.isSubTable) {
+        if (props.heightMode) {
+          return props.heightMode == "auto";
+        } else {
+          return false;
+        }
+      } else {
+        return localConfig.value.heightMode == "auto";
+      }
     });
     const tableHeight = Vue.computed(() => {
-      if (localConfig.value.heightMode === "auto") {
-        return "100%";
+      if (props.isSubTable) {
+        if (props.heightMode == "fixed" && props.height) {
+          return props.height;
+        } else {
+          return "";
+        }
+      } else {
+        if (localConfig.value.heightMode === "auto") {
+          return "100%";
+        }
+        return localConfig.value.height || 500;
+      }
+    });
+    const tableMaxHeight = Vue.computed(() => {
+      if (props.isSubTable) {
+        if (props.heightMode == "max" && props.maxHeight) {
+          return props.maxHeight;
+        } else {
+          return "";
+        }
+      } else {
+        if (localConfig.value.heightMode === "max") {
+          return localConfig.value.maxHeight || 500;
+        }
+        return "";
       }
-      return localConfig.value.height || 500;
     });
     const summaryConfig = Vue.computed(() => {
       return localConfig.value.summaryConfig || {
@@ -508,6 +548,19 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const handleRadioChange = (checked) => {
       emit("selection-change", [checked.row]);
     };
+    const handleInitRendered = ({ visibleColumn, visibleData, $event }) => {
+      const offsetHeight = fecTableContainerRef.value.$el.offsetHeight;
+      emit("height-loaded", localConfig.value, offsetHeight);
+    };
+    const handleDataRendered = ({
+      isReload,
+      visibleColumn,
+      visibleData,
+      $event
+    }) => {
+      const offsetHeight = fecTableContainerRef.value.$el.offsetHeight;
+      emit("height-loaded", localConfig.value, offsetHeight);
+    };
     const handleFilterSearch = (filters) => {
       var _a, _b;
       if (dataSourceManager.value) {
@@ -708,8 +761,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           }
         });
         initHandleEvent();
-        emit("loaded", localConfig.value);
         configLoading.value = false;
+        Vue.nextTick(() => {
+          var _a2;
+          const offsetHeight = ((_a2 = fecTableContainerRef.value) == null ? void 0 : _a2.$el.offsetHeight) || 300;
+          emit("height-loaded", localConfig.value, offsetHeight);
+        });
         return;
       }
       configLoading.value = true;
@@ -802,7 +859,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         "data-id": localConfig.value.templateKey,
         "data-name": localConfig.value.templateName,
         "data-pkId": localConfig.value.pkId,
-        "data-version": "v5"
+        "data-version": "v5",
+        ref_key: "fecTableContainerRef",
+        ref: fecTableContainerRef
       }, {
         default: Vue.withCtx(() => {
           var _a, _b, _c, _d;
@@ -811,10 +870,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               key: 0,
               ref_key: "tableContainer",
               ref: tableContainer,
-              class: "fec-table-container",
-              style: Vue.normalizeStyle(
-                props.height && props.height > 0 ? { height: `${props.height}px` } : {}
-              )
+              class: "fec-table-container"
             }, [
               ((_b = (_a = localConfig.value) == null ? void 0 : _a.queryConfig) == null ? void 0 : _b.mode) == "fixed" ? (Vue.openBlock(), Vue.createElementBlock(Vue.Fragment, { key: 0 }, [
                 Vue.createVNode(TableFilter.default, {
@@ -852,6 +908,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                   data: displayData.value,
                   "auto-resize": autoResize.value,
                   height: tableHeight.value,
+                  maxHeight: tableMaxHeight.value,
                   "empty-text": "暂无数据",
                   "export-config": Vue.unref(exportConfig),
                   "row-config": rowConfig.value,
@@ -863,7 +920,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                   onSortChange: handleSortChange,
                   onCheckboxChange: handleCheckboxChange,
                   onCheckboxAll: handleCheckboxAll,
-                  onRadioChange: handleRadioChange
+                  onRadioChange: handleRadioChange,
+                  onInitRendered: handleInitRendered,
+                  onDataRendered: handleDataRendered
                 }, {
                   default: Vue.withCtx(() => {
                     var _a2;
@@ -898,7 +957,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                     ];
                   }),
                   _: 3
-                }, 8, ["data", "auto-resize", "height", "export-config", "row-config", "radio-config", "checkbox-config", "sort-config", "show-footer", "footer-data"])
+                }, 8, ["data", "auto-resize", "height", "maxHeight", "export-config", "row-config", "radio-config", "checkbox-config", "sort-config", "show-footer", "footer-data"])
               ]),
               isPagination.value && displayData.value.length > 0 ? (Vue.openBlock(), Vue.createBlock(Pagination.default, {
                 key: 2,
@@ -906,7 +965,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                 pagination: displayPagination.value,
                 onChange: handlePageChange
               }, null, 8, ["config", "pagination"])) : Vue.createCommentVNode("", true)
-            ], 4)) : Vue.createCommentVNode("", true)
+            ], 512)) : Vue.createCommentVNode("", true)
           ];
         }),
         _: 3
@@ -914,5 +973,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-1b05547f"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-b224babf"]]);
 exports.default = _Table;

package/package.json

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