@fecp/designer 5.5.51 → 5.5.54

package/lib/packages/vue/src/components/layout/Layout.vue.js

@@ -4,14 +4,12 @@ require("../../../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                             */
 ;/* empty css                                                               */
 ;/* empty css                                                               */
-;/* empty css                                                                     */
 const Vue = require("vue");
 const common = require("../../utils/common.js");
 ;/* empty css             */
 const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../../../node_modules/element-plus/es/components/row/index.js");
 const index$1 = require("../../../../../node_modules/element-plus/es/components/col/index.js");
-const index$2 = require("../../../../../node_modules/element-plus/es/components/scrollbar/index.js");
 const _hoisted_1 = { class: "grid-content" };
 const _hoisted_2 = { class: "grid-content-statistics" };
 const _sfc_main = {
@@ -48,7 +46,6 @@ const _sfc_main = {
     }
     return (_ctx, _cache) => {
       const _component_fec_form = Vue.resolveComponent("fec-form");
-      const _component_el_scrollbar = index$2.ElScrollbar;
       const _component_el_col = index$1.ElCol;
       const _component_el_row = index.ElRow;
       const _directive_fec_layout = Vue.resolveDirective("fec-layout");
@@ -65,19 +62,14 @@ const _sfc_main = {
           }, {
             default: Vue.withCtx(() => [
               Vue.createElementVNode("div", _hoisted_1, [
-                Vue.createVNode(_component_el_scrollbar, { ref: "scrollbarRef" }, {
-                  default: Vue.withCtx(() => [
-                    Vue.createVNode(_component_fec_form, {
-                      ref: "formRef",
-                      templateKey: __props.templateKey,
-                      modelValue: Vue.unref(formData),
-                      "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => Vue.isRef(formData) ? formData.value = $event : null),
-                      onLoaded: loaded,
-                      initFormMode: __props.initFormMode
-                    }, null, 8, ["templateKey", "modelValue", "initFormMode"])
-                  ]),
-                  _: 1
-                }, 512)
+                Vue.createVNode(_component_fec_form, {
+                  ref: "formRef",
+                  templateKey: __props.templateKey,
+                  modelValue: Vue.unref(formData),
+                  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => Vue.isRef(formData) ? formData.value = $event : null),
+                  onLoaded: loaded,
+                  initFormMode: __props.initFormMode
+                }, null, 8, ["templateKey", "modelValue", "initFormMode"])
               ])
             ]),
             _: 1
@@ -101,5 +93,5 @@ const _sfc_main = {
     };
   }
 };
-const _Layout = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-87f04a91"]]);
+const _Layout = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-1eb7b697"]]);
 exports.default = _Layout;

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

@@ -322,6 +322,7 @@ const _sfc_main = {
                 placeholder: "请输入查询条件",
                 class: "search-input",
                 clearable: "",
+                size: "default",
                 onKeyup: onSearchInputKeyup
               }, Vue.createSlots({
                 suffix: Vue.withCtx(() => [
@@ -388,7 +389,8 @@ const _sfc_main = {
                   model: filterValues.value,
                   class: "filter-form",
                   "label-width": "100px",
-                  inline: ""
+                  inline: "",
+                  size: "default"
                 }, {
                   default: Vue.withCtx(() => [
                     Vue.createElementVNode("div", _hoisted_10, [
@@ -485,5 +487,5 @@ const _sfc_main = {
     };
   }
 };
-const DynamicQuery = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-e95c842d"]]);
+const DynamicQuery = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-ba490486"]]);
 exports.default = DynamicQuery;

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

@@ -42,6 +42,7 @@ const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_exp
 ;/* empty css                                                                 */
 ;/* empty css                                                                       */
 const getJsonAsyncUtil = require("../../utils/getJsonAsyncUtil.js");
+const eventBus = require("../../utils/eventBus.js");
 ;/* empty css            */
 const index = require("../../../../../node_modules/element-plus/es/components/container/index.js");
 const index$1 = require("../../../../../node_modules/element-plus/es/components/message/index.js");
@@ -122,6 +123,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     btnRollbackEvent: {
       type: Object,
       default: {}
+    },
+    subTableConfig: {
+      type: Object,
+      default: {}
     }
   },
   emits: [
@@ -131,7 +136,8 @@ 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;
@@ -548,9 +554,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       emit("selection-change", [checked.row]);
     };
     const handleInitRendered = ({ visibleColumn, visibleData, $event }) => {
+      const offsetHeight = fecTableContainerRef.value.$el.offsetHeight;
+      emit("height-loaded", localConfig.value, offsetHeight);
       if ((visibleData == null ? void 0 : visibleData.length) > 0) {
-        const offsetHeight = fecTableContainerRef.value.$el.offsetHeight;
-        emit("height-loaded", localConfig.value, offsetHeight);
+        eventBus.default.emit("onSubTableDataLoaded", {
+          subTableConfig: props.subTableConfig,
+          visibleData
+        });
       }
     };
     const handleDataRendered = ({
@@ -559,9 +569,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       visibleData,
       $event
     }) => {
+      const offsetHeight = fecTableContainerRef.value.$el.offsetHeight;
+      emit("height-loaded", localConfig.value, offsetHeight);
       if ((visibleData == null ? void 0 : visibleData.length) > 0) {
-        const offsetHeight = fecTableContainerRef.value.$el.offsetHeight;
-        emit("height-loaded", localConfig.value, offsetHeight);
+        eventBus.default.emit("onSubTableDataLoaded", {
+          subTableConfig: props.subTableConfig,
+          visibleData
+        });
       }
     };
     const handleFilterSearch = (filters) => {
@@ -765,6 +779,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         });
         initHandleEvent();
         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;
@@ -971,5 +990,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-b4cfc848"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3726d701"]]);
 exports.default = _Table;

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

@@ -54,7 +54,7 @@ const _sfc_main = {
   setup(__props, { expose: __expose, emit: __emit }) {
     var _a;
     Vue.useCssVars((_ctx) => ({
-      "7cffb288": `${config.value.collapseRows * 90}px`
+      "12f9d7c1": `${config.value.collapseRows * 90}px`
     }));
     const props = __props;
     const emit = __emit;
@@ -190,6 +190,7 @@ const _sfc_main = {
           "label-position": "right",
           style: Vue.normalizeStyle({ "--column-count": config.value.columnCount }),
           tabindex: "0",
+          size: "default",
           onKeydown: Vue.withKeys(handleSearch, ["enter"])
         }, {
           default: Vue.withCtx(() => [
@@ -302,5 +303,5 @@ const _sfc_main = {
     };
   }
 };
-const TableFilter = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-0d77bdaf"]]);
+const TableFilter = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-220e0331"]]);
 exports.default = TableFilter;

package/lib/packages/vue/src/utils/eventBus.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const mitt = require("../../../../node_modules/mitt/dist/mitt.js");
+const emitter = mitt.default();
+exports.default = emitter;

package/package.json

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