cloud-web-corejs 1.0.54-dev.415 → 1.0.54-dev.417

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.415",
+  "version": "1.0.54-dev.417",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/dialog/baseFormulaDialog.vue

@@ -478,7 +478,13 @@ export default {
       const val = opt.substring(0, opt.length - 1);
       this.updateCodeMirror(val, val, "func");
     },
-
+    getFunStr(funcName) {
+      let map = {
+        SUMIF: `([],"",[])`,
+        SUMIFS: `([],[],"")`,
+      };
+      return map[funcName] || "()";
+    },
     updateCodeMirror(field, text, type = null) {
       if (type) {
         let obj = {
@@ -489,8 +495,12 @@ export default {
         let selectionLet = obj.field.length + obj.text.length + obj.type.length; //光标位置；
         let code = `{{${obj.field}.${obj.text}.${obj.type}}}`;
         if (type === "func") {
-          code += "()";
-          selectionLet = selectionLet + 7;
+          // code += "()";
+          // selectionLet = selectionLet + 7;
+          let funStr = this.getFunStr(text);
+          code += funStr;
+          let num = "()" === funStr ? 7 : 7 - 1 + funStr.length;
+          selectionLet = selectionLet + num;
         } else {
           selectionLet = selectionLet + 6;
         }

package/src/components/xform/lang/zh-CN.js

@@ -150,6 +150,10 @@ export default {
         "将数值去掉小数，举例：INT(-8.9)=-9",
       formulaSUM:
         "返回一组数据的和，举例：SUM(1,2,3,...)=6",
+      formulaSUMIF:
+        `根据单个条件对指定区域内的数值求和，举例：SUMIF([10, 20, 30], ">10", [80, 120, 90])=210`,
+      formulaSUMIFS:
+        `根据多个条件对指定区域内的数值求和（条件需同时满足），举例：SUMIFS([1000, 2000, 1500, 3000], [400, 600, 700, 800], '>500', [2022, 2023, 2023, 2024], 2023)=3500`,
       formulaAVERAGE:
         "返回一组数据的平均数，举例：AVERAGE(1,2,3,...)=2",
       formulaMAX:

package/src/components/xform/utils/formula-util.js

@@ -657,6 +657,16 @@ export const formulas = [
         fType: "designer.hint.formulaNumber",
         fIntro: "designer.hint.formulaSUM",
       },
+      {
+        fName: "SUMIF",
+        fType: "designer.hint.formulaNumber",
+        fIntro: "designer.hint.formulaSUMIF",
+      },
+      {
+        fName: "SUMIFS",
+        fType: "designer.hint.formulaNumber",
+        fIntro: "designer.hint.formulaSUMIFS",
+      },
       {
         fName: "AVERAGE",
         fType: "designer.hint.formulaNumber",

package/src/views/user/wf/wfReport/index.vue

@@ -504,7 +504,7 @@ export default {
         url: `/${this.serviceName}/wf_info/listGroupPage`,
         method: "post",
         data: {
-          type: 0,
+          type: 99,
         },
         success: (res) => {
           this.objTypeList = res?.objx?.records || [];