@fecp/vue 1.1.5 → 1.1.7

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

@@ -13,8 +13,6 @@ import _FormItem from "../formItem/FormItem.vue.mjs";
 import { createDataSource } from "../../../utils/datasource.mjs";
 import { generateFieldRules } from "./validation.mjs";
 import { cloneDeep } from "../../../utils/common.mjs";
-/* empty css                                                                                                                                        */
-/* empty css                                                                                                                                          */
 /* empty css                                                                                                                                              */
 /* empty css                                                                                                                                         */
 /* empty css                                                                                                                                        */
@@ -27,6 +25,8 @@ import { footer } from "../../details/footer/index.mjs";
 import { checkFilterMatch } from "../../../utils/parseFilterConfig.mjs";
 import { calculate } from "../../../utils/formulajs/calculate.mjs";
 import hooks from "../../../../../../node_modules/.pnpm/moment@2.30.1/node_modules/moment/dist/moment.mjs";
+/* empty css                                                                                                                                        */
+/* empty css                                                                                                                                          */
 /* empty css           */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { ElContainer } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/container/index.mjs";
@@ -115,7 +115,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         emit("loaded", option);
         rowHeight.value = option.labelPosition == "top" ? 1.5 : 1;
         localConfig.value = option;
-        fieldsData.value = option.fieldsData.map((item) => item.component);
+        fieldsData.value = option.fieldsData.map((item) => {
+          if (option.formMode == "query") {
+            item.component.disabled = true;
+          }
+          return item.component;
+        });
         hiddenFields.value = option.hiddenFields || [];
         loadFormData();
         await loadFieldDataSources();
@@ -299,10 +304,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         }
         return item;
       });
-      console.log(
-        "🚀 ~ localConfig.value.fieldsData:",
-        localConfig.value.fieldsData
-      );
       const linkedConfig = localConfig.value.linkedConfig || {};
       const dataLink = (linkedConfig == null ? void 0 : linkedConfig.dataLink) || [];
       const fields = [...fieldsData.value, ...hiddenFields.value];
@@ -411,7 +412,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           });
         }
       });
-      console.log("🚀 ~ gridLayoutData:", gridLayoutData);
       return gridLayoutData;
     });
     const getFieldError = (fieldName) => {
@@ -542,7 +542,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const _component_el_container = ElContainer;
       return openBlock(), createBlock(_component_el_container, {
         direction: "vertical",
-        style: { "height": "100%" }
+        class: "fec-form",
+        "data-id": localConfig.value.templateKey,
+        "data-name": localConfig.value.templateName,
+        "data-pkId": localConfig.value.pkId
       }, {
         default: withCtx(() => [
           !configLoading.value && !__props.isSubForm ? (openBlock(), createBlock(unref(header), {
@@ -607,11 +610,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           }, null, 8, ["pageFooterConfig"])) : createCommentVNode("", true)
         ]),
         _: 1
-      });
+      }, 8, ["data-id", "data-name", "data-pkId"]);
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5ea07f4a"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-91cd3c24"]]);
 export {
   _Form as default
 };

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

