cnhis-design-vue 0.2.65-beta → 0.2.68-beta

package/packages/scale-view/mixin/evaluate.js

@@ -102,7 +102,7 @@ export default {
       return cur >= endTime;
     },
     getTotalLen() {
-      let arrList = this.formArray?.filter(item => !this.filterArr.includes(item.type));
+      let arrList = this.formArray?.filter(item => !this.filterArr.includes(item.type) && !item.hide);
       if (!arrList || !arrList.length) return;
       this.totalLen = arrList.length;
     },

package/packages/scale-view/scaleView.vue

@@ -4,8 +4,8 @@
       <a-spin :indicator="indicator" tip="加载中..." />
     </slot>
     <slot v-if="!spinning && !hasFrontAddress">
-      <div v-if="noData">暂无数据</div>
-      <!-- <NoData v-if="noData" :noDataImg="noDataImg" :noDataTip="noDataTip"></NoData> -->
+      <!-- <div v-if="noData">暂无数据</div> -->
+      <NoData v-if="noData" :noDataImg="noDataImg" :noDataTip="noDataTip"></NoData>
       <template v-else>
         <evaluatePage
           v-if="showEvaluateEntry"
@@ -133,6 +133,11 @@
                       <span class="evalute-label" v-if="showEvaluateLabel(item)">
                         {{ showEvaluateLabel(item) }}
                       </span>
+                      <template v-if="showEvatip(item)">
+                        <span class="evalute-tip" @click="showEvaTipModal(item)">
+                          <svg-icon icon-class="a-xitongtubiaotishi" />查看提示
+                        </span>
+                      </template>
                     </span>
                     <!-- 输入框 -->
                     <MyInput
