@fecp/designer 5.5.49 → 5.5.51

package/es/packages/vue/src/components/forms/form/Form.vue.mjs

@@ -1114,7 +1114,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-39413629"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-0a538ee8"]]);
 export {
   _Form as default
 };

package/es/packages/vue/src/components/forms/number/Number.vue.mjs

@@ -253,7 +253,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           true
         );
       } else {
-        textValue.value = Number(displayValue.toFixed(precision.value));
+        textValue.value = Number(Number(displayValue).toFixed(precision.value));
       }
       if (!showThousandsSeparator.value) {
         textValue.value = delcommafy(textValue.value);
@@ -507,7 +507,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Number = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-cc99b56c"]]);
+const _Number = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a8b5b9df"]]);
 export {
   _Number as default
 };

package/es/packages/vue/src/components/forms/roleSelect/RoleSelect.vue.mjs

@@ -72,7 +72,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       url: "/sysRole/findByPageV5",
       method: "post",
       contentType: "json",
-      params: []
+      params: dialog.dialogParams || []
     });
     function openSuffixDialog() {
       openDialog(
@@ -124,7 +124,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _RoleSelect = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-1b45cabd"]]);
+const _RoleSelect = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3f845d75"]]);
 export {
   _RoleSelect as default
 };

package/es/packages/vue/src/components/forms/subTable/SubTable.vue.mjs

@@ -104,7 +104,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
@@ -112,12 +112,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 = ref();
@@ -191,17 +187,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: __props.config.subTableHeightType,
           height: __props.config.subTableHeight,
+          maxHeight: __props.config.subTableMaxHeight,
           tableData: unref(subTableData),
           initSearchData: unref(initSearchData),
           canLoadBySearchData: __props.config.reloadOnParamsChange,
           readonly: __props.config.isSubTableReadOnly || __props.formMode == "query",
           btnRollbackEvent: 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/es/packages/vue/src/components/forms/userSelect/UserSelect.vue.mjs

@@ -72,7 +72,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       url: "/user/sysUser/findByPageV5",
       method: "post",
       contentType: "json",
-      params: []
+      params: dialog.dialogParams || []
     });
     function openSuffixDialog() {
       openDialog(
@@ -124,7 +124,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _UserSelect = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b75f4ba0"]]);
+const _UserSelect = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-0cc70898"]]);
 export {
   _UserSelect as default
 };

package/es/packages/vue/src/components/table/Table.vue.mjs

@@ -5,7 +5,7 @@ import "../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                  */
 /* empty css                                                                  */
 /* empty css                                                                */
-import { ref, getCurrentInstance, computed, reactive, watch, onMounted, onUnmounted, createBlock, openBlock, normalizeClass, withCtx, createElementBlock, createCommentVNode, normalizeStyle, createElementVNode, Fragment, createVNode, unref, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps } from "vue";
+import { ref, getCurrentInstance, computed, reactive, watch, onMounted, onUnmounted, createBlock, openBlock, normalizeClass, withCtx, createElementBlock, createCommentVNode, createElementVNode, Fragment, createVNode, unref, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps } from "vue";
 import { VxeTable } from "vxe-table";
 import XEUtils from "xe-utils";
 /* empty css                                                   */
@@ -92,10 +92,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
@@ -126,6 +134,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
+    const fecTableContainerRef = ref(null);
     const tableRef = ref(null);
     const tableContainer = ref(null);
     const currentMode = ref("");
@@ -187,13 +196,43 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       };
     });
     const autoResize = 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 = 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 = 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 = computed(() => {
       return localConfig.value.summaryConfig || {
@@ -506,6 +545,23 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const handleRadioChange = (checked) => {
       emit("selection-change", [checked.row]);
     };
+    const handleInitRendered = ({ visibleColumn, visibleData, $event }) => {
+      if ((visibleData == null ? void 0 : visibleData.length) > 0) {
+        const offsetHeight = fecTableContainerRef.value.$el.offsetHeight;
+        emit("height-loaded", localConfig.value, offsetHeight);
+      }
+    };
+    const handleDataRendered = ({
+      isReload,
+      visibleColumn,
+      visibleData,
+      $event
+    }) => {
+      if ((visibleData == null ? void 0 : visibleData.length) > 0) {
+        const offsetHeight = fecTableContainerRef.value.$el.offsetHeight;
+        emit("height-loaded", localConfig.value, offsetHeight);
+      }
+    };
     const handleFilterSearch = (filters) => {
       var _a, _b;
       if (dataSourceManager.value) {
@@ -706,7 +762,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           }
         });
         initHandleEvent();
-        emit("loaded", localConfig.value);
         configLoading.value = false;
         return;
       }
@@ -800,7 +855,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: withCtx(() => {
           var _a, _b, _c, _d;
@@ -809,10 +866,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               key: 0,
               ref_key: "tableContainer",
               ref: tableContainer,
-              class: "fec-table-container",
-              style: 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" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                 createVNode(TableFilter, {
@@ -850,6 +904,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                   data: displayData.value,
                   "auto-resize": autoResize.value,
                   height: tableHeight.value,
+                  maxHeight: tableMaxHeight.value,
                   "empty-text": "暂无数据",
                   "export-config": unref(exportConfig),
                   "row-config": rowConfig.value,
@@ -861,7 +916,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                   onSortChange: handleSortChange,
                   onCheckboxChange: handleCheckboxChange,
                   onCheckboxAll: handleCheckboxAll,
-                  onRadioChange: handleRadioChange
+                  onRadioChange: handleRadioChange,
+                  onInitRendered: handleInitRendered,
+                  onDataRendered: handleDataRendered
                 }, {
                   default: withCtx(() => {
                     var _a2;
@@ -896,7 +953,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 ? (openBlock(), createBlock(Pagination, {
                 key: 2,
@@ -904,7 +961,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                 pagination: displayPagination.value,
                 onChange: handlePageChange
               }, null, 8, ["config", "pagination"])) : createCommentVNode("", true)
-            ], 4)) : createCommentVNode("", true)
+            ], 512)) : createCommentVNode("", true)
           ];
         }),
         _: 3
