@fecp/designer 5.5.50 → 5.5.53

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.5.50";
+const version = "5.5.53";
 const packageJson = {
   version
 };

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/form/aside/index.mjs

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

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

@@ -61,6 +61,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 = ref(["common"]);
@@ -148,7 +154,7 @@ const _sfc_main = {
       return openBlock(), 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: withCtx(() => [
           createVNode(_component_el_collapse_item, {
@@ -185,19 +191,19 @@ const _sfc_main = {
                       }, {
                         default: withCtx(() => [
                           createVNode(_component_el_radio_button, { value: "none" }, {
-                            default: withCtx(() => _cache[15] || (_cache[15] = [
+                            default: withCtx(() => _cache[17] || (_cache[17] = [
                               createTextVNode("无")
                             ])),
                             _: 1
                           }),
                           createVNode(_component_el_radio_button, { value: "label" }, {
-                            default: withCtx(() => _cache[16] || (_cache[16] = [
+                            default: withCtx(() => _cache[18] || (_cache[18] = [
                               createTextVNode("标题")
                             ])),
                             _: 1
                           }),
                           createVNode(_component_el_radio_button, { value: "subLabel" }, {
-                            default: withCtx(() => _cache[17] || (_cache[17] = [
+                            default: withCtx(() => _cache[19] || (_cache[19] = [
                               createTextVNode("子标题")
                             ])),
                             _: 1
@@ -234,13 +240,13 @@ const _sfc_main = {
                       }, {
                         default: withCtx(() => [
                           createVNode(_component_el_radio_button, { value: "main" }, {
-                            default: withCtx(() => _cache[18] || (_cache[18] = [
+                            default: withCtx(() => _cache[20] || (_cache[20] = [
                               createTextVNode("主页面获取")
                             ])),
                             _: 1
                           }),
                           createVNode(_component_el_radio_button, { value: "self" }, {
-                            default: withCtx(() => _cache[19] || (_cache[19] = [
+                            default: withCtx(() => _cache[21] || (_cache[21] = [
                               createTextVNode("子列表自加载")
                             ])),
                             _: 1
@@ -321,29 +327,85 @@ const _sfc_main = {
                       ]),
                       _: 1
                     }),
-                    createVNode(_component_el_form_item, { label: "高度" }, {
+                    createVNode(_component_el_form_item, { label: "列表高度" }, {
+                      default: withCtx(() => [
+                        createVNode(_component_el_radio_group, {
+                          modelValue: currentItem.value.subTableHeightType,
+                          "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => currentItem.value.subTableHeightType = $event),
+                          size: "small"
+                        }, {
+                          default: withCtx(() => [
+                            createVNode(_component_el_radio_button, { value: "auto" }, {
+                              default: withCtx(() => _cache[22] || (_cache[22] = [
+                                createTextVNode("自适应")
+                              ])),
+                              _: 1
+                            }),
+                            createVNode(_component_el_radio_button, { value: "max" }, {
+                              default: withCtx(() => _cache[23] || (_cache[23] = [
+                                createTextVNode("最大高度")
+                              ])),
+                              _: 1
+                            }),
+                            createVNode(_component_el_radio_button, { value: "fixed" }, {
+                              default: withCtx(() => _cache[24] || (_cache[24] = [
+                                createTextVNode("固定高度")
+                              ])),
+                              _: 1
+                            })
+                          ]),
+                          _: 1
+                        }, 8, ["modelValue"])
+                      ]),
+                      _: 1
+                    }),
+                    currentItem.value.subTableHeightType == "max" ? (openBlock(), createBlock(_component_el_form_item, {
+                      key: 0,
+                      label: "最大高度"
+                    }, {
+                      default: withCtx(() => [
+                        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: withCtx(() => _cache[25] || (_cache[25] = [
+                            createTextVNode("px")
+                          ])),
+                          _: 1
+                        }, 8, ["modelValue"])
+                      ]),
+                      _: 1
+                    })) : createCommentVNode("", true),
+                    currentItem.value.subTableHeightType == "fixed" ? (openBlock(), createBlock(_component_el_form_item, {
+                      key: 1,
+                      label: "固定高度"
+                    }, {
                       default: withCtx(() => [
                         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: withCtx(() => _cache[20] || (_cache[20] = [
+                          suffix: withCtx(() => _cache[26] || (_cache[26] = [
                             createTextVNode("px")
                           ])),
                           _: 1
                         }, 8, ["modelValue"])
                       ]),
                       _: 1
-                    }),
+                    })) : createCommentVNode("", true),
                     createVNode(_component_el_form_item, { label: "是否翻页" }, {
                       default: withCtx(() => [
                         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
@@ -352,7 +414,7 @@ const _sfc_main = {
                       default: withCtx(() => [
                         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
@@ -361,7 +423,7 @@ const _sfc_main = {
                       default: withCtx(() => [
                         createElementVNode("div", _hoisted_1, [
                           currentItem.value.btnRollback && currentItem.value.btnRollback.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_2, [
-                            _cache[21] || (_cache[21] = createElementVNode("div", { class: "buttons-header" }, [
+                            _cache[27] || (_cache[27] = createElementVNode("div", { class: "buttons-header" }, [
                               createElementVNode("div", { class: "buttons-cell name-header" }, "按钮"),
                               createElementVNode("div", { class: "buttons-cell action-header" }, "回调事件")
                             ], -1)),
@@ -430,7 +492,7 @@ const _sfc_main = {
                                   icon: "Plus",
                                   link: ""
                                 }, {
-                                  default: withCtx(() => _cache[22] || (_cache[22] = [
+                                  default: withCtx(() => _cache[28] || (_cache[28] = [
                                     createTextVNode(" 新增按钮 ")
                                   ])),
                                   _: 1
@@ -456,7 +518,7 @@ const _sfc_main = {
     };
   }
 };
-const subTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b5400259"]]);
+const subTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f81c0a82"]]);
 export {
   subTable as default
 };

package/es/designer.css

@@ -3307,19 +3307,19 @@ to {
 [data-v-d42788bd] .el-form-item__content {
   flex-wrap: wrap !important;
 }
-.buttons-table[data-v-b5400259] {
+.buttons-table[data-v-f81c0a82] {
   width: 100%;
   border: 1px solid #dcdfe6;
   border-radius: 4px;
   overflow: hidden;
 }
-.buttons-header[data-v-b5400259] {
+.buttons-header[data-v-f81c0a82] {
   display: flex;
   background-color: #f5f7fa;
   height: 26px;
   line-height: 26px;
 }
-.buttons-cell[data-v-b5400259] {
+.buttons-cell[data-v-f81c0a82] {
   padding: 0px 12px;
   font-weight: 500;
   font-size: 13px;
@@ -3328,27 +3328,27 @@ to {
   display: flex;
   align-items: center;
 }
-.buttons-cell[data-v-b5400259]:last-child {
+.buttons-cell[data-v-f81c0a82]:last-child {
   border-right: none;
 }
-.name-header[data-v-b5400259] {
+.name-header[data-v-f81c0a82] {
   flex: 1;
   min-width: 100px;
   font-size: 12px;
 }
-.action-header[data-v-b5400259] {
+.action-header[data-v-f81c0a82] {
   width: 180px;
   text-align: center;
 }
-.buttons-row[data-v-b5400259] {
+.buttons-row[data-v-f81c0a82] {
   display: flex;
   border-top: 1px solid #ebeef5;
 }
-.name-cell[data-v-b5400259] {
+.name-cell[data-v-f81c0a82] {
   flex: 1;
   min-width: 100px;
 }
-.action-cell[data-v-b5400259] {
+.action-cell[data-v-f81c0a82] {
   width: 180px;
   display: flex;
   align-items: center;
@@ -3356,29 +3356,29 @@ to {
   gap: 4px;
   padding: 5px;
 }
-.buttons-footer[data-v-b5400259] {
+.buttons-footer[data-v-f81c0a82] {
   padding: 8px 0;
   display: flex;
   gap: 8px;
 }
-.buttons-config-container[data-v-b5400259] {
+.buttons-config-container[data-v-f81c0a82] {
   width: 100%;
 }
-.button-dropdown-item[data-v-b5400259] {
+.button-dropdown-item[data-v-f81c0a82] {
   padding: 8px 12px;
 }
-.button-dropdown-content[data-v-b5400259] {
+.button-dropdown-content[data-v-f81c0a82] {
   display: flex;
   justify-content: space-between;
   align-items: center;
   width: 100%;
   min-width: 200px;
 }
-.button-name[data-v-b5400259] {
+.button-name[data-v-f81c0a82] {
   font-size: 13px;
   color: #606266;
 }
-.button-type[data-v-b5400259] {
+.button-type[data-v-f81c0a82] {
   font-size: 11px;
   color: #909399;
   padding: 2px 4px;
@@ -6620,12 +6620,12 @@ body,
 }
 [data-v-e95c842d] .el-checkbox-group .el-checkbox-button__inner {
   border-radius: 4px;
-}.fec-table[data-v-1b05547f] {
+}.fec-table[data-v-b224babf] {
   height: 100%;
   flex-grow: 1;
   padding: 0 16px;
 }
-.fec-table-container[data-v-1b05547f] {
+.fec-table-container[data-v-b224babf] {
   width: 100%;
   background: #fff;
   box-sizing: border-box;
@@ -6635,87 +6635,87 @@ body,
   overflow: hidden;
   flex-grow: 1;
 }
-.fec-table-container .fec-vxe-table[data-v-1b05547f] {
+.fec-table-container .fec-vxe-table[data-v-b224babf] {
   flex: 1;
   min-height: 0;
   overflow: hidden;
   margin-bottom: 16px;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table {
+.fec-table-container[data-v-b224babf] .vxe-table {
   font-size: 14px;
   font-family: inherit;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-sort--asc-btn,
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-sort--desc-btn {
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-sort--asc-btn,
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-sort--desc-btn {
   color: #dcdcdc;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .serverSort .vxe-sort--asc-btn,
-.fec-table-container[data-v-1b05547f] .vxe-table .serverSort .vxe-sort--desc-btn {
+.fec-table-container[data-v-b224babf] .vxe-table .serverSort .vxe-sort--asc-btn,
+.fec-table-container[data-v-b224babf] .vxe-table .serverSort .vxe-sort--desc-btn {
   color: #d3edf9;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .serverSort .sort--active {
+.fec-table-container[data-v-b224babf] .vxe-table .serverSort .sort--active {
   color: var(--el-color-primary);
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .sort--active {
+.fec-table-container[data-v-b224babf] .vxe-table .sort--active {
   color: var(--el-color-primary);
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-table--body-wrapper {
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-table--body-wrapper {
   overflow: auto;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-table--body,
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-table--header,
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-table--footer {
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-table--body,
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-table--header,
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-table--footer {
   width: 100% !important;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-header--column {
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-header--column {
   background-color: #fff;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-header--column .vxe-cell {
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-header--column .vxe-cell {
   height: 40px !important;
   min-height: 40px !important;
   color: #333;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-table--header-inner-wrapper {
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-table--header-inner-wrapper {
   height: 40px !important;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-body--column .vxe-cell {
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-body--column .vxe-cell {
   padding: 6px !important;
   min-height: 32px !important;
   color: #666;
   font-size: 13px;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-body--column .c--tooltip,
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-body--column .c--title {
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-body--column .c--tooltip,
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-body--column .c--title {
   height: 32px !important;
   min-height: 32px !important;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-table--border-line {
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-table--border-line {
   border: none;
   border-bottom: 1px solid #ebeef5;
   border-top: 1px solid #ebeef5;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-table--scroll-y-handle-appearance,
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-table--scroll-y-wrapper:after {
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-table--scroll-y-handle-appearance,
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-table--scroll-y-wrapper:after {
   border: none !important;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-table--scroll-y-top-corner {
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-table--scroll-y-top-corner {
   display: none !important;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-cell--sort {
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-cell--sort {
   font-size: 14px;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-body--column,
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-footer--column,
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-header--column,
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-body--column,
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-footer--column,
-.fec-table-container[data-v-1b05547f] .vxe-table .vxe-header--column {
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-body--column,
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-footer--column,
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-header--column,
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-body--column,
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-footer--column,
+.fec-table-container[data-v-b224babf] .vxe-table .vxe-header--column {
   background-image: linear-gradient(#ebeef5, #ebeef5) !important;
 }
-.fec-table-container[data-v-1b05547f] .vxe-table .el-button.is-disabled {
+.fec-table-container[data-v-b224babf] .vxe-table .el-button.is-disabled {
   color: #ccc !important;
 }
-.fec-table-sub[data-v-1b05547f] .vxe-table .vxe-table--border-line {
+.fec-table-sub[data-v-b224babf] .vxe-table .vxe-table--border-line {
   border-top: none;
 }
 .fec-layout-card[data-v-a6236024] {

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

@@ -36,6 +36,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     inject("gridLayout");
     const setFormItemHeight = inject("setFormItemHeight");
     const handleEvent = inject("handleEvent");
+    const heightMode = computed(() => {
+      return props.config.subTableHeightType || "auto";
+    });
     const btnRollbackEvent = computed(() => {
       const btnRollback = props.config.btnRollback || [];
       const data = {};
@@ -104,7 +107,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 +115,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 +190,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: unref(heightMode),
           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);
     };
   }