@@ -258,7 +263,7 @@
 import {
   Icon,
   Checkbox,
-  Tree,
+  Tree, 
   Tooltip,
   Input,
   Spin,
@@ -281,6 +286,7 @@ import evaluatePage from "./evaluatePage.vue";
 import evaluateCountdown from "./evaluateCountdown.vue";
 import answerParse from "./answerParse.vue";
 import vexutils from '@/utils/vexutils';
+import NoData from './NoData.vue';
 export default create({
   name: "scale-view",
   mixins: [judgeTypes, NoDataJs],
@@ -315,7 +321,11 @@ export default create({
         extrasmall: 0.9
       })
     },
-    openType: { type: String, default: "" }
+    openType: { type: String, default: "" },
+    scaleApiConfig: {
+      type: Object,
+      default: () => ({})
+    }
   },
   components: {
     MyChoice,
@@ -340,12 +350,19 @@ export default create({
     [Tooltip.name]: Tooltip,
     evaluatePage,
     evaluateCountdown,
-    answerParse
+    answerParse,
+    NoData
   },
   computed: {
     queryformBoldOpen() {
       return this.$route.query?.formBoldOpen == 1;
     },
+    showEvatip() {
+      return function (item) {
+        if (!this.isEvaluation(item.type)) return false;
+        return this.$route.query?.evatip == 1 || this.params?.evatip == 1;
+      };
+    },
     isFormBoldOpen() {
       return function(item) {
         let res = item.required;
@@ -508,7 +525,8 @@ export default create({
     },
     showAnswerParse() {
       return function(item) {
-        let { evaluateAnswer } = this.config?.evaluateResultSetting || {};
+        let { evaluateAnswer, checkAnswerMode, evaluateStartTime, evaluateTime } =
+          this.config?.evaluateResultSetting || {};
         let arr = [
           "EVALUATE_RADIO_BLOCK",
           "EVALUATE_CHECKBOX_BLOCK",
@@ -516,7 +534,18 @@ export default create({
           "EVALUATE_INPUT"
         ];
         let maxScore = item?.scoreConfigs || 0;
-        return evaluateAnswer && this.isFinished && arr.includes(item.type) && maxScore;
+        let isShow = evaluateAnswer && this.isFinished && arr.includes(item.type) && maxScore;
+        if (
+          !evaluateStartTime ||
+          !evaluateTime ||
+          (checkAnswerMode && checkAnswerMode == 1)
+        )
+          return isShow;
+        if (!vexutils.isValidDate(new Date(evaluateStartTime))) return isShow;
+        // 答案解析时间 考试时间结束后
+        let endTime = moment(evaluateStartTime).add(evaluateTime, "minutes");
+        let isRang = endTime.diff(moment(), "seconds", true);
+        return isShow && isRang <= 0;
       };
     },
     tipMsg() {
@@ -607,7 +636,9 @@ export default create({
       maxScore: 0,
       originConfig: {},
       paramsEvaluate: null,
-      hasFrontAddress: true
+      hasFrontAddress: true,
+      choiceComObj: {},
+      evatipMap: {} // 维护一个tip map避免重复请求
     };
   },
   mounted() {
@@ -644,6 +675,12 @@ export default create({
       }
       map.maxScore && (this.maxScore = map.maxScore);
       this.isFinished = isFinished;
+      if (data.isNotFilled) {
+        this.spinning = false;
+        this.hasFrontAddress = false;
+        this.setNoData(true, '未查询到量表填写记录')
+        return;
+      }
       if (data.isLackCustomer) {
         let _this = this;
         // 校验用户环境
@@ -661,7 +698,12 @@ export default create({
         this.config.evaluateResultConfig = JSON.parse(map.evaluateResultConfig);
       }
       if ("evaluateResultSetting" in map && utils.isJSON(map.evaluateResultSetting)) {
-      this.config.evaluateResultSetting = JSON.parse(map.evaluateResultSetting);
+        this.config.evaluateResultSetting = JSON.parse(map.evaluateResultSetting);
+        // 随机测评
+        if (this.config?.randomId && this.config.evaluateResultSetting) {
+          this.config.evaluateResultSetting.evaluateName = this.config.name;
+          this.config.evaluateResultSetting.evaluateExplain = this.config.remark;
+        }
       }
 
       this.originConfig = JSON.parse(JSON.stringify(this.config));
@@ -738,7 +780,9 @@ export default create({
       };
       for (let key in evaluateResultSetting) {
         let value = evaluateResultSetting[key];
-        if (value && key != "evaluateAnswer" && value.includes("${")) {
+        let isParseKey =
+          value && key != "evaluateAnswer" && typeof value === "string" && value.includes("${");
+        if (isParseKey) {
           let parseValue = value.replace(/\$\{([^}]+)\}/g, (_v, $1) => {
             let param;
             if ($1.startsWith("form.")) {
@@ -991,10 +1035,11 @@ export default create({
         if (notIndexArr.indexOf(item.type) < 0 && !item.hide) {
           this.$set(item, "softcode", i++);
         }
-        return item;
-      });
-      return results.map(item => {
+
+
+        // "RADIO_BLOCK", "CHECKBOX_BLOCK" 将取值value改为key
         if (this.isChoice(item.type)) {
+          this.handleFormatOptions(item.options, item.type);
           if (item.type != "SEARCH_CASCADE") {
             if (item.dbValue) {
               this.nextLogicEvent(item.dbValue, item, results);
@@ -1005,6 +1050,18 @@ export default create({
             }
           }
         }
+        return item;
+      });
+      return results.map(item => {
+        // 题目关联
+        let relationLogicObj = utils.isString(item.relationLogic)
+          ? JSON.parse(item.relationLogic)
+          : item.relationLogic;
+        this.handleRelationLogic(list, relationLogicObj);
+
+        // 跳题逻辑
+        this.handLenextLogic(item);
+        
         // 自定义列表特殊处理
         if (
           item.type === "CHECKBOX_BLOCK" &&
@@ -1017,6 +1074,77 @@ export default create({
         return item;
       });
     },
+    /**
+     * "RADIO_BLOCK", "CHECKBOX_BLOCK" 将取值value改为key, relationLogic需要重新处理
+     */
+    handleRelationLogic(list, relationLogicObj) {
+      let { condition } = relationLogicObj || {};
+      if (!condition || !condition.length) return;
+      condition.forEach(c => {
+        let matchItem = list.find(f => f.seq == c.subject_seq);
+        if (!matchItem) return;
+        let isChoice = this.isRadioOrCheckBox(matchItem.options, matchItem.type);
+        if (!isChoice) return;
+        let value = c.value;
+        if (Array.isArray(value)) {
+          value = value.map(v => {
+            return this.replaceConditionItem(matchItem.options, v);
+          });
+          c.value = value;
+        } else {
+          c.value = this.replaceConditionItem(matchItem.options, value);
+        }
+      });
+    },
+    /**
+     * "RADIO_BLOCK", "CHECKBOX_BLOCK" 将取值value改为key, nextLogic需要重新处理
+     */
+    handLenextLogic(item) {
+      let { nextLogic, options, type } = item || {};
+      let isChoice = this.isRadioOrCheckBox(options, type);
+      if (!nextLogic || !isChoice) return;
+      let { condition } = nextLogic || {};
+      if (!condition || !condition.length) return;
+      condition.forEach(c => {
+        let value = c.value;
+        if (Array.isArray(value)) {
+          value = value.map(v => {
+            return this.replaceConditionItem(options, v);
+          });
+          c.value = value;
+        } else {
+          c.value = this.replaceConditionItem(options, value);
+        }
+      });
+    },
+    replaceConditionItem(options, value) {
+      let matchOption = options.find(v => value === v.value);
+      if (!matchOption) return value;
+      return matchOption.key;
+    },
+    isRadioOrCheckBox(options, type) {
+      let typeArr = ["RADIO_BLOCK", "CHECKBOX_BLOCK"];
+      if (!typeArr.includes(type)) return;
+      if (!options) return;
+      if (options && utils.isJSON(options)) {
+        options = JSON.parse(options);
+      }
+      if (!options.length) return;
+      return true;
+    },
+    handleFormatOptions(options, type) {
+      let isChoice = this.isRadioOrCheckBox(options, type);
+      if (!isChoice) return;
+
+      options.forEach((item, i) => {
+        if (item.key !== "other") {
+          item.key = i + 1;
+        }
+        if (item.prefix || item.suffix) {
+          item.value = item.prefix || item.suffix;
+        }
+      });
+    },
     // 初始化rules
     formatRules(formArray) {
       const rules = {};
@@ -1066,6 +1194,18 @@ export default create({
             validator: (rule, value, callback) => this[methodName](rule, value, callback, item),
             trigger: "change"
           });
+        } else if (item.type === "RADIO_BLOCK") {
+          this.choiceComObj[this.formKey(item)] = {};
+          rules[newTitle].push({
+            validator: (rule, value, callback) => this.checkRadio(rule, value, callback, item),
+            trigger: "change"
+          });
+        } else if (item.type === "CHECKBOX_BLOCK") {
+          this.choiceComObj[this.formKey(item)] = {};
+          rules[newTitle].push({
+            validator: (rule, value, callback) => this.checkCheckbox(rule, value, callback, item),
+            trigger: "change"
+          });
         }
       });
       return rules;
@@ -1145,6 +1285,56 @@ export default create({
       }
       callback();
     },
+    checkRadio(rule, value, callback, item) {
+      if (!value) return callback();
+      let { options } = item;
+      if (!options.length || value === "other") return callback();
+      const key = this.formKey(item);
+      let { optionsPreSuffixObj = {} } = this.choiceComObj[key] || {};
+      let matchItem = options.find((o, i) => {
+        if (i + 1 === value) {
+          return true;
+        }
+        return false;
+      });
+      if (!matchItem || matchItem.importability) return callback();
+      if (matchItem.prefix || matchItem.suffix) {
+        let inputValue = optionsPreSuffixObj[value];
+        if (!inputValue) {
+          return callback(new Error(`请完善选项`));
+        }
+      }
+      callback();
+    },
+    checkCheckbox(rule, value, callback, item) {
+      if (!value || !value.length) return callback();
+      let { options } = item;
+      if (!options.length) return callback();
+      let i = 0,
+        len = value.length,
+        v;
+      const key = this.formKey(item);
+      let { optionsPreSuffixObj = {} } = this.choiceComObj[key] || {};
+      for (; i < len; i++) {
+        v = value[i];
+        if (v === "other") continue;
+        let matchItem = options.find((o, j) => {
+          if (j + 1 === v) {
+            return true;
+          }
+          return false;
+        });
+        if (!matchItem || matchItem.importability) continue;
+
+        if (matchItem.prefix || matchItem.suffix) {
+          let inputValue = optionsPreSuffixObj[v];
+          if (!inputValue) {
+            return callback(new Error(`请完善选项`));
+          }
+        }
+      }
+      callback();
+    },
     handleMax(dateType, value, dateMaxValue) {
       let curValue = "";
       let tempValue = "";
@@ -1216,6 +1406,47 @@ export default create({
         }
       });
     },
+    async showEvaTipModal(item){
+      if (this.evatipMap[item.id]) {
+        this.evatipConfirm(this.evatipMap[item.id]);
+        return;
+      }
+      let key = 'getSubjectAnswer'
+      const fn = this.scaleApiConfig?.[key] || null;
+      if(!fn || typeof fn !== 'function') {
+        this.$message.error(`${key} Is not a function`)
+        return
+      }
+      let obj = await fn(item.id)
+      if(!obj) return;
+      if (!this.evatipMap[item.id]) {
+        this.evatipMap[item.id] = obj;
+        this.evatipConfirm(obj);
+      }
+    },
+    closeTip() {
+      this.$destroyAll();
+    },
+    evatipConfirm(str) {
+      let _this = this;
+      let content = h => (
+        <div class="evatip-container">
+          <a-icon type="close" class="tip-content-close" on-click={_this.closeTip} />
+          <span>答案解析:</span>
+          <p>{str}</p>
+        </div>
+      );
+      this.$confirm({
+        title: "提示",
+        icon: () => null,
+        content,
+        okText: "确定",
+        cancelText: "关闭",
+        onOk() {},
+        onCancel() {},
+        class: "evatip-modal-wrap"
+      });
+    },
     // 选择组件
     handleChoice(choiceValue, formItem) {
       let { value = "", list = [] } = choiceValue;
@@ -1245,6 +1476,7 @@ export default create({
     // 跳题逻辑
     nextLogicEvent(choiceValue, formItem, formArray) {
       const { nextLogic, seq } = formItem;
+      if(!nextLogic) return;
       if (nextLogic.next_logic_is) {
         nextLogic.condition.some(con => {
           const { value, next_subject } = con;
@@ -1312,16 +1544,15 @@ export default create({
           ? JSON.parse(formItem.relationLogic)
           : formItem.relationLogic;
       }
+      if (!relationLogicObj || !Object.keys(relationLogicObj).length) return true;
       const { relation_logic_is, condition, relation_logic } = relationLogicObj;
       if (relation_logic_is) {
         const results = condition.map(c => {
           let key = this.formKey(this.formArray.filter(f => f.seq == c.subject_seq)[0]);
-          if (utils.isString(form[key])) {
-            return c.value.includes(form[key]);
+          if (utils.isArray(form[key])) {
+            return form[key].some(v => c.value.includes(v));
           } else {
-            if (utils.isArray(form[key])) {
-              return form[key].some(v => c.value.includes(v));
-            }
+            return c.value.includes(form[key]);
           }
         });
         if (relation_logic == "OR") {
@@ -1335,15 +1566,17 @@ export default create({
       return formItem.isShow;
     },
     // 单选组件回调
-    radioChange(val, item) {
+    radioChange(val, item, obj) {
       const key = this.formKey(item);
       this.form[key] = val;
+      item.type === "RADIO_BLOCK" && this.$set(this.choiceComObj, key, obj);
       this.nextLogicEvent(val, item, this.formArray);
     },
     // 多选组件回调
-    checkboxChange(val, item) {
+    checkboxChange(val, item, obj) {
       const key = this.formKey(item);
       this.form[key] = val;
+      item.type === "CHECKBOX_BLOCK" && this.$set(this.choiceComObj, key, obj);
       this.nextLogicEvent(val, item, this.formArray);
     },
     // 标签组件回调
@@ -1473,7 +1706,8 @@ export default create({
         if (utils.isJSON(hasSpreadParams.setting)) {
           hasSpreadParams.setting = JSON.parse(hasSpreadParams.setting);
         }
-        this.submitForm[hasSpreadParams.title] = this.compileSpreadParams(
+        let spreadKey = this.formKey(hasSpreadParams);
+        this.submitForm[spreadKey] = this.compileSpreadParams(
           hasSpreadParams.setting.spreadParams
         );
       }
@@ -1495,10 +1729,11 @@ export default create({
           scoreJson: JSON.stringify(scoreJson)
         };
       } else {
-        const { guageId } = this.config;
+        const { guageId, randomId } = this.config;
         params = Object.assign(this.params, {
           guageId,
-          scoreJson: JSON.stringify(scoreJson)
+          scoreJson: JSON.stringify(scoreJson),
+          randomId
         });
       }
       if (this.shareId) {
@@ -1528,26 +1763,14 @@ export default create({
        */
       this.$emit("onSubmit", params, hasCallbackItem, isCallback);
 
-      // if (hasCallbackItem && isCallback) {
-      //   let reqList = [this.saveGuageData(params)];
-      //   reqList.push(this.callBackEntrance(params));
-      //   Promise.all(reqList).then(res => {
-      //     let guageRes = res[0];
-      //     this.submitParams(guageRes);
-      //   });
-      // } else {
-      //   this.saveGuageData(params).then(data => {
-      //     this.submitParams(data);
-      //   });
-      // }
     },
     handleScoreJson() {
       let tempObj = Object.assign({}, this.form, this.submitForm);
       let res = {};
       if (!Object.keys(tempObj).length) return {};
       for (let key in tempObj) {
-        if (key) {
-          let itemTemp = this.formArray.find(item => this.formKey(item) == key);
+        let itemTemp = this.formArray.find(item => this.formKey(item) == key);
+        if (key && itemTemp) {
           let keyTemp;
           if (itemTemp && itemTemp.databaseTitle) keyTemp = itemTemp.databaseTitle;
           if (
@@ -1570,104 +1793,73 @@ export default create({
           } 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);
+            }
+            if (itemTemp.type === "CHECKBOX_BLOCK" && value?.length) {
+              let resArr = this.handleCheckboxParams(value, options, obj);
+              res[useKey] = resArr;
+            }
+          }
+        } else {
+          res[key] = tempObj[key];
         }
       }
       console.log("res", res);
       return res;
     },
-    // submitParams(data) {
-    //   if (!data || !Object.keys(data).length) return;
-    //   if (data.result != "SUCCESS") {
-    //     return this.$message.warning(data.resultMsg || "保存失败");
-    //   }
-    //   const { obj = {}, tip } = data?.map || {};
-    //   this.handleSuccessTip(tip || data.resultMsg || this.$t("1.6.6")).finally(() => {
-    //     if (this.source === "layout") {
-    //       this.$emit("reload");
-    //       this.$emit("onCloseSetting");
-    //     } else {
-    //       this.$emit("submit", {
-    //         db_id: obj.id,
-    //         guage_id: obj.tableId
-    //       });
-    //     }
-    //     const origin = window.location.origin;
-    //     window.postMessage(
-    //       {
-    //         status: "SUCCESS",
-    //         type: "GUAGE",
-    //         data: { db_id: obj.id, guage_id: obj.tableId }
-    //       },
-    //       origin
-    //     );
-    //   });
-    // },
-    // handleSuccessTip(msg) {
-    //   let content = msg;
-    //   if (utils.isObject(msg)) {
-    //     const { text, color = "inherit", size = "inherit", mode = "POP" } = msg;
-    //     content = () => (
-    //       <span style={{ color: color, fontSize: size }} domPropsInnerHTML={text}></span>
-    //     );
-    //     if (mode === "POP") {
-    //       return new Promise((resolve, _reject) => {
-    //         const onOk = () => resolve(true);
-    //         this.$info({
-    //           title: "提示",
-    //           content: content,
-    //           okText: "确定",
-    //           keyboard: false,
-    //           onOk: onOk,
-    //           onCancel: onOk
-    //         });
-    //       });
-    //     }
-    //   }
-    //   this.$message.success({ content });
-    //   return Promise.resolve(true);
-    // },
-    // saveGuageData(params) {
-    //   let url;
-    //   if (this.type === "customList") {
-    //     url = "/definedTableList/saveDefinedListData";
-    //   } else {
-    //     url = "/guage/saveGuageData";
-    //   }
-    //   return new Promise((resolve, reject) => {
-    //     this.axios
-    //       .post(url, this.$qs.stringify(params))
-    //       .then(({ data }) => {
-    //         resolve(data);
-    //         if (data.result != "SUCCESS") {
-    //           this.$message.error(data.resultMsg);
-    //           reject(data);
-    //         } else {
-    //           resolve(data);
-    //         }
-    //       })
-    //       .catch(err => {
-    //         reject(err);
-    //       });
-    //   });
-    // },
-    // callBackEntrance(params) {
-    //   const url = "/guage/callBackEntrance";
-    //   return new Promise((resolve, reject) => {
-    //     this.axios
-    //       .post(url, this.$qs.stringify(params))
-    //       .then(({ data }) => {
-    //         if (data.result != "SUCCESS") {
-    //           this.$message.error(data.resultMsg);
-    //           reject(data);
-    //         } else {
-    //           resolve(data);
-    //         }
-    //       })
-    //       .catch(err => {
-    //         reject(err);
-    //       });
-    //   });
-    // },
+     handleCheckboxParams(value, options, obj) {
+      let res = [];
+      let i = 0,
+        len = value.length,
+        v;
+      for (; i < len; i++) {
+        v = value[i];
+        let matchItem = options.find((o, i) => {
+          if (i + 1 === v) {
+            return true;
+          }
+          return false;
+        });
+        if (matchItem && !matchItem.prefix && !matchItem.suffix) {
+          res.push(matchItem.value);
+          continue;
+        }
+        let tempValue = this.handleChoiceItem(v, options, obj);
+        res.push(tempValue);
+      }
+      return res;
+    },
+    handleChoiceItem(value, options, obj) {
+      let { othersText, optionsPreSuffixObj = {} } = obj || {};
+      if (value === "other") {
+        return othersText || "其他";
+      }
+      let matchItem = options.find((o, i) => {
+        if (i + 1 === value) {
+          return true;
+        }
+        return false;
+      });
+      if(!matchItem) return;
+      if (!matchItem.prefix && !matchItem.suffix) return matchItem.value;
+      let resValue = optionsPreSuffixObj[value] || "";
+      if (matchItem.prefix) {
+        resValue = matchItem.prefix + resValue;
+      } else {
+        resValue += matchItem.suffix;
+      }
+      return resValue;
+    },
     resetForm() {
       this.$refs.ruleForm.resetFields();
     },
@@ -1677,15 +1869,6 @@ export default create({
     handleEvaluationScore(ele) {
       let { minScore = 0, maxScore = 0, scoreType } = ele.scoreConfigs || {};
       return `(${maxScore}分)`;
-      // if (scoreType === "correctAnswerScore") return `(${maxScore}分)`;
-      // if (minScore === maxScore) return `(${maxScore}分)`;
-      // if (ele.type === "EVALUATE_INPUT") {
-      //   if (maxScore == 0) {
-      //     return `(${maxScore}分)`;
-      //   }
-      //   return `(0-${maxScore}分)`;
-      // }
-      // return `(${minScore}-${maxScore}分)`;
     }
   }
 });
@@ -1801,6 +1984,18 @@ export default create({
     border: 1px solid rgba(45, 122, 255, 0.5);
     background: rgba(45, 122, 255, 0.1);
   }
+  .evalute-tip {
+    display: inline-block;
+    padding: 0 5px;
+    margin-left: 8px;
+    color: #fe9626;
+    border-radius: 2px;
+    background: rgba(255, 194, 0, 0.15);
+    cursor: pointer;
+    .ant-icon {
+      margin-right: 2px;
+    }
+  }
   /deep/ .ant-form-item-label {
     // white-space: break-spaces;
     white-space: unset;