@@ -55,7 +55,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     });
     const initSearchData = computed(() => {
       if (props.config.dataSourceFrom == "self") {
-        const fields = props.localConfig.fieldsData.map((item2) => item2.component);
+        const fields = props.localConfig.fieldsData.map((item) => item.component);
         const params = parseRouteParams(
           props.config.subTableParams,
           formData.value,
@@ -68,13 +68,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     });
     function subTableLoaded(subOption) {
       const foundItem = props.localConfig.fieldsData.find(
-        (item2) => item2.id == props.config.id
+        (item) => item.id == props.config.id
       );
       const titleHeight = config.titleMode != "none" ? 60 : 0;
       if (foundItem) {
         foundItem.fixedH = true;
-        item.y = item.y * props.config.subTableHeight + titleHeight;
         foundItem.h = props.config.subTableHeight + titleHeight;
+        foundItem.y = foundItem.y * foundItem.h;
         gridLayout.value.resizeEvent();
       }
     }

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

@@ -1,11 +1,10 @@
 /* empty css                                                                                                                                 */
-/* empty css                                                                                                                                       */
 /* empty css                                                                                                                                         */
 /* empty css                                                                                                                                     */
 /* empty css                                                                                                                                      */
 /* empty css                                                                                                                                      */
 /* empty css                                                                                                                                    */
-import { ref, getCurrentInstance, computed, reactive, watch, onMounted, onUnmounted, createBlock, openBlock, withCtx, createElementBlock, createCommentVNode, normalizeStyle, createElementVNode, withDirectives, unref, createVNode, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps } from "vue";
+import { ref, getCurrentInstance, computed, reactive, watch, onMounted, onUnmounted, createBlock, openBlock, withCtx, createElementBlock, createCommentVNode, normalizeStyle, createElementVNode, createVNode, unref, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps } from "vue";
 import "../../../../../node_modules/.pnpm/vxe-table@4.17.47_vue@3.5.13_typescript@5.7.3_/node_modules/vxe-table/es/components.mjs";
 /* empty css                                                                                                                     */
 import { createDataSource } from "../../utils/datasource.mjs";
@@ -14,21 +13,20 @@ import CustomButtons from "./CustomButtons.vue.mjs";
 import TableColumn from "./TableColumn.vue.mjs";
 import TableFilter from "./TableFilter.vue.mjs";
 import { getCurrentVueInstance } from "../../utils/getInstance.mjs";
-/* empty css                                                                                                                                     */
-/* empty css                                                                                                                                       */
 /* empty css                                                                                                                                           */
 /* empty css                                                                                                                                      */
 /* empty css                                                                                                                                     */
 /* empty css                                                                                                                                       */
 import { useEventFlow } from "../../utils/eventFlow/eventFlowHandler.mjs";
 import getJsonAsyncUtil from "../../utils/getJsonAsyncUtil.mjs";
+/* empty css                                                                                                                                     */
+/* empty css                                                                                                                                       */
 /* empty css            */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { ElContainer } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/container/index.mjs";
 import { VxeTable } from "../../../../../node_modules/.pnpm/vxe-table@4.17.47_vue@3.5.13_typescript@5.7.3_/node_modules/vxe-table/es/table/index.mjs";
-import vLoading from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/loading/src/directive.mjs";
 import { ElMessage } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message/index.mjs";
-const _hoisted_1 = { class: "fec-table" };
+const _hoisted_1 = { class: "fec-vxe-table" };
 const _sfc_main = /* @__PURE__ */ Object.assign({
   inheritAttrs: false
 }, {
@@ -107,13 +105,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
       return ((_a = dataSourceManager.value) == null ? void 0 : _a.getData().list) || [];
     });
-    const loading = computed(() => {
-      var _a;
-      if (props.tableData && props.tableData.length > 0) {
-        return false;
-      }
-      return ((_a = dataSourceManager.value) == null ? void 0 : _a.getLoading()) || false;
-    });
     const isPagination = computed(() => {
       var _a;
       if (props.isSubTable) {
@@ -430,6 +421,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         localConfig.value = option;
         emit("loaded", option);
       } catch (error) {
+        debugger;
         console.error("加载配置失败:", error);
         ElMessage.error("加载配置失败");
       } finally {
@@ -467,10 +459,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     });
     return (_ctx, _cache) => {
       const _component_el_container = ElContainer;
-      const _directive_loading = vLoading;
       return openBlock(), createBlock(_component_el_container, {
         direction: "vertical",
-        style: { "height": "100%" }
+        class: "fec-table",
+        "data-id": localConfig.value.templateKey,
+        "data-name": localConfig.value.templateName,
+        "data-pkId": localConfig.value.pkId
       }, {
         default: withCtx(() => [
           !configLoading.value ? (openBlock(), createElementBlock("div", {
@@ -495,7 +489,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               onClick: handleCustomBtnClick
             }, null, 8, ["custom-btns"])) : createCommentVNode("", true),
             createElementVNode("div", _hoisted_1, [
-              withDirectives((openBlock(), createBlock(unref(VxeTable), {
+              createVNode(unref(VxeTable), {
                 ref_key: "tableRef",
                 ref: tableRef,
                 data: displayData.value,
@@ -538,9 +532,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                   ];
                 }),
                 _: 3
-              }, 8, ["data", "auto-resize", "height", "export-config"])), [
-                [_directive_loading, loading.value]
-              ])
+              }, 8, ["data", "auto-resize", "height", "export-config"])
             ]),
             isPagination.value ? (openBlock(), createBlock(Pagination, {
               key: 2,
@@ -551,11 +543,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           ], 4)) : createCommentVNode("", true)
         ]),
         _: 3
-      });
+      }, 8, ["data-id", "data-name", "data-pkId"]);
     };
   }
 });
