@fecp/designer 5.5.120 → 5.6.1

package/es/packages/mobile/src/components/custom/approvalList/ApprovalList.vue.mjs

@@ -89,8 +89,8 @@ const _sfc_main = {
       const errorRef = taskStatus == "0" ? todoError : taskStatus == "1" ? doneError : ccError;
       errorRef.value = false;
       const pageNo = taskStatus == "0" ? todoPageNo : taskStatus == "1" ? donePageNo : ccPageNo;
-      ctx.$http.post(
-        "/base-server/flow/workbench/findTaskListByPage",
+      ctx.$http.postMobile(
+        "/" + window.$servers.base + "/flow/workbench/findTaskListByPage",
         {
           pageNo,
           pageSize,
@@ -99,7 +99,7 @@ const _sfc_main = {
         },
         false
       ).then((data) => {
-        const list = data.list;
+        const list = data.list || data;
         switch (taskStatus) {
           case "0":
             list.forEach((item) => {
@@ -114,14 +114,16 @@ const _sfc_main = {
             break;
           case "1":
             list.forEach((item) => {
-              if (item.isEnd) {
-                item.statusColor = "#52c41a";
-                item.statusIcon = "checked";
-                item.statusText = "已完成";
-              } else {
-                item.statusColor = "#fa8c16";
-                item.statusIcon = "more";
-                item.statusText = "进行中";
+              if ("isEnd" in item) {
+                if (item.isEnd) {
+                  item.statusColor = "#52c41a";
+                  item.statusIcon = "checked";
+                  item.statusText = "已完成";
+                } else {
+                  item.statusColor = "#fa8c16";
+                  item.statusIcon = "more";
+                  item.statusText = "进行中";
+                }
               }
             });
             doneList.value.push(...list);
@@ -131,14 +133,16 @@ const _sfc_main = {
             break;
           case "2":
             list.forEach((item) => {
-              if (item.isEnd) {
-                item.statusColor = "#52c41a";
-                item.statusIcon = "checked";
-                item.statusText = "已完成";
-              } else {
-                item.statusColor = "#fa8c16";
-                item.statusIcon = "more";
-                item.statusText = "进行中";
+              if ("isEnd" in item) {
+                if (item.isEnd) {
+                  item.statusColor = "#52c41a";
+                  item.statusIcon = "checked";
+                  item.statusText = "已完成";
+                } else {
+                  item.statusColor = "#fa8c16";
+                  item.statusIcon = "more";
+                  item.statusText = "进行中";
+                }
               }
             });
             ccList.value.push(...list);
@@ -149,6 +153,9 @@ const _sfc_main = {
         }
       }).catch((err) => {
         errorRef.value = true;
+        if (taskStatus == "0") todoPageNo--;
+        else if (taskStatus == "1") donePageNo--;
+        else ccPageNo--;
       }).finally(() => {
         switch (taskStatus) {
           case "0":
@@ -249,8 +256,8 @@ const _sfc_main = {
         forbidClick: true,
         duration: 0
       });
-      ctx.$http.postForm(
-        "/base-server/flow/flowApproveDetail/doAssign",
+      ctx.$http.postFormMobile(
+        "/" + window.$servers.base + "/flow/flowApproveDetail/doAssign",
         {
           taskId: transferItem.value.taskId,
           opNo: ((_a = store.getters.user) == null ? void 0 : _a.opNo) || "",
@@ -263,6 +270,7 @@ const _sfc_main = {
         todoList.value = [];
         todoFinished.value = false;
         todoPageNo = 0;
+        emitter.emit("refreshFlowCutNum");
         onTodoLoad();
       });
     }
@@ -280,12 +288,13 @@ const _sfc_main = {
           forbidClick: true,
           duration: 0
         });
-        await ctx.$http.post(
-          "/base-server/flow/flowApproveDetail/undo",
+        await ctx.$http.postMobile(
+          "/" + window.$servers.base + "/flow/flowApproveDetail/undo",
           data,
           false
         );
         showSuccessToast("撤销成功");
+        emitter.emit("refreshFlowCutNum");
       } else if (type == "recall") {
         console.log("召回:", item, "原因:", reason);
         showLoadingToast({
@@ -293,12 +302,13 @@ const _sfc_main = {
           forbidClick: true,
           duration: 0
         });
-        await ctx.$http.post(
-          "/base-server/flow/flowApproveDetail/recall",
+        await ctx.$http.postMobile(
+          "/" + window.$servers.base + "/flow/flowApproveDetail/recall",
           data,
           false
         );
         showSuccessToast("召回成功");
+        emitter.emit("refreshFlowCutNum");
       }
       onSearch();
     }
@@ -570,7 +580,7 @@ const _sfc_main = {
     };
   }
 };
-const _ApprovalList = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a585d493"]]);
+const _ApprovalList = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-67d02900"]]);
 export {
   _ApprovalList as default
 };

package/es/packages/mobile/src/components/custom/customCode/CustomCode.vue.mjs

@@ -0,0 +1,60 @@
+import { inject, onMounted, createElementBlock, openBlock, normalizeClass, createVNode } from "vue";
+import VueRender from "../../../utils/idea/VueRender.vue.mjs";
+/* empty css                 */
+import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
+const _sfc_main = {
+  __name: "CustomCode",
+  props: {
+    params: {
+      type: Object,
+      default: {}
+    },
+    vueTemplate: {
+      type: String,
+      default: ""
+    },
+    autoHeight: {
+      type: Boolean,
+      default: false
+    },
+    vueTemplateFunctionMapping: {
+      type: Array,
+      default: []
+    }
+  },
+  setup(__props) {
+    const props = __props;
+    const handleEvent = inject("handleEvent");
+    inject("formData");
+    function eventHandler(funcName, rowData) {
+      var _a, _b;
+      const func = props.vueTemplateFunctionMapping.find(
+        (item) => item.func == funcName
+      );
+      if (func && func.eventConfig) {
+        (_b = handleEvent.value) == null ? void 0 : _b.call(
+          handleEvent,
+          rowData,
+          func,
+          (_a = func.eventConfig) == null ? void 0 : _a.find((item) => item.name == "Click")
+        );
+      }
+    }
+    onMounted(() => {
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", {
+        class: normalizeClass(["custom-code-wrapper", { isAutoHeight: props.autoHeight }])
+      }, [
+        createVNode(VueRender, {
+          code: __props.vueTemplate,
+          params: { data: __props.params, eventHandler }
+        }, null, 8, ["code", "params"])
+      ], 2);
+    };
+  }
+};
+const _CustomCode = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9a884660"]]);
+export {
+  _CustomCode as default
+};

package/es/packages/mobile/src/components/custom/customCode/index.mjs

@@ -0,0 +1,10 @@
+import _CustomCode from "./CustomCode.vue.mjs";
+import install from "../../../utils/install.mjs";
+const MobileCustomCode = install.withInstall(
+  "MobileCustomCode",
+  _CustomCode
+);
+export {
+  MobileCustomCode,
+  MobileCustomCode as default
+};

package/es/packages/mobile/src/components/custom/document/Document.vue.mjs

@@ -131,8 +131,8 @@ const _sfc_main = {
     }
     function fetchData() {
       loading.value = true;
-      ctx.$http.post(
-        "/base-server/docBusFiletype/getRootTree4Mobile",
+      ctx.$http.postMobile(
+        "/" + window.$servers.base + "/docBusFiletype/getRootTree4Mobile",
         {
           isEdit: false,
           paramList: [
@@ -361,7 +361,7 @@ const _sfc_main = {
     };
   }
 };
-const _Document = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ae58ecdb"]]);
+const _Document = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f45752e0"]]);
 export {
   _Document as default
 };

package/es/packages/mobile/src/components/custom/userSelect/UserSelect.vue.mjs

@@ -163,8 +163,8 @@ const _sfc_main = {
     }
     function fetchData(keyword = "") {
       listLoading.value = true;
-      ctx.$http.post(
-        "/base-server/mobileApi/findSysUserByPage",
+      ctx.$http.postMobile(
+        "/" + window.$servers.base + "/mobileApi/findSysUserByPage",
         {
           pageNo: pageNum.value,
           pageSize,
@@ -314,7 +314,7 @@ const _sfc_main = {
     };
   }
 };
-const _UserSelect = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-4346b977"]]);
+const _UserSelect = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f74f73d1"]]);
 export {
   _UserSelect as default
 };

package/es/packages/mobile/src/components/dataDisplay/cardList/CardList.vue.mjs

@@ -4,6 +4,7 @@
 import { inject, getCurrentInstance, ref, onMounted, computed, resolveComponent, createElementBlock, openBlock, Fragment, createBlock, createCommentVNode, createVNode, unref, isRef, withCtx, renderList } from "vue";
 import { createDataSource } from "../../../utils/datasource.mjs";
 import VueRender from "../../../utils/idea/VueRender.vue.mjs";
+import { selectFormatter, multipleFormatter, dateFormatter, textFormatter } from "../../../utils/formatterUtil.mjs";
 /* empty css               */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { List } from "../../../../../../node_modules/vant/es/list/index.mjs";
@@ -16,6 +17,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       type: Object,
       default: {}
     },
+    columns: {
+      //格式化配置
+      type: Array,
+      default: []
+    },
     fields: {
       type: Array,
       default: []
@@ -82,9 +88,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     vueTemplateFunctionMapping: {
       type: Array,
       default: []
+    },
+    dynamicInputFilter: {
+      type: Array,
+      default: []
     }
   },
-  setup(__props) {
+  setup(__props, { expose: __expose }) {
     const props = __props;
     const handleEvent = inject("handleEvent");
     const formData = inject("formData");
@@ -92,7 +102,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const ctx = currentInstance.proxy;
     const listRef = ref();
     let isDesigner = false;
-    onMounted(() => {
+    onMounted(async () => {
       var _a, _b;
       const device = (_b = (_a = listRef.value) == null ? void 0 : _a.$el) == null ? void 0 : _b.closest(".device-content");
       if (device) {
@@ -115,8 +125,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
     }
     function dicHandler(dictionaryValue) {
-      return ctx.$http.postForm(
-        "/base-server/parm/sysParmDic/getDicListByKey",
+      return ctx.$http.postFormMobile(
+        "/" + window.$servers.base + "/parm/sysParmDic/getDicListByKey",
         {
           keyName: dictionaryValue
         },
@@ -129,6 +139,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const loading = ref(false);
     let pageNo = 1;
     const dataSourceManager = ref();
+    const formattedColumns = ref(null);
     function initDataSourceManager() {
       dataSourceManager.value = createDataSource({
         http: ctx.$http,
@@ -169,14 +180,18 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         loading.value = false;
       }
     }
+    const searchData = ref({});
     async function call() {
       var _a;
+      if (!formattedColumns.value) {
+        await formattedTableData();
+      }
       error.value = false;
       try {
         dataSourceManager.value.updatePagination(pageNo, props.pageSize);
-        await dataSourceManager.value.fetch();
+        await dataSourceManager.value.fetch(searchData.value);
         const data = ((_a = dataSourceManager.value) == null ? void 0 : _a.getData().list) || [];
-        tableData.value.push(...data);
+        tableData.value.push(...parseTableData(data));
         if (tableData.value.length == 0 && isDesigner) {
           tableData.value = [{}];
         }
@@ -187,12 +202,177 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       } catch (err) {
         console.error(err);
         error.value = true;
+        pageNo--;
         loading.value = false;
       }
     }
     const quickFilterConfig = computed(() => {
       return props.quickFilter;
     });
+    function onFilterChange(filter) {
+      const dynamicFilterFieldName = props.dynamicInputFilter.map((item) => item.fieldName).join(",");
+      searchData.value = {
+        filters: JSON.stringify({ ...filter, dynamicFilterFieldName })
+      };
+      tableData.value = [];
+      finished.value = false;
+      loading.value = true;
+      pageNo = 1;
+      call();
+    }
+    const dataSourceOptions = ref({});
+    const dictionaryOptions = ref({});
+    async function formattedTableData() {
+      var _a, _b;
+      const columns = [...props.columns];
+      const fieldDataSources = /* @__PURE__ */ new Set();
+      const dictionaryKeys = /* @__PURE__ */ new Set();
+      for (const col of columns) {
+        if (col.dataType == "select" || col.dataType == "multiple") {
+          const { optionSource, dataSourceValue, dictionaryValue } = col.optionConfig;
+          if (optionSource === "dataSource" && dataSourceValue) {
+            fieldDataSources.add(dataSourceValue);
+          } else if (optionSource === "dictionary" && dictionaryValue) {
+            dictionaryKeys.add(dictionaryValue);
+          }
+        }
+      }
+      for (const dataSourceId of fieldDataSources) {
+        if (dataSourceOptions.value[dataSourceId]) continue;
+        try {
+          const dsManager = createDataSource({
+            http: ctx.$http,
+            dataSources: props.dataSources,
+            currentDataSourceId: dataSourceId,
+            pagination: false,
+            data: (formData == null ? void 0 : formData.value) || {},
+            fields: props.fields
+          });
+          const data = await dsManager.fetch();
+          let options = [];
+          if (Array.isArray(data)) {
+            options = data;
+          } else if (typeof data === "object") {
+            options = Array.isArray(data.data) ? data.data : ((_a = data.data) == null ? void 0 : _a.records) || ((_b = data.data) == null ? void 0 : _b.list) || [];
+          }
+          dataSourceOptions.value[dataSourceId] = options;
+          dsManager.destroy();
+        } catch (error2) {
+          console.error(`Failed to load data source ${dataSourceId}:`, error2);
+        }
+      }
+      if (dictionaryKeys.size > 0) {
+        try {
+          const keyName = Array.from(dictionaryKeys).join(",");
+          const response = await ctx.$http.postFormMobile(
+            "/" + window.$servers.base + "/parm/sysParmDic/getDicListByKey",
+            {
+              keyName
+            },
+            false
+          );
+          const dictionaryData = response;
+          if (typeof dictionaryData === "object") {
+            Object.keys(dictionaryData).forEach((dictKey) => {
+              if (dictionaryKeys.has(dictKey)) {
+                const dictItems = dictionaryData[dictKey];
+                if (Array.isArray(dictItems)) {
+                  dictionaryOptions.value[dictKey] = dictItems;
+                }
+              }
+            });
+          }
+        } catch (error2) {
+          console.error("Failed to load dictionary data:", error2);
+        }
+      }
+      columns.forEach((component) => {
+        if (!component.optionConfig) return;
+        const {
+          optionSource,
+          dataSourceValue,
+          dictionaryValue,
+          displayField,
+          valueField,
+          idField,
+          pidField
+        } = component.optionConfig;
+        if (optionSource === "dataSource" && dataSourceOptions.value[dataSourceValue]) {
+          const rawOptions = dataSourceOptions.value[dataSourceValue];
+          const labelField = displayField || "label";
+          const keyField = valueField || "value";
+          component.optionConfig.options = rawOptions.map((item) => ({
+            label: item[labelField],
+            value: item[keyField],
+            disabled: item.disabled || false,
+            ...item
+          }));
+        } else if (optionSource === "dictionary" && dictionaryOptions.value[dictionaryValue]) {
+          const rawOptions = dictionaryOptions.value[dictionaryValue];
+          const labelField = "optName";
+          const keyField = "optCode";
+          component.optionConfig.options = rawOptions.map((item) => ({
+            label: item[labelField],
+            value: item[keyField],
+            disabled: item.disabled || false
+          }));
+        } else if (optionSource === "custom") {
+          component.optionConfig.options = component.optionConfig.options || [];
+        }
+      });
+      formattedColumns.value = columns;
+    }
+    function parseTableData(tableData2) {
+      const list = [...tableData2];
+      list.forEach((row) => {
+        formattedColumns.value.forEach((col) => {
+          let value = row[col.fieldName];
+          if (col.dataType == "select") {
+            if (isEmpty(value)) {
+              value = emptyHandler(col.emptyFormatter);
+            }
+            value = selectFormatter(value, col.optionConfig.options);
+          } else if (col.dataType == "multiple") {
+            if (isEmpty(value)) {
+              value = emptyHandler(col.emptyFormatter);
+            }
+            value = multipleFormatter(value, col.optionConfig.options);
+          } else if (col.dataType == "date") {
+            if (isEmpty(value)) {
+              value = emptyHandler(col.emptyFormatter);
+            }
+            value = dateFormatter(value, col.dateType, col.dateFormatter);
+          } else {
+            if (isEmpty(value)) {
+              value = emptyHandler(col.emptyFormatter);
+            }
+            value = textFormatter(value, col.dataFormatter);
+          }
+          row[col.fieldName] = value;
+        });
+      });
+      return list;
+    }
+    function isEmpty(cellValue) {
+      return !cellValue && cellValue !== 0;
+    }
+    function emptyHandler(emptyFormatter) {
+      if (isEmpty(emptyFormatter)) {
+        return "";
+      } else {
+        return emptyFormatter;
+      }
+    }
+    __expose({
+      onSearch: function(filter) {
+        searchData.value = filter;
+        tableData.value = [];
+        finished.value = false;
+        loading.value = true;
+        pageNo = 1;
+        call();
+      }
+    });
     return (_ctx, _cache) => {
       const _component_fec_mobile_search = resolveComponent("fec-mobile-search");
       const _component_fec_mobile_card = resolveComponent("fec-mobile-card");
@@ -203,7 +383,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           placeholder: __props.filterPlaceholder,
           filterMode: __props.filterMode,
           dataSources: __props.dataSources,
-          filterConfig: unref(quickFilterConfig)
+          filterConfig: unref(quickFilterConfig),
+          onFilterChange
         }, null, 8, ["placeholder", "filterMode", "dataSources", "filterConfig"])) : createCommentVNode("", true),
         createVNode(_component_van_list, {
           ref_key: "listRef",
@@ -242,7 +423,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _CardList = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5ccc7b9b"]]);
+const _CardList = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-13759ee7"]]);
 export {
   _CardList as default
 };