@fecp/designer 5.5.102 → 5.5.104

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.5.102";
+const version = "5.5.104";
 const packageJson = {
   version
 };

package/es/designer.css

@@ -6784,12 +6784,12 @@ body,
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-}.fec-table[data-v-cf0b025d] {
+}.fec-table[data-v-2a67aa02] {
   height: 100%;
   flex-grow: 1;
   padding: 0 16px;
 }
-.fec-table-container[data-v-cf0b025d] {
+.fec-table-container[data-v-2a67aa02] {
   width: 100%;
   background: #fff;
   box-sizing: border-box;
@@ -6799,91 +6799,91 @@ body,
   overflow: hidden;
   flex-grow: 1;
 }
-.fec-table-container .fec-vxe-table[data-v-cf0b025d] {
+.fec-table-container .fec-vxe-table[data-v-2a67aa02] {
   flex: 1;
   min-height: 0;
   overflow: hidden;
   margin-bottom: 16px;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table {
+.fec-table-container[data-v-2a67aa02] .vxe-table {
   font-size: 14px;
   font-family: inherit;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-sort--asc-btn,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-sort--desc-btn {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-sort--asc-btn,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-sort--desc-btn {
   color: #dcdcdc;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .serverSort .vxe-sort--asc-btn,
-.fec-table-container[data-v-cf0b025d] .vxe-table .serverSort .vxe-sort--desc-btn {
+.fec-table-container[data-v-2a67aa02] .vxe-table .serverSort .vxe-sort--asc-btn,
+.fec-table-container[data-v-2a67aa02] .vxe-table .serverSort .vxe-sort--desc-btn {
   color: #d3edf9;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .serverSort .sort--active {
+.fec-table-container[data-v-2a67aa02] .vxe-table .serverSort .sort--active {
   color: var(--el-color-primary);
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .sort--active {
+.fec-table-container[data-v-2a67aa02] .vxe-table .sort--active {
   color: var(--el-color-primary);
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--body-wrapper {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--body-wrapper {
   overflow: auto;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--body,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--header,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--footer {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--body,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--header,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--footer {
   width: 100% !important;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-header--column {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-header--column {
   background-color: #fff;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-header--column .vxe-cell {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-header--column .vxe-cell {
   height: 40px !important;
   min-height: 40px !important;
   color: #333;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--header-inner-wrapper {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--header-inner-wrapper {
   height: 40px !important;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-body--column .vxe-cell {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-body--column .vxe-cell {
   padding: 6px !important;
   min-height: 32px !important;
   color: #666;
   font-size: 13px;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-body--column .c--tooltip,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-body--column .c--title {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-body--column .c--tooltip,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-body--column .c--title {
   height: 32px !important;
   min-height: 32px !important;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--border-line {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--border-line {
   border: none;
   border-bottom: 1px solid #ebeef5;
   border-top: 1px solid #ebeef5;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--scroll-y-handle-appearance,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--scroll-y-wrapper:after {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--scroll-y-handle-appearance,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--scroll-y-wrapper:after {
   border: none !important;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--scroll-y-top-corner {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--scroll-y-top-corner {
   display: none !important;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-cell--sort {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-cell--sort {
   font-size: 14px;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-body--column,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-footer--column,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-header--column,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-body--column,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-footer--column,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-header--column {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-body--column,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-footer--column,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-header--column,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-body--column,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-footer--column,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-header--column {
   background-image: linear-gradient(#ebeef5, #ebeef5) !important;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .el-button.is-disabled {
+.fec-table-container[data-v-2a67aa02] .vxe-table .el-button.is-disabled {
   color: #ccc !important;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--scroll-x-handle-appearance,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--scroll-x-right-corner {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--scroll-x-handle-appearance,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--scroll-x-right-corner {
   display: none !important;
 }
-.fec-table-sub[data-v-cf0b025d] .vxe-table .vxe-table--border-line {
+.fec-table-sub[data-v-2a67aa02] .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

@@ -1,7 +1,7 @@
 import "../../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                */
 /* empty css                                                                     */
-import { inject, ref, computed, resolveComponent, createElementBlock, openBlock, Fragment, createCommentVNode, createVNode, createBlock, unref, createSlots, withCtx, renderList, createTextVNode, toDisplayString } from "vue";
+import { inject, ref, watch, computed, resolveComponent, createElementBlock, openBlock, Fragment, createCommentVNode, createVNode, createBlock, unref, createSlots, withCtx, renderList, createTextVNode, toDisplayString } from "vue";
 import { SubTitle } from "../subTitle/index.mjs";
 import { H2 } from "../h2/index.mjs";
 import { parseRouteParams } from "../../../utils/parseRouteParams.mjs";
@@ -32,11 +32,21 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
   setup(__props, { expose: __expose }) {
     const props = __props;
     const getFormData = inject("getFormData");
+    const formDataOri = inject("formData");
     const formData = ref(getFormData());
     inject("rowHeight");
     inject("gridLayout");
     const setFormItemHeight = inject("setFormItemHeight");
     const handleEvent = inject("handleEvent");
+    watch(
+      formDataOri,
+      (val) => {
+        formData.value = getFormData();
+      },
+      {
+        deep: true
+      }
+    );
     const heightMode = computed(() => {
       return props.config.subTableHeightType || "auto";
     });
@@ -199,12 +209,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           height: __props.config.subTableHeight,
           maxHeight: __props.config.subTableMaxHeight,
           tableData: unref(subTableData),
-          initHiddenData: unref(initHiddenData),
+          initSearchData: unref(initHiddenData),
           canLoadBySearchData: __props.config.reloadOnParamsChange,
           readonly: __props.config.isSubTableReadOnly || __props.formMode == "query",
           btnRollbackEvent: unref(btnRollbackEvent),
           subTableConfig: __props.config
-        }, null, 8, ["templateKey", "mode", "titleMode", "hasPagination", "heightMode", "height", "maxHeight", "tableData", "initHiddenData", "canLoadBySearchData", "readonly", "btnRollbackEvent", "subTableConfig"])
+        }, null, 8, ["templateKey", "mode", "titleMode", "hasPagination", "heightMode", "height", "maxHeight", "tableData", "initSearchData", "canLoadBySearchData", "readonly", "btnRollbackEvent", "subTableConfig"])
       ], 64);
     };
   }

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

@@ -846,16 +846,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       },
       { deep: true }
     );
-    watch(
-      () => props.initHiddenData,
-      (newVal, oldVal) => {
-        if (props.canLoadBySearchData && dataSourceManager.value && !isEqual(newVal, oldVal)) {
-          dataSourceManager.value.updateInitSearchData(newVal);
-          refresh();
-        }
-      },
-      { deep: true }
-    );
     onUnmounted(() => {
       if (dataSourceManager.value) {
         dataSourceManager.value.destroy();
@@ -998,7 +988,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-cf0b025d"]]);
+const _Table = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2a67aa02"]]);
 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.102";
+const version = "5.5.104";
 const packageJson = {
   version
 };

package/lib/designer.css

@@ -6784,12 +6784,12 @@ body,
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-}.fec-table[data-v-cf0b025d] {
+}.fec-table[data-v-2a67aa02] {
   height: 100%;
   flex-grow: 1;
   padding: 0 16px;
 }
-.fec-table-container[data-v-cf0b025d] {
+.fec-table-container[data-v-2a67aa02] {
   width: 100%;
   background: #fff;
   box-sizing: border-box;
@@ -6799,91 +6799,91 @@ body,
   overflow: hidden;
   flex-grow: 1;
 }
-.fec-table-container .fec-vxe-table[data-v-cf0b025d] {
+.fec-table-container .fec-vxe-table[data-v-2a67aa02] {
   flex: 1;
   min-height: 0;
   overflow: hidden;
   margin-bottom: 16px;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table {
+.fec-table-container[data-v-2a67aa02] .vxe-table {
   font-size: 14px;
   font-family: inherit;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-sort--asc-btn,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-sort--desc-btn {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-sort--asc-btn,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-sort--desc-btn {
   color: #dcdcdc;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .serverSort .vxe-sort--asc-btn,
-.fec-table-container[data-v-cf0b025d] .vxe-table .serverSort .vxe-sort--desc-btn {
+.fec-table-container[data-v-2a67aa02] .vxe-table .serverSort .vxe-sort--asc-btn,
+.fec-table-container[data-v-2a67aa02] .vxe-table .serverSort .vxe-sort--desc-btn {
   color: #d3edf9;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .serverSort .sort--active {
+.fec-table-container[data-v-2a67aa02] .vxe-table .serverSort .sort--active {
   color: var(--el-color-primary);
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .sort--active {
+.fec-table-container[data-v-2a67aa02] .vxe-table .sort--active {
   color: var(--el-color-primary);
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--body-wrapper {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--body-wrapper {
   overflow: auto;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--body,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--header,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--footer {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--body,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--header,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--footer {
   width: 100% !important;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-header--column {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-header--column {
   background-color: #fff;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-header--column .vxe-cell {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-header--column .vxe-cell {
   height: 40px !important;
   min-height: 40px !important;
   color: #333;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--header-inner-wrapper {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--header-inner-wrapper {
   height: 40px !important;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-body--column .vxe-cell {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-body--column .vxe-cell {
   padding: 6px !important;
   min-height: 32px !important;
   color: #666;
   font-size: 13px;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-body--column .c--tooltip,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-body--column .c--title {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-body--column .c--tooltip,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-body--column .c--title {
   height: 32px !important;
   min-height: 32px !important;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--border-line {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--border-line {
   border: none;
   border-bottom: 1px solid #ebeef5;
   border-top: 1px solid #ebeef5;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--scroll-y-handle-appearance,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--scroll-y-wrapper:after {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--scroll-y-handle-appearance,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--scroll-y-wrapper:after {
   border: none !important;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--scroll-y-top-corner {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--scroll-y-top-corner {
   display: none !important;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-cell--sort {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-cell--sort {
   font-size: 14px;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-body--column,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-footer--column,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-header--column,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-body--column,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-footer--column,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-header--column {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-body--column,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-footer--column,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-header--column,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-body--column,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-footer--column,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-header--column {
   background-image: linear-gradient(#ebeef5, #ebeef5) !important;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .el-button.is-disabled {
+.fec-table-container[data-v-2a67aa02] .vxe-table .el-button.is-disabled {
   color: #ccc !important;
 }
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--scroll-x-handle-appearance,
-.fec-table-container[data-v-cf0b025d] .vxe-table .vxe-table--scroll-x-right-corner {
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--scroll-x-handle-appearance,
+.fec-table-container[data-v-2a67aa02] .vxe-table .vxe-table--scroll-x-right-corner {
   display: none !important;
 }
-.fec-table-sub[data-v-cf0b025d] .vxe-table .vxe-table--border-line {
+.fec-table-sub[data-v-2a67aa02] .vxe-table .vxe-table--border-line {
   border-top: none;
 }
 .fec-layout-card[data-v-a6236024] {

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

@@ -34,11 +34,21 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
   setup(__props, { expose: __expose }) {
     const props = __props;
     const getFormData = Vue.inject("getFormData");
+    const formDataOri = Vue.inject("formData");
     const formData = Vue.ref(getFormData());
     Vue.inject("rowHeight");
     Vue.inject("gridLayout");
     const setFormItemHeight = Vue.inject("setFormItemHeight");
     const handleEvent = Vue.inject("handleEvent");
+    Vue.watch(
+      formDataOri,
+      (val) => {
+        formData.value = getFormData();
+      },
+      {
+        deep: true
+      }
+    );
     const heightMode = Vue.computed(() => {
       return props.config.subTableHeightType || "auto";
     });
@@ -201,12 +211,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           height: __props.config.subTableHeight,
           maxHeight: __props.config.subTableMaxHeight,
           tableData: Vue.unref(subTableData),
-          initHiddenData: Vue.unref(initHiddenData),
+          initSearchData: Vue.unref(initHiddenData),
           canLoadBySearchData: __props.config.reloadOnParamsChange,
           readonly: __props.config.isSubTableReadOnly || __props.formMode == "query",
           btnRollbackEvent: Vue.unref(btnRollbackEvent),
           subTableConfig: __props.config
-        }, null, 8, ["templateKey", "mode", "titleMode", "hasPagination", "heightMode", "height", "maxHeight", "tableData", "initHiddenData", "canLoadBySearchData", "readonly", "btnRollbackEvent", "subTableConfig"])
+        }, null, 8, ["templateKey", "mode", "titleMode", "hasPagination", "heightMode", "height", "maxHeight", "tableData", "initSearchData", "canLoadBySearchData", "readonly", "btnRollbackEvent", "subTableConfig"])
       ], 64);
     };
   }

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

@@ -848,16 +848,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       },
       { deep: true }
     );
-    Vue.watch(
-      () => props.initHiddenData,
-      (newVal, oldVal) => {
-        if (props.canLoadBySearchData && dataSourceManager.value && !common.isEqual(newVal, oldVal)) {
-          dataSourceManager.value.updateInitSearchData(newVal);
-          refresh();
-        }
-      },
-      { deep: true }
-    );
     Vue.onUnmounted(() => {
       if (dataSourceManager.value) {
         dataSourceManager.value.destroy();
@@ -1000,5 +990,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-cf0b025d"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-2a67aa02"]]);
 exports.default = _Table;

package/package.json

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