@fecp/designer 5.5.112 → 5.5.114

package/lib/packages/mobile/src/utils/formatterUtil.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const moment = require("../../node_modules/moment/dist/moment.js");
+const moment = require("../../../../node_modules/moment/dist/moment.js");
 const dateUtil = require("./dateUtil.js");
 const XEUtils = require("xe-utils");
 const selectFormatter = (value, options = []) => {
@@ -38,7 +38,6 @@ const cascadeFormatter = (value, options = []) => {
 };
 const dateFormatter = (value, dateType, formatterType) => {
   let dateValue;
-  debugger;
   if (!isNaN(value) && (value + "").length == 13) {
     dateValue = moment.default(Number(value));
   } else {
@@ -48,9 +47,10 @@ const dateFormatter = (value, dateType, formatterType) => {
   return dateValue.format(textFormat);
 };
 const textFormatter = (value, dataFormatter) => {
+  console.log("🚀 ~ textFormatter ~ dataFormatter:", dataFormatter);
   switch (dataFormatter) {
     case "money(yuan)":
-    case "money(wan)":
+    case "money(wanyuan)":
     case "money(yi)":
       return moneyFormatter(value, dataFormatter);
     case "bankCard":
@@ -79,7 +79,7 @@ const moneyFormatter = (value, dataFormatter) => {
     case "money(yuan)":
       moneyValue = XEUtils.toNumber(value);
       break;
-    case "money(wan)":
+    case "money(wanyuan)":
       moneyValue = XEUtils.divide(XEUtils.toNumber(value), 1e4);
       break;
     case "money(yi)":
@@ -97,7 +97,7 @@ const textFormatter4Input = (value, dataFormatter) => {
   }
   switch (dataFormatter) {
     case "money(yuan)":
-    case "money(wan)":
+    case "money(wanyuan)":
     case "money(yi)":
       return XEUtils.toNumberString(XEUtils.toNumber(value)).replace(
         /\B(?=(\d{3})+(?!\d))/g,
@@ -118,7 +118,7 @@ const reverseTextFormatter = (value, dataFormatter) => {
   }
   switch (dataFormatter) {
     case "money(yuan)":
-    case "money(wan)":
+    case "money(wanyuan)":
     case "money(yi)":
       return reverseMoneyFormatter(value, dataFormatter);
     case "bankCard":
@@ -143,7 +143,7 @@ const reverseMoneyFormatter = (value, dataFormatter) => {
     case "money(yuan)":
       moneyValue = XEUtils.toNumber(value);
       break;
-    case "money(wan)":
+    case "money(wanyuan)":
       moneyValue = XEUtils.multiply(XEUtils.toNumber(value), 1e4);
       break;
     case "money(yi)":
@@ -159,7 +159,7 @@ const getUnit = (dataFormatter) => {
   switch (dataFormatter) {
     case "money(yuan)":
       return "元";
-    case "money(wan)":
+    case "money(wanyuan)":
       return "万";
     case "money(yi)":
       return "亿";

package/lib/packages/mobile/src/utils/formulajs/calculate.js

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const functionCore = require("./functionCore.js");
+require("vue");
+function calculate(params) {
+  const { text, value = {}, fieldsList = [] } = params;
+  if (!text) return new Error("非法公式");
+  try {
+    let str = text;
+    let offset = 0;
+    const regex = /\{(\w+)\}/g;
+    let match;
+    const fields = [];
+    while ((match = regex.exec(text)) !== null) {
+      fields.push({
+        enCode: match[1],
+        startIndex: match.index,
+        endIndex: match.index + match[0].length
+      });
+    }
+    for (const field of fields) {
+      const { enCode, startIndex, endIndex } = field;
+      let data = value[enCode];
+      if (enCode.indexOf(".") > -1) {
+        const [key, subKey] = enCode.split(".");
+        if (value[key]) data = value[key].map((o) => o[subKey]);
+      }
+      const fieldItem = fieldsList.find((item) => item.fieldName == enCode);
+      if (fieldItem) {
+        switch (fieldItem.fieldType) {
+          case "number":
+            if (!data) {
+              data = 0;
+            } else {
+              Number(data);
+            }
+            break;
+          case "switch":
+            data = false;
+            if (!data) {
+              data = false;
+            } else if ("true" == data + "") {
+              Number(data);
+            } else {
+              data = false;
+            }
+            break;
+          default:
+            if (!data) {
+              data = "";
+            }
+            data = JSON.stringify(data);
+        }
+      } else {
+        data = JSON.stringify(data);
+      }
+      const actualStart = startIndex + offset;
+      const actualEnd = endIndex + offset;
+      str = str.slice(0, actualStart) + data.toString() + str.slice(actualEnd);
+      offset += data.toString().length - (endIndex - startIndex);
+    }
+    const result = functionCore.default.executeFunction(str);
+    if (result instanceof Date) {
+      const year = result.getFullYear();
+      const month = String(result.getMonth() + 1).padStart(2, "0");
+      const day = String(result.getDate()).padStart(2, "0");
+      const hh = String(result.getHours()).padStart(2, "0");
+      const mm = String(result.getMinutes()).padStart(2, "0");
+      const ss = String(result.getSeconds()).padStart(2, "0");
+      return `${year}/${month}/${day} ${hh}:${mm}:${ss}`;
+    }
+    return result;
+  } catch (e) {
+    const errorTypes = {
+      TypeError: () => "类型错误",
+      RangeError: () => "范围错误",
+      SyntaxError: () => "语法错误",
+      ReferenceError: () => {
+        const regex = /^(\w+)\s+is\s+not\s+defined$/;
+        const match = e.message.match(regex);
+        return match ? `${match[1]} 未定义` : "未定义的变量";
+      }
+    };
+    const errorType = errorTypes[e.constructor.name];
+    const errorMessage = (errorType == null ? void 0 : errorType()) || `其他错误: ${e.message}`;
+    return {
+      error: true,
+      message: errorMessage
+    };
+  }
+}
+exports.calculate = calculate;

package/lib/packages/mobile/src/utils/formulajs/customFunc.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const DATEDELTA = (dateStr, offset) => {
+  const date = new Date(dateStr);
+  if (isNaN(date.getTime())) {
+    return null;
+  }
+  const result = new Date(date);
+  result.setDate(result.getDate() + Number(offset));
+  return result;
+};
+exports.DATEDELTA = DATEDELTA;

package/lib/packages/mobile/src/utils/formulajs/functionCore.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const index = require("../../../../../node_modules/@formulajs/formulajs/lib/esm/index.js");
+const customFunc = require("./customFunc.js");
+const Formula = { ...index, ...customFunc };
+class FunctionCore {
+  constructor() {
+    Object.assign(FunctionCore.prototype, Formula);
+  }
+  executeFunction(str) {
+    const fn = new Function(
+      "with(this) { return " + str + "; }"
+      // 使用 `with` 来确保从当前实例中查找函数
+    ).bind(this);
+    return fn();
+  }
+}
+const functionCore = new FunctionCore();
+exports.default = functionCore;

package/lib/packages/mobile/src/utils/idea/VueRender.vue.js

@@ -33,5 +33,5 @@ const _sfc_main = {
     };
   }
 };
-const VueRender = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-91bc8b03"]]);
+const VueRender = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-6c9dc8a1"]]);
 exports.default = VueRender;

package/lib/packages/mobile/src/utils/pageHistory.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const eventBus = require("./eventBus.js");
 const HISTORY_KEY = "mobile_page_history";
 const MAX_HISTORY_SIZE = 20;
 class PageHistory {
@@ -32,7 +33,7 @@ class PageHistory {
    * 添加页面到历史
    * @param {Object} page - 页面配置对象，需包含 id
    */
-  push(page) {
+  push(page, params) {
     if (!page || !page.id) {
       console.warn("页面配置无效，无法添加到历史");
       return;
@@ -44,14 +45,14 @@ class PageHistory {
       id: page.id,
       name: page.name || "",
       timestamp: Date.now(),
-      data: page
+      params
     });
     if (this.history.length > MAX_HISTORY_SIZE) {
       this.history.shift();
     }
     this.saveHistory();
   }
-  replace(page) {
+  replace(page, params) {
     if (!page || !page.id) {
       console.warn("页面配置无效，无法替换");
       return;
@@ -64,7 +65,7 @@ class PageHistory {
       id: page.id,
       name: page.name || "",
       timestamp: Date.now(),
-      data: page
+      params
     };
     this.saveHistory();
   }
@@ -79,7 +80,11 @@ class PageHistory {
     this.history.pop();
     this.saveHistory();
     const prevPage = this.history[this.history.length - 1];
-    return prevPage ? prevPage.data : null;
+    const pageId = prevPage ? prevPage.id : null;
+    const params = prevPage ? prevPage.params : null;
+    if (pageId) {
+      eventBus.default.emit("loadPage", { pageId, params });
+    }
   }
   /**
    * 获取当前页面
@@ -89,7 +94,7 @@ class PageHistory {
     if (this.history.length == 0) {
       return null;
     }
-    return this.history[this.history.length - 1].data;
+    return this.history[this.history.length - 1].id;
   }
   /**
    * 判断是否可以后退

package/lib/packages/mobile/src/utils/parseFilterConfig.js

@@ -95,4 +95,48 @@ function checkConditionMatch(condition, data, fields) {
       return dataValue == parsedValue;
   }
 }
+function checkFieldInFilterConfig(filterConfig, fieldId) {
+  if (!fieldId) {
+    return true;
+  }
+  return checkFieldInGroup(filterConfig, fieldId);
+}
+function checkFieldInGroup(group, targetFieldId) {
+  const { conditions, groups } = group;
+  if (conditions && conditions.length > 0) {
+    const foundInConditions = conditions.some((cond) => cond.field == targetFieldId);
+    if (foundInConditions) {
+      return true;
+    }
+  }
+  if (groups && groups.length > 0) {
+    return groups.some((g) => checkFieldInGroup(g, targetFieldId));
+  }
+  return false;
+}
+function checkFieldInResultConfig(resultConfig, fieldId, fields = []) {
+  var _a, _b;
+  if (!fieldId || !Array.isArray(resultConfig)) {
+    return true;
+  }
+  let fieldName = fieldId;
+  if (fields && fields.length > 0) {
+    const field = fields.find((f) => f.id == fieldId);
+    if (field) {
+      fieldName = field.fieldName;
+    }
+  }
+  for (const item of resultConfig) {
+    if ((_b = (_a = item.formula) == null ? void 0 : _a.value) == null ? void 0 : _b.text) {
+      const formulaText = item.formula.value.text;
+      const fieldPattern = new RegExp(`\\{${fieldName}\\}`, "i");
+      if (fieldPattern.test(formulaText)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+exports.checkFieldInFilterConfig = checkFieldInFilterConfig;
+exports.checkFieldInResultConfig = checkFieldInResultConfig;
 exports.checkFilterMatch = checkFilterMatch;

package/lib/packages/mobile/src/utils/websocket4Msg.js

@@ -0,0 +1,89 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const _SocketService = class _SocketService {
+  constructor() {
+    // 和服务端连接的socket对象
+    __publicField(this, "ws", null);
+    // 存储回调函数
+    __publicField(this, "callBackMapping", {});
+    // 标识是否连接成功
+    __publicField(this, "connected", false);
+    // 记录重试的次数
+    __publicField(this, "sendRetryCount", 0);
+    // 重新连接尝试的次数
+    __publicField(this, "connectRetryCount", 0);
+    __publicField(this, "notificationRef", null);
+  }
+  static get Instance() {
+    if (!this.instance) {
+      this.instance = new _SocketService();
+    }
+    return this.instance;
+  }
+  //  定义连接服务器的方法
+  connect(url) {
+    if (!window.WebSocket) {
+      return console.log("Your browser does not support WebSocket");
+    }
+    this.ws = new WebSocket(url);
+    this.ws.onopen = () => {
+      console.log("Successfully connected to the server 4 mobile");
+      this.connected = true;
+      this.connectRetryCount = 0;
+    };
+    this.ws.onclose = () => {
+      console.log("Failed to connect to the server 4 mobile");
+      this.connected = false;
+      this.connectRetryCount++;
+      setTimeout(() => {
+        this.connect(url);
+      }, 500 * this.connectRetryCount);
+    };
+    this.ws.onmessage = (msg) => {
+      console.log("Get data from the server");
+      let response = JSON.parse(msg.data);
+      if (response.tmplType == "2") {
+        if (this.callBackMapping.flow) {
+          this.callBackMapping.flow(response);
+        }
+      }
+      console.log("🚀 ~ SocketService ~ connect ~ response:", response);
+    };
+  }
+  closeConnect() {
+    if (this.connected) {
+      this.ws.close();
+      console.log("Successfully closed to the server");
+    }
+  }
+  // 回调函数的注册
+  registerCallBack(socketType, callBack) {
+    this.callBackMapping[socketType] = callBack;
+  }
+  // 取消某一个回调函数
+  unRegisterCallBack(socketType) {
+    this.callBackMapping[socketType] = null;
+  }
+  // 发送数据的方法
+  send(data) {
+    if (this.connected) {
+      this.sendRetryCount = 0;
+      try {
+        this.ws.send(JSON.stringify(data));
+      } catch (e) {
+        this.ws.send(data);
+      }
+    } else {
+      this.sendRetryCount++;
+      setTimeout(() => {
+        this.send(data);
+      }, this.sendRetryCount * 500);
+    }
+  }
+};
+__publicField(_SocketService, "instance", null);
+let SocketService = _SocketService;
+exports.default = SocketService;

package/lib/packages/vue/src/components/bus/document/Document.vue.js

@@ -142,7 +142,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           (Vue.openBlock(), Vue.createBlock(Vue.resolveDynamicComponent(Vue.unref(currentComponent)), {
             ref_key: "docRef",
             ref: docRef,
-            isEdit: __props.formMode != "query",
+            isEdit: __props.formMode != "query" ? __props.config.disabled ? false : true : false,
             isSupplement: __props.config.isSupplement,
             multiple: __props.config.multiple,
             download: __props.config.download,

package/lib/packages/vue/src/components/riskSch/index.js

@@ -12,6 +12,8 @@ const RiskSchRenderer = require("./RiskSchRenderer.vue.js");
 ;/* empty css                                                     */
 ;/* empty css                                                   */
 ;/* empty css                                                    */
+const functionCall = require("../../../../../node_modules/vant/es/dialog/function-call.js");
+require("../../../../../node_modules/vant/es/dialog/index.js");
 let currentDialogInstance = null;
 let isCleaningUp = false;
 const cleanupDialog = () => {
@@ -38,6 +40,9 @@ const cleanupDialog = () => {
 };
 function openRiskSch(option, instance, ctx) {
   return new Promise((resolve, reject) => {
+    if (currentDialogInstance) {
+      functionCall.closeDialog();
+    }
     const container = document.createElement("div");
     document.body.appendChild(container);
     const vnode = Vue.createVNode(RiskSchRenderer.default, {

package/package.json

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