@fecp/designer 5.1.6 → 5.2.0

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

@@ -14,6 +14,7 @@ const Pagination = require("./Pagination.vue.js");
 const CustomButtons = require("./CustomButtons.vue.js");
 const TableColumn = require("./TableColumn.vue.js");
 const TableFilter = require("./TableFilter.vue.js");
+const DynamicQuery = require("./DynamicQuery.vue.js");
 const getInstance = require("../../utils/getInstance.js");
 const common = require("../../utils/common.js");
 ;/* empty css                                                                                                                                      */
@@ -113,6 +114,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const ctx = getInstance.getCurrentVueInstance();
     const configLoading = vue.ref(true);
     const localConfig = vue.ref({});
+    const fieldsData = vue.ref({});
     const dataSourceOptions = vue.ref({});
     const dictionaryOptions = vue.ref({});
     const displayData = vue.computed(() => {
@@ -160,7 +162,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       if (!((_a = localConfig.value.dataSources) == null ? void 0 : _a.length)) return;
       dataSourceManager.value = datasource.createDataSource({
         http: ctx.$http,
-        initSearchData: props.initSearchData,
+        initSearchData: searchData.value,
         dataSources: localConfig.value.dataSources,
         currentDataSourceId: localConfig.value.dataSourceId,
         pagination: {
@@ -183,7 +185,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
     const loadFieldDataSources = async () => {
       var _a, _b;
-      const fields = localConfig.value.fieldsData || [];
+      const fields = fieldsData.value || [];
       const fieldDataSources = /* @__PURE__ */ new Set();
       const dictionaryKeys = /* @__PURE__ */ new Set();
       for (const field of fields) {
@@ -245,8 +247,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       mergeOptionsToFields();
     };
     const mergeOptionsToFields = () => {
-      if (localConfig.value.fieldsData) {
-        localConfig.value.fieldsData.forEach((field) => {
+      if (fieldsData.value) {
+        fieldsData.value.forEach((field) => {
           if (!field.optionConfig) return;
           const {
             optionSource,
@@ -280,7 +282,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
     };
     const { handleEvent } = eventFlowHandler.useEventFlow({
-      fields: localConfig.value.fieldsData,
+      fields: fieldsData.value,
       instance,
       localConfig: localConfig.value,
       components: {
@@ -336,6 +338,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         dataSourceManager.value.updateParams(filters);
         dataSourceManager.value.fetch();
         clearSelection();
+      } else {
+        searchData.value = filters;
       }
     };
     const handleFilterReset = () => {
@@ -450,6 +454,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         if (props.initOption) {
           localConfig.value = Object.assign({}, props.initOption);
         }
+        fieldsData.value = localConfig.value.fieldsData || [];
         emit("loaded", localConfig.value);
         configLoading.value = false;
         return;
@@ -463,9 +468,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           props.initOption
         );
         localConfig.value = option;
+        fieldsData.value = [
+          ...localConfig.value.fieldsData || [],
+          ...localConfig.value.hiddenFields || []
+        ];
         emit("loaded", option);
       } catch (error) {
-        debugger;
         console.error("加载配置失败:", error);
         index$2.ElMessage.error("加载配置失败");
       } finally {
@@ -477,6 +485,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         initDataSourceManager();
       });
     });
+    const searchData = vue.ref(props.initSearchData);
     vue.watch(
       () => props.initSearchData,
       (newVal, oldVal) => {
@@ -522,18 +531,27 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               props.height && props.height > 0 ? { height: `${props.height}px` } : {}
             )
           }, [
-            !__props.isSubTable ? (vue.openBlock(), vue.createBlock(TableFilter.default, {
-              key: 0,
-              "query-config": localConfig.value.queryConfig,
-              "fields-data": localConfig.value.fieldsData,
-              onSearch: handleFilterSearch,
-              onReset: handleFilterReset
-            }, null, 8, ["query-config", "fields-data"])) : vue.createCommentVNode("", true),
-            !__props.readonly ? (vue.openBlock(), vue.createBlock(CustomButtons.default, {
+            localConfig.value.queryConfig.mode == "fixed" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
+              !__props.isSubTable ? (vue.openBlock(), vue.createBlock(TableFilter.default, {
+                key: 0,
+                "query-config": localConfig.value.queryConfig,
+                "fields-data": fieldsData.value,
+                onSearch: handleFilterSearch,
+                onReset: handleFilterReset
+              }, null, 8, ["query-config", "fields-data"])) : vue.createCommentVNode("", true),
+              !__props.readonly ? (vue.openBlock(), vue.createBlock(CustomButtons.default, {
+                key: 1,
+                "custom-btns": localConfig.value.customBtns,
+                localConfig: localConfig.value,
+                onClick: handleCustomBtnClick
+              }, null, 8, ["custom-btns", "localConfig"])) : vue.createCommentVNode("", true)
+            ], 64)) : vue.createCommentVNode("", true),
+            localConfig.value.queryConfig.mode == "dynamic" ? (vue.openBlock(), vue.createBlock(DynamicQuery.default, {
               key: 1,
-              "custom-btns": localConfig.value.customBtns,
-              onClick: handleCustomBtnClick
-            }, null, 8, ["custom-btns"])) : vue.createCommentVNode("", true),
+              localConfig: localConfig.value,
+              "fields-data": fieldsData.value,
+              onSearch: handleFilterSearch
+            }, null, 8, ["localConfig", "fields-data"])) : vue.createCommentVNode("", true),
             vue.createElementVNode("div", _hoisted_1, [
               vue.createVNode(vue.unref(index$1.VxeTable), {
                 ref_key: "tableRef",
@@ -555,7 +573,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                   var _a;
                   return [
                     vue.createVNode(TableColumn.default, {
-                      "fields-data": localConfig.value.fieldsData,
+                      "fields-data": fieldsData.value,
                       "show-index": localConfig.value.showIndex,
                       "select-mode": __props.selectMode || localConfig.value.selectMode,
                       "is-opt-btns": localConfig.value.isOptBtns,
@@ -570,7 +588,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                       readonly: __props.readonly,
                       isDialog: __props.isDialog
                     }, vue.createSlots({ _: 2 }, [
-                      vue.renderList(localConfig.value.fieldsData, (field) => {
+                      vue.renderList(fieldsData.value, (field) => {
                         return {
                           name: `cell-${field.fieldName}`,
                           fn: vue.withCtx((scope) => [
@@ -597,5 +615,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-7ca545c2"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-498df41a"]]);
 exports.default = _Table;

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

@@ -18,6 +18,7 @@ const index$7 = require("../forms/select/index.js");
 const index$8 = require("../forms/multipleSelection/index.js");
 const index$a = require("../forms/date/index.js");
 const index$9 = require("../forms/number/index.js");
+const common = require("../../utils/common.js");
 ;/* empty css                  */
 const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_export-helper.js");
 const index = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/form/index.js");
@@ -45,7 +46,7 @@ const _sfc_main = {
   emits: ["search", "reset"],
   setup(__props, { expose: __expose, emit: __emit }) {
     vue.useCssVars((_ctx) => ({
-      "160605a0": `${config.value.collapseRows * 90}px`
+      "05c86e34": `${config.value.collapseRows * 90}px`
     }));
     const props = __props;
     const emit = __emit;
@@ -129,29 +130,10 @@ const _sfc_main = {
       isCollapsed.value = !isCollapsed.value;
     };
     const handleSearch = () => {
-      const filters = {};
-      Object.keys(filterValues.value).forEach((key) => {
-        const value = filterValues.value[key];
-        if (value !== "" && value !== null && value !== void 0) {
-          const fieldConfig = completeFilterFields.value.find(
-            (field) => field.id == key
-          );
-          const fieldName = (fieldConfig == null ? void 0 : fieldConfig.fieldName) || key;
-          const maxKey = `${key}_max`;
-          const maxValue = filterValues.value[maxKey];
-          if (maxValue !== "" && maxValue !== null && maxValue !== void 0) {
-            filters[fieldName] = value + "|" + maxValue;
-          } else if (key.endsWith("_max")) {
-            return;
-          } else {
-            if (Array.isArray(value)) {
-              filters[fieldName] = value.join("|");
-            } else {
-              filters[fieldName] = value;
-            }
-          }
-        }
-      });
+      const filters = common.handleSearchData(
+        filterValues.value,
+        completeFilterFields.value
+      );
       emit("search", { filters: JSON.stringify(filters) });
     };
     const handleReset = () => {
@@ -305,5 +287,5 @@ const _sfc_main = {
     };
   }
 };
-const TableFilter = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-5e8354e2"]]);
+const TableFilter = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-366e01c3"]]);
 exports.default = TableFilter;

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

@@ -28,6 +28,33 @@ function removeEmptyValues(data) {
   }
   return result;
 }
+const handleSearchData = (filterValues, completeFilterFields) => {
+  const filters = {};
+  Object.keys(filterValues).forEach((key) => {
+    const value = filterValues[key];
+    if (value !== "" && value !== null && value !== void 0) {
+      const fieldConfig = completeFilterFields.find(
+        (field) => field.id == key
+      );
+      const fieldName = (fieldConfig == null ? void 0 : fieldConfig.fieldName) || key;
+      const maxKey = `${key}_max`;
+      const maxValue = filterValues[maxKey];
+      if (maxValue !== "" && maxValue !== null && maxValue !== void 0) {
+        filters[fieldName] = value + "|" + maxValue;
+      } else if (key.endsWith("_max")) {
+        return;
+      } else {
+        if (Array.isArray(value)) {
+          filters[fieldName] = value.join("|");
+        } else {
+          filters[fieldName] = value;
+        }
+      }
+    }
+  });
+  return filters;
+};
 exports.cloneDeep = cloneDeep;
+exports.handleSearchData = handleSearchData;
 exports.isEqual = isEqual;
 exports.removeEmptyValues = removeEmptyValues;

package/lib/packages/vue/src/utils/eventFlow/actionHandlers.js

@@ -3,14 +3,15 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const datasource = require("../datasource.js");
 const parseRouteParams = require("../parseRouteParams.js");
 const common = require("../common.js");
-const index = require("../../components/dialog/index.js");
+const index$1 = require("../../components/dialog/index.js");
+const index = require("../../api/index.js");
 ;/* empty css                                                                                                                                 */
 ;/* empty css                                                                                                                                           */
 ;/* empty css                                                                                                                                      */
 ;/* empty css                                                                                                                                     */
 ;/* empty css                                                                                                                                       */
-const index$1 = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message/index.js");
-const index$2 = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message-box/index.js");
+const index$2 = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message/index.js");
+const index$3 = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message-box/index.js");
 async function handlePageJump(node, data, fields, context) {
   const dialogDoms = document.querySelectorAll(".el-modal-dialog");
   if ((dialogDoms == null ? void 0 : dialogDoms.length) > 0) {
@@ -92,7 +93,7 @@ async function handlePageGoBack(node, data, fields, context) {
   };
   if (config.showConfirm) {
     try {
-      await index$2.ElMessageBox.confirm(
+      await index$3.ElMessageBox.confirm(
         config.confirmMessage,
         config.confirmTitle,
         {
@@ -198,7 +199,7 @@ async function handleConfirm(node, data, fields, context) {
     cancelAction: basic.cancelAction || "stop"
   };
   try {
-    await index$2.ElMessageBox.confirm(
+    await index$3.ElMessageBox.confirm(
       config.message,
       config.title,
       {
@@ -240,17 +241,17 @@ async function handleMessage(node, data, fields, context) {
     const message = node.basic.message || "操作成功";
     switch (messageType) {
       case "success":
-        index$1.ElMessage.success(message);
+        index$2.ElMessage.success(message);
         break;
       case "warning":
-        index$1.ElMessage.warning(message);
+        index$2.ElMessage.warning(message);
         break;
       case "error":
-        index$1.ElMessage.error(message);
+        index$2.ElMessage.error(message);
         break;
       case "info":
       default:
-        index$1.ElMessage.info(message);
+        index$2.ElMessage.info(message);
         break;
     }
   }
@@ -438,14 +439,30 @@ async function handleDialog(node, data, fields, context) {
     console.error("ui-dialog: 缺少 dialogId 配置");
     return;
   }
-  const dialogList = context.localConfig.dialogs || [];
-  const dialog = dialogList.find((item) => item.id == (basic == null ? void 0 : basic.dialogId));
+  let dialog = null;
+  if (basic.dialogSource == "global") {
+    const data2 = await index.default.getTemplateDialogById(
+      context.ctx.$http,
+      basic.dialogId
+    );
+    dialog = JSON.parse(data2.config);
+    dialog.id = data2.id;
+    dialog.name = data2.name;
+    dialog.selectionMode = basic.selectionMode;
+    dialog.displayFormat = basic.displayFormat;
+    dialog.displayFormatText = basic.displayFormatText;
+    dialog.fieldMapping = basic.fieldMapping;
+    dialog.callbackEventConfig = basic.callbackEventConfig;
+  } else if (basic.dialogSource == "custom") {
+    const dialogList = context.localConfig.dialogs || [];
+    dialog = dialogList.find((item) => item.id == (basic == null ? void 0 : basic.dialogId));
+  }
   if (!dialog) {
     console.error("ui-dialog: 未找到匹配的弹层配置，" + (basic == null ? void 0 : basic.dialogId));
     return;
   }
-  index.openDialog(
-    null,
+  index$1.openDialog(
+    basic.displayFieldName,
     dialog,
     context.instance,
     context.ctx,

package/package.json

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