-const Table = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-42f50d67"]]);
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7ae4acf8"]]);
 export {
   Table as default
 };

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

@@ -7,6 +7,7 @@ import { CopyDocument as copy_document_default } from "../../../../../node_modul
 import { checkFilterMatch } from "../../utils/parseFilterConfig.mjs";
 /* empty css                                                                                                                                     */
 /* empty css                                                                                                                                       */
+/* empty css                                                                                                                                       */
 /* empty css                                                                                                                                           */
 /* empty css                                                                                                                                     */
 /* empty css                                                                                                                                       */

package/es/packages/vue/src/composables/usePageEvents.mjs

@@ -2,6 +2,7 @@ import { onUnmounted, onBeforeUnmount, onMounted } from "vue";
 /* empty css                                                                                                                              */
 /* empty css                                                                                                                                  */
 /* empty css                                                                                                                                    */
+/* empty css                                                                                                                                    */
 /* empty css                                                                                                                                        */
 /* empty css                                                                                                                                   */
 /* empty css                                                                                                                                  */

package/es/packages/vue/src/utils/datasource.mjs

@@ -3,6 +3,8 @@ import { parseRouteParams } from "./parseRouteParams.mjs";
 /* empty css                                                                                                                              */
 /* empty css                                                                                                                                  */
 /* empty css                                                                                                                                    */
+/* empty css                                                                                                                                    */
+import { ElLoading } from "../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/loading/index.mjs";
 import { ElMessage } from "../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message/index.mjs";
 class DataSourceManager {
   constructor(options = {}) {
@@ -25,6 +27,11 @@ class DataSourceManager {
       loaded: [],
       error: []
     };
+    this.LoadingInstance = {
+      target: null,
+      // 保存Loading实例
+      count: 0
+    };
   }
   /**
    * 获取当前数据源配置
@@ -122,6 +129,17 @@ class DataSourceManager {
     }
     this.loading = true;
     this.error = null;
+    this.LoadingInstance.count++;
+    if (this.LoadingInstance.count === 1) {
+      this.LoadingInstance.target = ElLoading.service({
+        fullscreen: true,
+        lock: true,
+        text: "拼命加载中",
+        // spinner: loadingSvg,
+        background: "rgba(0, 0, 0, 0)",
+        customClass: "h-loading"
+      });
+    }
     try {
       const params = this.buildRequestParams(extraParams);
       const requestConfig = this.getRequestConfig();
@@ -187,7 +205,7 @@ class DataSourceManager {
       this.emit("error", err);
       throw err;
     } finally {
-      this.loading = false;
+      this.closeLoading();
     }
   }
   /**
@@ -270,6 +288,15 @@ class DataSourceManager {
   getLoading() {
     return this.loading;
   }
+  closeLoading() {
+    if (this.LoadingInstance.count > 0) {
+      this.LoadingInstance.count--;
+    }
+    if (this.LoadingInstance.count === 0 && this.LoadingInstance.target) {
+      this.LoadingInstance.target.close();
+      this.LoadingInstance.target = null;
+    }
+  }
   /**
    * 获取错误信息
    */

package/es/packages/vue/src/utils/eventFlow/actionHandlers.mjs

@@ -2,8 +2,6 @@ import { createDataSource } from "../datasource.mjs";
 import { parseRouteParams } from "../parseRouteParams.mjs";
 import { removeEmptyValues } from "../common.mjs";
 /* empty css                                                                                                                                 */
-/* empty css                                                                                                                                     */
-/* empty css                                                                                                                                       */
 /* empty css                                                                                                                                           */
 /* empty css                                                                                                                                      */
 /* empty css                                                                                                                                     */