@fecp/designer 5.5.120 → 5.5.121

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

@@ -70,7 +70,7 @@ class DataSourceManager {
     if (this.sortRules && this.sortRules.length > 0) {
       params.sortRules = JSON.stringify(this.sortRules);
     }
-    return { ...this.initSearchData, ...params, ...extraParams };
+    return { ...this.initSearchData, ...params, ...extraParams, isMobile: true };
   }
   /**
    * 根据内容类型处理请求数据
@@ -157,13 +157,13 @@ class DataSourceManager {
           break;
         case "post":
           if (currentDs.contentType === "formData") {
-            response = await this.http.postForm(url, params, false);
+            response = await this.http.postFormMobile(url, params, false, false);
           } else if (currentDs.contentType === "download") {
             await this.http.download(url, params, false);
           } else if (currentDs.contentType === "upload") {
             response = await this.http.upload(url, params, false);
           } else {
-            response = await this.http.post(url, params, false);
+            response = await this.http.postMobile(url, params, false);
           }
           break;
         case "put":

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

@@ -12,9 +12,17 @@ require("../../../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                                   */
 ;/* empty css                                                                       */
 const index = require("../../../../../node_modules/element-plus/es/components/message-box/index.js");
+const functionCall = require("../../../../../node_modules/vant/es/toast/function-call.js");
+require("../../../../../node_modules/vant/es/toast/index.js");
+const functionCall$1 = require("../../../../../node_modules/vant/es/dialog/function-call.js");
+require("../../../../../node_modules/vant/es/dialog/index.js");
 async function handlePageJump(node, data, fields, context) {
+  var _a, _b, _c;
   const basic = node.basic || {};
-  const params = parseRouteParams.parseRouteParams(basic.routeParams, data, fields);
+  const formComponent = (_a = context.components) == null ? void 0 : _a.form;
+  const getFormDataMethod = (_c = (_b = formComponent == null ? void 0 : formComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.getFormData;
+  let formData = getFormDataMethod();
+  const params = parseRouteParams.parseRouteParams(basic.routeParams, { ...formData, ...data }, fields);
   if (basic.pageId) {
     if (basic.canNotGoBack === true) {
       eventBus.default.emit("replaceLoadPage", { pageId: basic.pageId, params });
@@ -118,26 +126,19 @@ async function handleApiCall(node, data, fields, context, params) {
 }
 async function handleConfirm(node, data, fields, context) {
   const basic = node.basic || {};
-  const config = {
-    messageType: basic.messageType || "warning",
-    title: basic.title || "确认操作",
-    message: basic.message || "确定要执行此操作吗？",
-    confirmText: basic.confirmText || "确定",
-    cancelText: basic.cancelText || "取消",
-    showCancel: basic.showCancel !== false,
-    confirmAction: basic.confirmAction || "continue",
-    cancelAction: basic.cancelAction || "stop"
-  };
   try {
-    await index.ElMessageBox.confirm(config.message, config.title, {
-      confirmButtonText: config.confirmText,
-      cancelButtonText: config.cancelText,
-      type: config.messageType,
-      showCancelButton: config.showCancel,
-      draggable: true,
-      showClose: false
-    });
-    if (config.confirmAction === "stop") {
+    if (basic.showCancel) {
+      await functionCall$1.showConfirmDialog({
+        title: basic.title,
+        message: basic.message
+      });
+    } else {
+      await functionCall$1.showDialog({
+        title: basic.title,
+        message: basic.message
+      });
+    }
+    if (basic.confirmAction === "stop") {
       return {
         success: false,
         message: "用户确认后停止执行",
@@ -172,8 +173,20 @@ async function handleMessage(node, data, fields, context) {
     };
   }
   if (node.basic) {
-    node.basic.messageType || "info";
-    node.basic.message || "操作成功";
+    const messageType = node.basic.messageType || "info";
+    const message = node.basic.message || "操作成功";
+    switch (messageType) {
+      case "success":
+        functionCall.showSuccessToast(message);
+        break;
+      case "error":
+        functionCall.showFailToast(message);
+        break;
+      case "info":
+      default:
+        functionCall.showToast(message);
+        break;
+    }
   }
   return {
     success: true,

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

@@ -47,7 +47,6 @@ 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(wanyuan)":
@@ -74,6 +73,9 @@ const textFormatter = (value, dataFormatter) => {
   }
 };
 const moneyFormatter = (value, dataFormatter) => {
+  if (!value) {
+    return value;
+  }
   let moneyValue;
   switch (dataFormatter) {
     case "money(yuan)":
@@ -91,27 +93,6 @@ const moneyFormatter = (value, dataFormatter) => {
   }
   return XEUtils.commafy(moneyValue, { digits: 2 });
 };
-const textFormatter4Input = (value, dataFormatter) => {
-  if (!value) {
-    return value;
-  }
-  switch (dataFormatter) {
-    case "money(yuan)":
-    case "money(wanyuan)":
-    case "money(yi)":
-      return XEUtils.toNumberString(XEUtils.toNumber(value)).replace(
-        /\B(?=(\d{3})+(?!\d))/g,
-        ","
-      );
-    case "bankCard":
-      return XEUtils.toValueString(value.replace(/\s+/g, "")).replace(
-        /\B(?=(\d{4})+(?!\d))/g,
-        " "
-      );
-    default:
-      return value;
-  }
-};
 const reverseTextFormatter = (value, dataFormatter) => {
   if (!value) {
     return value;
@@ -182,4 +163,3 @@ exports.reverseMoneyFormatter = reverseMoneyFormatter;
 exports.reverseTextFormatter = reverseTextFormatter;
 exports.selectFormatter = selectFormatter;
 exports.textFormatter = textFormatter;
-exports.textFormatter4Input = textFormatter4Input;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const functionCore = require("./functionCore.js");
+const XEUtils = require("xe-utils");
 require("vue");
 function calculate(params) {
   const { text, value = {}, fieldsList = [] } = params;
@@ -28,11 +29,16 @@ function calculate(params) {
       const fieldItem = fieldsList.find((item) => item.fieldName == enCode);
       if (fieldItem) {
         switch (fieldItem.fieldType) {
-          case "number":
-            if (!data) {
-              data = 0;
-            } else {
-              Number(data);
+          case "text":
+            switch (fieldItem.dataFormatter) {
+              case "money(yuan)":
+              case "money(wanyuan)":
+              case "money(yi)":
+              case "percent":
+              case "thousand":
+              case "tenThousand":
+                data = XEUtils.toNumber(data);
+                break;
             }
             break;
           case "switch":

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

@@ -27,7 +27,7 @@ const getOptions = ({
           resolve([]);
           break;
         }
-        const response = await ctx.$http.postForm(
+        const response = await ctx.$http.postFormMobile(
           "/base-server/parm/sysParmDic/getDicListByKey",
           {
             keyName: dictionaryValue
@@ -78,33 +78,9 @@ const getOptions = ({
     }
   });
 };
-const getTreeOptions = ({
-  optionType,
-  dataSource,
-  dataSourceParams,
-  staticOptions,
-  optionsFieldNames
-}) => {
-  return new Promise((resolve, reject) => {
-    switch (optionType) {
-      case "static":
-        resolve(staticOptions);
-      case "library":
-        const dataSourceRef = useDataSource(dataSource);
-        dataSourceRef == null ? void 0 : dataSourceRef.load(dataSourceParams || {}).then((res) => {
-          var _a;
-          const data = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.records) || (res == null ? void 0 : res.data) || res || [];
-          resolve(data);
-        }).catch((err) => {
-          console.error(err);
-        });
-        break;
-    }
-  });
-};
 const getParmDicMapByKeys = async (dicKeys) => {
   const http = index.default();
-  const res = await http.postForm(
+  const res = await http.postFormMobile(
     `${baseUrl}/parm/sysParmDic/getDicListByKey`,
     {
       keyName: dicKeys
@@ -114,4 +90,3 @@ const getParmDicMapByKeys = async (dicKeys) => {
 };
 exports.getOptions = getOptions;
 exports.getParmDicMapByKeys = getParmDicMapByKeys;
-exports.getTreeOptions = getTreeOptions;

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

@@ -41,6 +41,7 @@ class PageHistory {
     if (this.history.length > 0 && this.history[this.history.length - 1].id == page.id) {
       return;
     }
+    this.setWmpTitle(page.name);
     this.history.push({
       id: page.id,
       name: page.name || "",
@@ -61,6 +62,7 @@ class PageHistory {
       this.push(page);
       return;
     }
+    this.setWmpTitle(page.name);
     this.history[this.history.length - 1] = {
       id: page.id,
       name: page.name || "",
@@ -83,6 +85,7 @@ class PageHistory {
     const pageId = prevPage ? prevPage.id : null;
     const params = prevPage ? prevPage.params : null;
     if (pageId) {
+      this.setWmpTitle(prevPage.name);
       eventBus.default.emit("loadPage", { pageId, params });
     }
   }
@@ -117,6 +120,19 @@ class PageHistory {
     this.history = [];
     this.saveHistory();
   }
+  /**
+   * 设置微信小程序标题
+   */
+  setWmpTitle(title) {
+    if (window.wx && wx.miniProgram) {
+      wx.miniProgram.postMessage({
+        data: {
+          type: "setTitle",
+          title
+        }
+      });
+    }
+  }
 }
 const pageHistory = new PageHistory();
 exports.default = pageHistory;

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

@@ -0,0 +1,129 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const parseFilterConfig = require("./parseFilterConfig.js");
+const VALIDATION_RULES = {
+  // 身份证
+  idCard: {
+    pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+    message: "请输入正确的身份证号码"
+  },
+  // 统一社会信用代码
+  creditCode: {
+    pattern: /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/,
+    message: "请输入正确的统一社会信用代码"
+  },
+  // 邮编
+  zipCode: {
+    pattern: /^[1-9]\d{5}$/,
+    message: "请输入正确的邮政编码"
+  },
+  // 传真
+  fax: {
+    pattern: /^\d{3,4}-?\d{7,8}$/,
+    message: "请输入正确的传真号码"
+  },
+  // 银行卡号
+  bankCard: {
+    pattern: /^[1-9]\d{15,18}$/,
+    message: "请输入正确的银行卡号"
+  },
+  // 邮箱
+  email: {
+    pattern: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/,
+    message: "请输入正确的邮箱地址"
+  },
+  // 手机
+  mobile: {
+    pattern: /^1[3-9]\d{9}$/,
+    message: "请输入正确的手机号码"
+  },
+  // 座机
+  phone: {
+    pattern: /^0\d{2,3}-?\d{7,8}$/,
+    message: "请输入正确的座机号码"
+  },
+  // 手机+座机
+  mobilePhone: {
+    pattern: /^(1[3-9]\d{9})|(0\d{2,3}-?\d{7,8})$/,
+    message: "请输入正确的联系电话"
+  }
+};
+function generateFieldRules(component, formData, fields) {
+  const rules = [];
+  if (!component.fieldName) {
+    return rules;
+  }
+  if (component.required) {
+    rules.push({
+      required: true,
+      message: component.requiredMessage || `请录入${component.label}`,
+      trigger: "blur"
+    });
+  }
+  if (component.validationType && component.validationType !== "none") {
+    if (component.validationType === "regex" && component.validationPattern) {
+      try {
+        const validator = (_rule, _value, callback) => {
+          try {
+            const isMatch = parseFilterConfig.checkFilterMatch(component.validationPattern, formData.value, fields);
+            if (!isMatch) {
+              callback(new Error(component.validationMessage || "校验失败"));
+            } else {
+              callback();
+            }
+          } catch (error) {
+            console.error("Validation function error:", error);
+            callback(new Error(component.validationMessage || "校验函数执行出错"));
+          }
+        };
+        rules.push({
+          validator,
+          trigger: "change"
+        });
+      } catch (e) {
+        console.error("Invalid validation pattern:", component.validationPattern, e);
+      }
+    } else if (component.validationType === "custom" && component.customValidator) {
+      try {
+        const validator = createCustomValidator(component.customValidator);
+        if (validator) {
+          rules.push({
+            validator,
+            trigger: "blur"
+          });
+        }
+      } catch (e) {
+        console.error("Invalid custom validator:", e);
+      }
+    } else if (VALIDATION_RULES[component.validationType]) {
+      const rule = VALIDATION_RULES[component.validationType];
+      rules.push({
+        pattern: rule.pattern,
+        message: component.validationMessage || rule.message,
+        trigger: "blur"
+      });
+    }
+  }
+  return rules;
+}
+function createCustomValidator(validatorStr) {
+  if (!validatorStr || typeof validatorStr !== "string") {
+    return null;
+  }
+  try {
+    const validator = new Function("return " + validatorStr)();
+    if (typeof validator === "function") {
+      return (rule, value, callback) => {
+        try {
+          validator(rule, value, callback);
+        } catch (error) {
+          callback(new Error("校验函数执行出错: " + error.message));
+        }
+      };
+    }
+  } catch (e) {
+    console.error("Failed to create validator from string:", e);
+  }
+  return null;
+}
+exports.generateFieldRules = generateFieldRules;

package/lib/packages/vue/src/components/forms/number/Number.vue.js

@@ -197,7 +197,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       if (showThousandsSeparator.value) {
         value = formatNumberWithComma(value);
       }
-      return value;
+      return (value == null ? void 0 : value.toString()) || "";
     };
     const showThousandsSeparator = Vue.computed(() => {
       return props.format == "yuan" || props.format == "wan" || props.format == "million";
@@ -451,6 +451,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           disabled: __props.disabled,
           readonly: __props.readonly,
           formatter,
+          maxlength: 15,
           parser,
           onBlur: handleBlur,
           onInput: handleInput
@@ -506,5 +507,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Number = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-01611195"]]);
+const _Number = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-93ac5b02"]]);
 exports.default = _Number;

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

@@ -40,7 +40,8 @@ const _hoisted_2 = {
   key: 0,
   class: "prefix-content"
 };
-const _hoisted_3 = {
+const _hoisted_3 = ["title"];
+const _hoisted_4 = {
   key: 3,
   class: "suffix-content"
 };
@@ -273,7 +274,7 @@ const _sfc_main = {
             resizable: false,
             "show-header-overflow": "",
             "show-footer-overflow": "",
-            "show-overflow": field.isOverflowWrap ? false : "title",
+            "show-overflow": false,
             "header-class-name": field.sortRule == "server" ? "serverSort" : ""
           }, {
             default: Vue.withCtx(({ row }) => [
@@ -284,18 +285,21 @@ const _sfc_main = {
                 field.prefix ? (Vue.openBlock(), Vue.createElementBlock("span", _hoisted_2, Vue.toDisplayString(field.prefix), 1)) : Vue.createCommentVNode("", true),
                 field.isLink ? (Vue.openBlock(), Vue.createBlock(_component_el_link, {
                   key: 1,
+                  class: "cell-link",
                   type: "primary",
                   underline: "never",
+                  title: __props.formatCellValue(row, field),
                   onClick: ($event) => handleButtonClick(row, field, field.linkConfig)
                 }, {
                   default: Vue.withCtx(() => [
                     Vue.createTextVNode(Vue.toDisplayString(__props.formatCellValue(row, field)), 1)
                   ]),
                   _: 2
-                }, 1032, ["onClick"])) : (Vue.openBlock(), Vue.createElementBlock(Vue.Fragment, { key: 2 }, [
-                  Vue.createTextVNode(Vue.toDisplayString(__props.formatCellValue(row, field)), 1)
-                ], 64)),
-                field.suffix ? (Vue.openBlock(), Vue.createElementBlock("span", _hoisted_3, Vue.toDisplayString(field.suffix), 1)) : Vue.createCommentVNode("", true),
+                }, 1032, ["title", "onClick"])) : (Vue.openBlock(), Vue.createElementBlock("span", {
+                  key: 2,
+                  title: __props.formatCellValue(row, field)
+                }, Vue.toDisplayString(__props.formatCellValue(row, field)), 9, _hoisted_3)),
+                field.suffix ? (Vue.openBlock(), Vue.createElementBlock("span", _hoisted_4, Vue.toDisplayString(field.suffix), 1)) : Vue.createCommentVNode("", true),
                 field.canCopy ? (Vue.openBlock(), Vue.createBlock(_component_el_icon, {
                   key: 4,
                   class: "copy-icon",
@@ -309,7 +313,7 @@ const _sfc_main = {
               ], true)
             ]),
             _: 2
-          }, 1032, ["field", "title", "width", "min-width", "fixed", "align", "header-align", "sortable", "show-overflow", "header-class-name"]);
+          }, 1032, ["field", "title", "width", "min-width", "fixed", "align", "header-align", "sortable", "header-class-name"]);
         }), 128)),
         !__props.readonly && shouldShowOptColumn.value ? (Vue.openBlock(), Vue.createBlock(Vue.unref(vxeTable.VxeColumn), {
           key: 3,
@@ -341,5 +345,5 @@ const _sfc_main = {
     };
   }
 };
-const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-336afafd"]]);
+const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-7b218935"]]);
 exports.default = TableColumn;

package/package.json

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