cnhis-design-vue 2.0.6 → 2.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.0.6",
+  "version": "2.0.9",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/big-table/src/BigTable.vue

@@ -380,7 +380,11 @@ export default create({
       const list = value.map(v => {
         const newV = {};
         for (let i in v) {
-          newV[i] = JSON.parse(JSON.stringify(v[i] || ""));
+          if (typeof v[i] === 'number') {
+            newV[i] = v[i]
+          } else {
+            newV[i] = JSON.parse(JSON.stringify(v[i] || ""));
+          }
           if (newV[i] && typeof v[i] === "string" && !newV[i].includes('security-code')) {
             newV[i] = this.$xss(v[i]);
           }

package/packages/button/src/ButtonPrint/index.vue

@@ -214,11 +214,14 @@ export default create({
         timeout: 5000
       };
       let printUrlPrefix = this?.printConfig?.printUrlPrefix;
+      let customCofing = this?.printConfig?.customCofing || {};
+      let cCofing = this.getCustomCofing(customCofing);
       if (axios !== this.axios && printUrlPrefix) {
         config.baseURL = printUrlPrefix;
       }
       httpFn = axios.create({
-        ...config
+        ...config,
+        ...cCofing
       });
       const formatListResult = await this.queryFormatList();
       if (this.versionType == 1 || this.versionType == 3) {
@@ -637,6 +640,20 @@ export default create({
     },
     callLocalServicesErrorCb(res) {
       this.$emit('error', res);
+    },
+
+    /**
+     * 获取 axios 自定义配置
+     */
+    getCustomCofing(customCofing){
+      let cCofing = {}
+      let type = typeof customCofing;
+      if(type === 'function'){
+        cCofing = customCofing();
+      } else if(type === 'object'){
+        cCofing = customCofing;
+      }
+      return cCofing;
     }
   }
 });

package/packages/scale-view/scaleView.vue

@@ -1770,6 +1770,7 @@ export default create({
       if (!Object.keys(tempObj).length) return {};
       for (let key in tempObj) {
         let itemTemp = this.formArray.find(item => this.formKey(item) == key);
+        let curValue = tempObj[key];
         if (key && itemTemp) {
           let keyTemp;
           if (itemTemp && itemTemp.databaseTitle) keyTemp = itemTemp.databaseTitle;
@@ -1778,40 +1779,39 @@ export default create({
             itemTemp &&
             itemTemp.setting &&
             itemTemp.setting.startToStop != 1 &&
-            tempObj[key] &&
+            curValue &&
             itemTemp.type == "DATETIME"
           ) {
-            if (itemTemp.setting && itemTemp.setting.dateType == "time" && tempObj[key])
-              tempObj[key] = moment().format("YYYY-MM-DD ") + tempObj[key];
-            if (itemTemp.setting && itemTemp.setting.dateType == "date" && tempObj[key])
-              tempObj[key] =
-                moment(tempObj[key]).format("YYYY-MM-DD ") + moment().format("HH:mm:ss");
+            if (itemTemp.setting && itemTemp.setting.dateType == "time" && curValue)
+              curValue = moment().format("YYYY-MM-DD ") + curValue;
+            if (itemTemp.setting && itemTemp.setting.dateType == "date" && curValue)
+              curValue =
+                moment(curValue).format("YYYY-MM-DD ") + moment().format("HH:mm:ss");
           }
-          if (key.includes("~-~")) {
-            let newKey = keyTemp ? keyTemp.replace(/~-~/g, ".") : key.replace(/~-~/g, ".");
-            res[newKey] = tempObj[key];
-          } else {
-            res[keyTemp || key] = !tempObj[key] ? null : tempObj[key];
-          }
-
 
           // 处理choice选项 将key替换为value
           let isChoice = ["RADIO_BLOCK", "CHECKBOX_BLOCK"].includes(itemTemp.type);
           if (isChoice) {
             let { options } = itemTemp;
-            let useKey = this.formKey(itemTemp);
-            let obj = this.choiceComObj[useKey];
-            let value = tempObj[key];
-            if (itemTemp.type === "RADIO_BLOCK" && value) {
-              res[useKey] = this.handleChoiceItem(value, options, obj);
+            let obj = this.choiceComObj[key];
+            if (itemTemp.type === "RADIO_BLOCK" && curValue) {
+              curValue = this.handleChoiceItem(curValue, options, obj);
             }
-            if (itemTemp.type === "CHECKBOX_BLOCK" && value?.length) {
-              let resArr = this.handleCheckboxParams(value, options, obj);
-              res[useKey] = resArr;
+            if (itemTemp.type === "CHECKBOX_BLOCK" && curValue?.length) {
+              let resArr = this.handleCheckboxParams(curValue, options, obj);
+              curValue = resArr;
             }
           }
+
+          if (key.includes("~-~")) {
+            let newKey = keyTemp ? keyTemp.replace(/~-~/g, ".") : key.replace(/~-~/g, ".");
+            res[newKey] = curValue;
+          } else {
+            res[keyTemp || key] = !curValue ? null : curValue;
+          }
+          
         } else {
-          res[key] = tempObj[key];
+          res[key] = curValue;
         }
       }
       console.log("res", res);