@fecp/designer 5.4.35 → 5.4.37

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.4.35";
+const version = "5.4.37";
 const packageJson = {
   version
 };

package/es/designer/src/packages/formulaEditor/core/calculate.mjs

@@ -31,6 +31,7 @@ function calculate(params) {
         offset += data.toString().length - (endIndex - startIndex);
       }
     }
+    debugger;
     const result = functionCore.executeFunction(str);
     return result;
   } catch (e) {

package/es/designer/src/packages/formulaEditor/core/customFunc.mjs

@@ -0,0 +1,6 @@
+const DATEDELTA = (dataStr, offset) => {
+  return /* @__PURE__ */ new Date();
+};
+export {
+  DATEDELTA
+};

package/es/designer/src/packages/formulaEditor/core/functionCore.mjs

@@ -1,7 +1,9 @@
 import * as index from "../../../../../node_modules/@formulajs/formulajs/lib/esm/index.mjs";
+import * as customFunc from "./customFunc.mjs";
+const Formula = { ...index, ...customFunc };
 class FunctionCore {
   constructor() {
-    Object.assign(FunctionCore.prototype, index);
+    Object.assign(FunctionCore.prototype, Formula);
   }
   executeFunction(str) {
     const fn = new Function(

package/es/designer/src/packages/formulaEditor/function.mjs

@@ -343,6 +343,20 @@ const functionList = [
         example: 'DAY("2025/1/15") = 15',
         usage: "DAY(日期)"
       },
+      {
+        name: "DATEDELTA",
+        enCode: "DATEDELTA",
+        tip: "加减日期天数",
+        example: 'DATEDELTA("2025/1/15",2) = 2025/1/17',
+        usage: "DATEDELTA(指定日期,需要加减的天数)"
+      },
+      {
+        name: "EDATE",
+        enCode: "EDATE",
+        tip: "加减日期月份",
+        example: 'EDATE("2025/1/15",2) = 2025/3/15',
+        usage: "EDATE(指定日期,需要加减的月份数)"
+      },
       {
         name: "DAYS",
         enCode: "DAYS",

package/es/designer.css

@@ -5904,27 +5904,27 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-d272bf0a] {
+.fec-form[data-v-d28cc224] {
   height: 100%;
 }
-[data-v-d272bf0a] .vgl-item {
+[data-v-d28cc224] .vgl-item {
   transition: none;
 }
-[data-v-d272bf0a] .vgl-item > .el-form-item {
+[data-v-d28cc224] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-d272bf0a] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-d28cc224] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-d272bf0a] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-d28cc224] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-d272bf0a] .vgl-item > .el-container {
+[data-v-d28cc224] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-3e5372d4] {
   display: inline-block;

package/es/packages/mobile/src/components/base/card/Card.vue.mjs

@@ -6,13 +6,13 @@
 /* empty css                                                        */
 /* empty css                                                       */
 import { createBlock, openBlock, withCtx, createVNode, renderSlot } from "vue";
-/* empty css           */
-import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
 /* empty css                                                           */
 /* empty css                                                                  */
 /* empty css                                                        */
 /* empty css                                                      */
 /* empty css                                                       */
+/* empty css           */
+import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { SwipeCell } from "../../../../../../node_modules/vant/es/swipe-cell/index.mjs";
 import { showConfirmDialog } from "../../../../../../node_modules/vant/es/dialog/function-call.mjs";
 import "../../../../../../node_modules/vant/es/dialog/index.mjs";

package/es/packages/vue/src/components/forms/date/Date.vue.mjs

@@ -72,13 +72,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     });
     const computedValueFormat = computed(() => {
       const valueFormatMap = {
-        date: "YYYY-MM-DD",
-        week: "YYYY-MM-DD",
-        month: "YYYY-MM",
+        date: "YYYY/MM/DD",
+        week: "YYYY/MM/DD",
+        month: "YYYY/MM",
         year: "YYYY",
-        datetime: "YYYY-MM-DD HH:mm:ss"
+        datetime: "YYYY/MM/DD HH:mm:ss"
       };
-      return valueFormatMap[props.dateType] || "YYYY-MM-DD";
+      return valueFormatMap[props.dateType] || "YYYY/MM/DD";
     });
     const inputValue = computed({
       get: () => props.modelValue,

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

@@ -636,11 +636,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       datetime: "YYYYMMDDHHmmss"
     };
     const formValueFormatMap = {
-      date: "YYYY-MM-DD",
-      week: "YYYY-MM-DD",
-      month: "YYYY-MM",
+      date: "YYYY/MM/DD",
+      week: "YYYY/MM/DD",
+      month: "YYYY/MM",
       year: "YYYY",
-      datetime: "YYYY-MM-DD HH:mm:ss"
+      datetime: "YYYY/MM/DD HH:mm:ss"
     };
     const getFormData = () => {
       const result = { ...formData.value };
@@ -659,7 +659,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         } else if (fieldName && fieldType === "date" && value) {
           const dateValueType = field.dateValueType;
           const valueFormat = valueFormatMap[field.dateType] || "YYYYMMDD";
-          const formValueFormat = formValueFormatMap[field.dateType] || "YYYY-MM-DD";
+          const formValueFormat = formValueFormatMap[field.dateType] || "YYYY/MM/DD";
           switch (dateValueType) {
             case "date":
               result[fieldName] = hooks(value, formValueFormat).toDate();
@@ -717,7 +717,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           });
         } else if (fieldName && fieldType === "date" && value) {
           const valueFormat = valueFormatMap[field.dateType] || "YYYYMMDD";
-          const formValueFormat = formValueFormatMap[field.dateType] || "YYYY-MM-DD";
+          const formValueFormat = formValueFormatMap[field.dateType] || "YYYY/MM/DD";
           processedData[fieldName] = hooks(value, valueFormat).format(
             formValueFormat
           );
@@ -1064,7 +1064,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d272bf0a"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d28cc224"]]);
 export {
   _Form as default
 };