@@ -912,7 +969,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-1b05547f"]]);
+const _Table = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b4cfc848"]]);
 export {
   _Table as default
 };

package/lib/designer/package.json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const version = "5.5.49";
+const version = "5.5.51";
 const packageJson = {
   version
 };

package/lib/designer/src/packages/form/aside/index.js

@@ -114,7 +114,9 @@ const components = [
         dataSourceFrom: "main",
         subTableParams: [],
         subTableHeight: 300,
+        subTableMaxHeight: 300,
         isSubTablePagination: true,
+        subTableHeightType: "auto",
         ...defaultProperty
       },
       {

package/lib/designer/src/packages/form/property/subTable.vue.js

@@ -63,6 +63,12 @@ const _sfc_main = {
       if (!item.btnRollback) {
         item.btnRollback = [];
       }
+      if (!item.subTableHeightType) {
+        item.subTableHeightType = "auto";
+      }
+      if (!item.subTableMaxHeight) {
+        item.subTableMaxHeight = 300;
+      }
       return item;
     });
     const activeName = Vue.ref(["common"]);
@@ -150,7 +156,7 @@ const _sfc_main = {
       return Vue.openBlock(), Vue.createBlock(_component_el_collapse, {
         class: "setting",
         modelValue: activeName.value,
-        "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => activeName.value = $event)
+        "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => activeName.value = $event)
       }, {
         default: Vue.withCtx(() => [
           Vue.createVNode(_component_el_collapse_item, {
@@ -187,19 +193,19 @@ const _sfc_main = {
                       }, {
                         default: Vue.withCtx(() => [
                           Vue.createVNode(_component_el_radio_button, { value: "none" }, {
-                            default: Vue.withCtx(() => _cache[15] || (_cache[15] = [
+                            default: Vue.withCtx(() => _cache[17] || (_cache[17] = [
                               Vue.createTextVNode("无")
                             ])),
                             _: 1
                           }),
                           Vue.createVNode(_component_el_radio_button, { value: "label" }, {
-                            default: Vue.withCtx(() => _cache[16] || (_cache[16] = [
+                            default: Vue.withCtx(() => _cache[18] || (_cache[18] = [
                               Vue.createTextVNode("标题")
                             ])),
                             _: 1
                           }),
                           Vue.createVNode(_component_el_radio_button, { value: "subLabel" }, {
-                            default: Vue.withCtx(() => _cache[17] || (_cache[17] = [
+                            default: Vue.withCtx(() => _cache[19] || (_cache[19] = [
                               Vue.createTextVNode("子标题")
                             ])),
                             _: 1
@@ -236,13 +242,13 @@ const _sfc_main = {
                       }, {
                         default: Vue.withCtx(() => [
                           Vue.createVNode(_component_el_radio_button, { value: "main" }, {
-                            default: Vue.withCtx(() => _cache[18] || (_cache[18] = [
+                            default: Vue.withCtx(() => _cache[20] || (_cache[20] = [
                               Vue.createTextVNode("主页面获取")
                             ])),
                             _: 1
                           }),
                           Vue.createVNode(_component_el_radio_button, { value: "self" }, {
-                            default: Vue.withCtx(() => _cache[19] || (_cache[19] = [
+                            default: Vue.withCtx(() => _cache[21] || (_cache[21] = [
                               Vue.createTextVNode("子列表自加载")
                             ])),
                             _: 1
@@ -323,29 +329,85 @@ const _sfc_main = {
                       ]),
                       _: 1
                     }),
-                    Vue.createVNode(_component_el_form_item, { label: "高度" }, {
+                    Vue.createVNode(_component_el_form_item, { label: "列表高度" }, {
+                      default: Vue.withCtx(() => [
+                        Vue.createVNode(_component_el_radio_group, {
+                          modelValue: currentItem.value.subTableHeightType,
+                          "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => currentItem.value.subTableHeightType = $event),
+                          size: "small"
+                        }, {
+                          default: Vue.withCtx(() => [
+                            Vue.createVNode(_component_el_radio_button, { value: "auto" }, {
+                              default: Vue.withCtx(() => _cache[22] || (_cache[22] = [
+                                Vue.createTextVNode("自适应")
+                              ])),
+                              _: 1
+                            }),
+                            Vue.createVNode(_component_el_radio_button, { value: "max" }, {
+                              default: Vue.withCtx(() => _cache[23] || (_cache[23] = [
+                                Vue.createTextVNode("最大高度")
+                              ])),
+                              _: 1
+                            }),
+                            Vue.createVNode(_component_el_radio_button, { value: "fixed" }, {
+                              default: Vue.withCtx(() => _cache[24] || (_cache[24] = [
+                                Vue.createTextVNode("固定高度")
+                              ])),
+                              _: 1
+                            })
+                          ]),
+                          _: 1
+                        }, 8, ["modelValue"])
+                      ]),
+                      _: 1
+                    }),
+                    currentItem.value.subTableHeightType == "max" ? (Vue.openBlock(), Vue.createBlock(_component_el_form_item, {
+                      key: 0,
+                      label: "最大高度"
+                    }, {
+                      default: Vue.withCtx(() => [
+                        Vue.createVNode(_component_el_input_number, {
+                          modelValue: currentItem.value.subTableMaxHeight,
+                          "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => currentItem.value.subTableMaxHeight = $event),
+                          min: 100,
+                          "controls-position": "right",
+                          controls: false,
+                          style: { "width": "100%" }
+                        }, {
+                          suffix: Vue.withCtx(() => _cache[25] || (_cache[25] = [
+                            Vue.createTextVNode("px")
+                          ])),
+                          _: 1
+                        }, 8, ["modelValue"])
+                      ]),
+                      _: 1
+                    })) : Vue.createCommentVNode("", true),
+                    currentItem.value.subTableHeightType == "fixed" ? (Vue.openBlock(), Vue.createBlock(_component_el_form_item, {
+                      key: 1,
+                      label: "固定高度"
+                    }, {
                       default: Vue.withCtx(() => [
                         Vue.createVNode(_component_el_input_number, {
                           modelValue: currentItem.value.subTableHeight,
-                          "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => currentItem.value.subTableHeight = $event),
-                          min: 300,
+                          "onUpdate:modelValue": _cache[13] || (_cache[13] = ($event) => currentItem.value.subTableHeight = $event),
+                          min: 100,
                           "controls-position": "right",
                           controls: false,
                           style: { "width": "100%" }
                         }, {
-                          suffix: Vue.withCtx(() => _cache[20] || (_cache[20] = [
+                          suffix: Vue.withCtx(() => _cache[26] || (_cache[26] = [
                             Vue.createTextVNode("px")
                           ])),
                           _: 1
                         }, 8, ["modelValue"])
                       ]),
                       _: 1
-                    }),
+                    })) : Vue.createCommentVNode("", true),
                     Vue.createVNode(_component_el_form_item, { label: "是否翻页" }, {
                       default: Vue.withCtx(() => [
                         Vue.createVNode(_component_el_switch, {
                           modelValue: currentItem.value.isSubTablePagination,
-                          "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => currentItem.value.isSubTablePagination = $event)
+                          "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => currentItem.value.isSubTablePagination = $event)
                         }, null, 8, ["modelValue"])
                       ]),
                       _: 1
@@ -354,7 +416,7 @@ const _sfc_main = {
                       default: Vue.withCtx(() => [
                         Vue.createVNode(_component_el_switch, {
                           modelValue: currentItem.value.isSubTableReadOnly,
-                          "onUpdate:modelValue": _cache[13] || (_cache[13] = ($event) => currentItem.value.isSubTableReadOnly = $event)
+                          "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => currentItem.value.isSubTableReadOnly = $event)
                         }, null, 8, ["modelValue"])
                       ]),
                       _: 1
@@ -363,7 +425,7 @@ const _sfc_main = {
                       default: Vue.withCtx(() => [
                         Vue.createElementVNode("div", _hoisted_1, [
                           currentItem.value.btnRollback && currentItem.value.btnRollback.length > 0 ? (Vue.openBlock(), Vue.createElementBlock("div", _hoisted_2, [
-                            _cache[21] || (_cache[21] = Vue.createElementVNode("div", { class: "buttons-header" }, [
+                            _cache[27] || (_cache[27] = Vue.createElementVNode("div", { class: "buttons-header" }, [
                               Vue.createElementVNode("div", { class: "buttons-cell name-header" }, "按钮"),
                               Vue.createElementVNode("div", { class: "buttons-cell action-header" }, "回调事件")
                             ], -1)),
@@ -432,7 +494,7 @@ const _sfc_main = {
                                   icon: "Plus",
                                   link: ""
                                 }, {
-                                  default: Vue.withCtx(() => _cache[22] || (_cache[22] = [
+                                  default: Vue.withCtx(() => _cache[28] || (_cache[28] = [
                                     Vue.createTextVNode(" 新增按钮 ")
                                   ])),
                                   _: 1
@@ -458,5 +520,5 @@ const _sfc_main = {
     };
   }
 };
-const subTable = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-b5400259"]]);
+const subTable = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-f81c0a82"]]);
 exports.default = subTable;