package/es/packages/vue/src/utils/formulajs/calculate.mjs

@@ -58,6 +58,15 @@ function calculate(params) {
       offset += data.toString().length - (endIndex - startIndex);
     }
     const result = functionCore.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 = {

package/es/packages/vue/src/utils/formulajs/customFunc.mjs

@@ -0,0 +1,12 @@
+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;
+};
+export {
+  DATEDELTA
+};

package/es/packages/vue/src/utils/formulajs/functionCore.mjs

@@ -1,7 +1,9 @@
 import * as index from "../../../../../node_modules/@formulajs/formulajs/lib/esm/index.mjs";
+import * as customFunc from "./customFunc.mjs";
+const Formula = { ...index, ...customFunc };
 class FunctionCore {
   constructor() {
-    Object.assign(FunctionCore.prototype, index);
+    Object.assign(FunctionCore.prototype, Formula);
   }
   executeFunction(str) {
     const fn = new Function(

package/lib/designer/package.json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const version = "5.4.35";
+const version = "5.4.37";
 const packageJson = {
   version
 };

package/lib/designer/src/packages/formulaEditor/core/calculate.js

@@ -33,6 +33,7 @@ function calculate(params) {
         offset += data.toString().length - (endIndex - startIndex);
       }
     }
+    debugger;
     const result = functionCore.default.executeFunction(str);
     return result;
   } catch (e) {

package/lib/designer/src/packages/formulaEditor/core/customFunc.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const DATEDELTA = (dataStr, offset) => {
+  return /* @__PURE__ */ new Date();
+};
+exports.DATEDELTA = DATEDELTA;

package/lib/designer/src/packages/formulaEditor/core/functionCore.js

@@ -1,9 +1,11 @@
 "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, index);
+    Object.assign(FunctionCore.prototype, Formula);
   }
   executeFunction(str) {
     const fn = new Function(

package/lib/designer/src/packages/formulaEditor/function.js

@@ -345,6 +345,20 @@ const functionList = [
         example: 'DAY("2025/1/15") = 15',
         usage: "DAY(日期)"
       },
+      {
+        name: "DATEDELTA",
+        enCode: "DATEDELTA",
+        tip: "加减日期天数",
+        example: 'DATEDELTA("2025/1/15",2) = 2025/1/17',
+        usage: "DATEDELTA(指定日期,需要加减的天数)"
+      },
+      {
+        name: "EDATE",
+        enCode: "EDATE",
+        tip: "加减日期月份",
+        example: 'EDATE("2025/1/15",2) = 2025/3/15',
+        usage: "EDATE(指定日期,需要加减的月份数)"
+      },
       {
         name: "DAYS",
         enCode: "DAYS",

package/lib/designer.css

@@ -5904,27 +5904,27 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-d272bf0a] {
+.fec-form[data-v-d28cc224] {
   height: 100%;
 }
-[data-v-d272bf0a] .vgl-item {
+[data-v-d28cc224] .vgl-item {
   transition: none;
 }
-[data-v-d272bf0a] .vgl-item > .el-form-item {
+[data-v-d28cc224] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-d272bf0a] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-d28cc224] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-d272bf0a] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-d28cc224] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-d272bf0a] .vgl-item > .el-container {
+[data-v-d28cc224] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-3e5372d4] {
   display: inline-block;

package/lib/packages/mobile/src/components/base/card/Card.vue.js

@@ -8,13 +8,13 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                        */
 ;/* empty css                                                       */
 const vue = require("vue");
-;/* empty css           */
-const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 ;/* empty css                                                           */
 ;/* empty css                                                                  */
 ;/* empty css                                                        */
 ;/* empty css                                                      */
 ;/* empty css                                                       */
+;/* empty css           */
+const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 const index$1 = require("../../../../../../node_modules/vant/es/swipe-cell/index.js");
 const functionCall = require("../../../../../../node_modules/vant/es/dialog/function-call.js");
 require("../../../../../../node_modules/vant/es/dialog/index.js");

package/lib/packages/vue/src/components/forms/date/Date.vue.js

@@ -74,13 +74,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     });
     const computedValueFormat = vue.computed(() => {
       const valueFormatMap = {
-        date: "YYYY-MM-DD",
-        week: "YYYY-MM-DD",
-        month: "YYYY-MM",
+        date: "YYYY/MM/DD",
+        week: "YYYY/MM/DD",
+        month: "YYYY/MM",
         year: "YYYY",
-        datetime: "YYYY-MM-DD HH:mm:ss"
+        datetime: "YYYY/MM/DD HH:mm:ss"
       };
-      return valueFormatMap[props.dateType] || "YYYY-MM-DD";
+      return valueFormatMap[props.dateType] || "YYYY/MM/DD";
     });
     const inputValue = vue.computed({
       get: () => props.modelValue,

package/lib/packages/vue/src/components/forms/form/Form.vue.js

@@ -638,11 +638,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       datetime: "YYYYMMDDHHmmss"
     };
     const formValueFormatMap = {
-      date: "YYYY-MM-DD",
-      week: "YYYY-MM-DD",
-      month: "YYYY-MM",
+      date: "YYYY/MM/DD",
+      week: "YYYY/MM/DD",
+      month: "YYYY/MM",
       year: "YYYY",
-      datetime: "YYYY-MM-DD HH:mm:ss"
+      datetime: "YYYY/MM/DD HH:mm:ss"
     };
     const getFormData = () => {
       const result = { ...formData.value };
@@ -661,7 +661,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         } else if (fieldName && fieldType === "date" && value) {
           const dateValueType = field.dateValueType;
           const valueFormat = valueFormatMap[field.dateType] || "YYYYMMDD";
-          const formValueFormat = formValueFormatMap[field.dateType] || "YYYY-MM-DD";
+          const formValueFormat = formValueFormatMap[field.dateType] || "YYYY/MM/DD";
           switch (dateValueType) {
             case "date":
               result[fieldName] = moment.default(value, formValueFormat).toDate();
@@ -719,7 +719,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           });
         } else if (fieldName && fieldType === "date" && value) {
           const valueFormat = valueFormatMap[field.dateType] || "YYYYMMDD";
-          const formValueFormat = formValueFormatMap[field.dateType] || "YYYY-MM-DD";
+          const formValueFormat = formValueFormatMap[field.dateType] || "YYYY/MM/DD";
           processedData[fieldName] = moment.default(value, valueFormat).format(
             formValueFormat
           );
@@ -1066,5 +1066,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-d272bf0a"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-d28cc224"]]);
 exports.default = _Form;

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

@@ -60,6 +60,15 @@ function calculate(params) {
       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 = {

package/lib/packages/vue/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/vue/src/utils/formulajs/functionCore.js

@@ -1,9 +1,11 @@
 "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, index);
+    Object.assign(FunctionCore.prototype, Formula);
   }
   executeFunction(str) {
     const fn = new Function(

package/package.json

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