cnhis-design-vue 0.1.65-beta → 0.1.69-beta

package/packages/scale-view/scaleView.vue

@@ -38,13 +38,17 @@
               <div>
                 测评分数：<span>{{ config.totalScore }}分</span>
               </div>
+              <div>
+                测评总分：<span>{{ maxScore }}分</span>
+              </div>
               <template v-if="hasEvaluateSetting">
-                <div
-                  >测评结果：<span class="score-result">{{ config.evaluateResult }}</span></div
-                >
-                <div
-                  >结果说明：<span>{{ config.evaluateResultExplain }}</span></div
-                >
+                <div>
+                  测评结果：
+                  <span class="score-result">{{ config.evaluateResult }}</span>
+                </div>
+                <div>
+                  结果说明：<span>{{ config.evaluateResultExplain }}</span>
+                </div>
               </template>
             </div>
             <a-form-model
@@ -129,12 +133,15 @@
                         v-html="handleShowQuestionNumber(item)"
                       ></span>
                       <span class="required-text" v-if="isFormBoldOpen(item)">(必填)</span>
+                      <span class="evalute-label" v-if="showEvaluateLabel(item)">
+                        {{ showEvaluateLabel(item) }}
+                      </span>
                     </span>
                     <!-- 输入框 -->
                     <MyInput
                       v-bind="$attrs"
                       v-if="isInput(item.type)"
-                      v-model="form[item.title]"
+                      v-model="form[formKey(item)]"
                       :type="item.valueType"
                       :row="item.setting.inputRow || 1"
                       :defaultPlaceHolder="item.setting.defaultPlaceHolder"
@@ -145,7 +152,7 @@
                     <MyChoice
                       v-bind="$attrs"
                       v-else-if="isChoice(item.type)"
-                      v-model="form[item.title]"
+                      v-model="form[formKey(item)]"
                       :item="item"
                       :isLock="componentDisable"
                       :curIndex="index"
@@ -182,7 +189,7 @@
                     >
                       <a-input
                         placeholder="请选择"
-                        :value="handleGetAddress(form[item.title])"
+                        :value="handleGetAddress(form[formKey(item)])"
                         disabled
                       >
                         <a-icon slot="prefix" type="info-circle" />
@@ -190,7 +197,7 @@
                       <MapComp
                         v-bind="$attrs"
                         :visible.sync="mapVisible"
-                        :locationProp="form[item.title]"
+                        :locationProp="form[formKey(item)]"
                         :isLock="componentDisable"
                         @selectLocation="handleSelectLocation($event, item)"
                       />
@@ -221,10 +228,12 @@
                       :source="'guage'"
                       :formData="item"
                       :limitNum="item.setting.limitPic"
-                      :defFileList="form[item.title]"
+                      :defFileList="form[formKey(item)]"
                       :isLock="componentDisable"
                       @vodFileList="vodFileList($event, item)"
                     />
+                    <!-- 答案解析 -->
+                    <answerParse v-if="showAnswerParse(item)" :item="item"></answerParse>
                   </a-form-model-item>
                 </template>
               </template>
@@ -272,6 +281,7 @@ import moment from "moment";
 import utils from "@/utils/utils-map";
 import evaluatePage from "./evaluatePage.vue";
 import evaluateCountdown from "./evaluateCountdown.vue";
+import answerParse from "./answerParse.vue";
 import vexutils from '@/utils/vexutils';
 export default create({
   name: "scale-view",
@@ -330,7 +340,8 @@ export default create({
     [FormModel.Item.name]: FormModel.Item,
     [Tooltip.name]: Tooltip,
     evaluatePage,
-    evaluateCountdown
+    evaluateCountdown,
+    answerParse
   },
   computed: {
     queryformBoldOpen() {
@@ -386,14 +397,14 @@ export default create({
         if (!this.isEvaluation(type)) return tempTile;
         if (this.noBtn) {
           let score = this.handleEvaluationScore(item);
-          return `${tempTile}&nbsp;<span style="color:#3e85ff;">${score}</span>`;
+          return `${tempTile}&nbsp;<span style="color:#2d7aff;">${score}</span>`;
         }
         if (!this.isLock) {
           let score = this.handleEvaluationScore(item);
-          return `${tempTile}&nbsp;<span style="color:#3e85ff;">${score}</span>`;
+          return `${tempTile}&nbsp;<span style="color:#2d7aff;">${score}</span>`;
         }
         if (item.questionScore !== undefined) {
-          return `${tempTile}&nbsp;<span style="color:#3e85ff;">(${item.questionScore}分)</span>`;
+          return `${tempTile}&nbsp;<span style="color:#2d7aff;">(${item.questionScore}分)</span>`;
         }
         return tempTile;
       };
@@ -417,7 +428,7 @@ export default create({
     },
     getTimeValue() {
       return function(item) {
-        let value = this.form[item.title];
+        let value = this.form[this.formKey(item)];
         return value;
       };
     },
@@ -471,6 +482,36 @@ export default create({
         return this.hideBtn || this.isLock;
       }
       return this.hideBtn || this.isLock || this.isFinished;
+    },
+    showEvaluateLabel() {
+      return function(item) {
+        let obj = {
+          EVALUATE_RADIO_BLOCK: "单选题",
+          EVALUATE_CHECKBOX_BLOCK: "多选题"
+        };
+        return obj[item.type];
+      };
+    },
+    showAnswerParse() {
+      return function(item) {
+        let { evaluateAnswer } = this.config?.evaluateResultSetting || {};
+        let arr = [
+          "EVALUATE_RADIO_BLOCK",
+          "EVALUATE_CHECKBOX_BLOCK",
+          "EVALUATE_SELECT",
+          "EVALUATE_INPUT"
+        ];
+        let maxScore = item?.scoreConfigs || 0;
+        return evaluateAnswer && this.isFinished && arr.includes(item.type) && maxScore;
+      };
+    },
+    tipMsg() {
+      return this.type === "customList" ? "保存" : "提交";
+    },
+    formKey() {
+      return function(item) {
+        return item.databaseTitle || item.title;
+      };
     }
   },
   watch: {
@@ -620,7 +661,7 @@ export default create({
       };
       for (let key in evaluateResultSetting) {
         let value = evaluateResultSetting[key];
-        if (value && value.includes("${")) {
+        if (value && key != "evaluateAnswer" && value.includes("${")) {
           let parseValue = value.replace(/\$\{([^}]+)\}/g, (_v, $1) => {
             let param;
             if ($1.startsWith("form.")) {
@@ -709,21 +750,22 @@ export default create({
       const formData = {};
       let val;
       formArray.forEach(item => {
+        const key = this.formKey(item);
         const { type } = item;
         switch (type) {
           case "LOCATION":
-            formData[item.title] = item.dbValue || "";
+            formData[key] = item.dbValue || "";
             break;
           case "SEARCH_CASCADE":
-            formData[item.title] = item.dbValue || [];
+            formData[key] = item.dbValue || [];
             break;
           case "ADDRESS":
-            formData[item.title] = item.dbValue || "";
+            formData[key] = item.dbValue || "";
             this.defaultAddress = item.dbValue || {};
             break;
           case "LABEL":
-            formData[item.title] = item.dbValue || {};
-            if (utils.isObject(item.dbValue)) {
+            formData[key] = item.dbValue || {};
+            if (this.$utils.isObject(item.dbValue)) {
               this.labelSelectedList = item.dbValue?.labels || [];
             } else if (Array.isArray(item.dbValue)) {
               this.labelSelectedList = item.dbValue;
@@ -732,33 +774,33 @@ export default create({
             }
             break;
           case "TITLE":
-            formData[item.title] = item.title;
+            formData[key] = item.title;
             break;
           case "IMGCARD":
-            formData[item.title] = item.setting?.imgUrl || "";
+            formData[key] = item.setting?.imgUrl || "";
             break;
           case "UPFILE":
           case "UPPICTURE":
-            formData[item.title] = item.dbValue || [];
+            formData[key] = item.dbValue || [];
             break;
           // 自定义列表特殊处理
           case "CHECKBOX_BLOCK":
             if (item.dbValue && !Array.isArray(item.dbValue) && this.type === "customList") {
-              formData[item.title] = item.dbValue.split(",").filter(ii => !!ii);
+              formData[key] = item.dbValue.split(",").filter(ii => !!ii);
             } else {
               val = item.dbValue || item.setting.defaultValue;
-              if (utils.isJSON(val)) {
+              if (this.$utils.isJSON(val)) {
                 val = JSON.parse(val);
               }
-              formData[item.title] = val;
+              formData[key] = val;
             }
             break;
           default:
             val = item.dbValue || item.setting.defaultValue;
-            if (utils.isJSON(val)) {
+            if (this.$utils.isJSON(val)) {
               val = JSON.parse(val);
             }
-            formData[item.title] = val;
+            formData[key] = val;
             break;
         }
       });
@@ -957,7 +999,7 @@ export default create({
       if (!outDateMaxValue || !dateType) return callback();
       let matchDateItem = this.formArray.find(v => v.seq === outDateMaxValue);
       if (!matchDateItem || matchDateItem.hide) return callback();
-      let matchValue = this.form[matchDateItem.title];
+      let matchValue = this.form[this.formKey(matchDateItem)];
       if (!matchValue) return;
       let isMax = this.handleMax(dateType, value, matchValue);
       if (!isMax) {
@@ -994,7 +1036,8 @@ export default create({
     handleSelectLocation(e, item) {
       const { locationProp, isInit } = e;
       this.mapLocation = locationProp;
-      this.form[item.title] = locationProp;
+      const key = this.formKey(item);
+      this.form[key] = locationProp;
       this.mapVisible = isInit || false;
     },
     isInput(type) {
@@ -1079,7 +1122,8 @@ export default create({
                 if (item.seq > seq && item.seq < lastSeq) {
                   item.isShow = false;
                   // 跳过时 清空已填内容
-                  this.form[item.title] && (this.form[item.title] = "");
+                  const key = this.formKey(item);
+                  this.form[key] && (this.form[key] = "");
                 } else {
                   item.isShow = true;
                 }
@@ -1094,12 +1138,13 @@ export default create({
             }
           } else if (nextLogic.next_logic == "uncondition") {
             formArray.forEach(item => {
+              const key = this.formKey(item);
               if (item.seq > seq && item.seq < lastSeq) {
                 let res = utils.isEmpty(choiceValue);
                 item.isShow = res;
                 // 跳过时 清空已填内容
                 if (!res) {
-                  this.form[item.title] && (this.form[item.title] = "");
+                  this.form[key] && (this.form[key] = "");
                 }
               }
             });
@@ -1152,21 +1197,25 @@ export default create({
     },
     // 单选组件回调
     radioChange(val, item) {
-      this.form[item.title] = val;
+      const key = this.formKey(item);
+      this.form[key] = val;
       this.nextLogicEvent(val, item, this.formArray);
     },
     // 多选组件回调
     checkboxChange(val, item) {
-      this.form[item.title] = val;
+      const key = this.formKey(item);
+      this.form[key] = val;
       this.nextLogicEvent(val, item, this.formArray);
     },
     // 标签组件回调
     labelChange(labelList, item) {
-      this.form[item.title] = this.handleGetLabelSubmit(labelList);
+      const key = this.formKey(item);
+      this.form[key] = this.handleGetLabelSubmit(labelList);
     },
     // 视频组件回调
     vodFileList(list, item) {
-      this.form[item.title] = list;
+       const key = this.formKey(item);
+      this.form[key] = list;
     },
     handleGetLabelSubmit(labelSelectedList) {
       if (!labelSelectedList || !labelSelectedList.length)
@@ -1190,16 +1239,19 @@ export default create({
     },
     // 地址回调
     changeAddress(allValue, item) {
-      this.form[item.title] = allValue;
+      const key = this.formKey(item);
+      this.form[key] = allValue;
     },
     // 上传回调
     changeUpload(value, item) {
-      this.form[item.title] = value;
+      const key = this.formKey(item);
+      this.form[key] = value;
     },
     // 时间回调
     changeTime(value, item) {
-      this.form[item.title] = value;
-      this.submitForm[item.title] = value;
+      const key = this.formKey(item);
+      this.form[key] = value;
+      this.submitForm[key] = value;
     },
     // 保存
     onSubmit() {
@@ -1209,23 +1261,25 @@ export default create({
         (!evaluateResultSetting || !Object.keys(evaluateResultSetting).length) &&
         !this.showEvaluateEntry
       ) {
-        this.onSubmitForm();
+        this.confirmSubmit("确认要提交吗？");
         return;
       }
       let countdownDom = this.$refs.evaluateCountdown;
       if (!countdownDom?.showEvaluateCountdown) {
-        this.onSubmitForm();
+        this.confirmSubmit("确认要结束测评吗？");
         return;
       }
 
-      let message = "确定要提前结束吗？";
+      let message = "确认要提前结束测评吗？";
       let setAnswered = this.$refs.evaluateCountdown?.setAnswered;
       let totalLen = this.$refs.evaluateCountdown?.totalLen;
       // 存在未解答题目
       if (setAnswered < totalLen) {
         message = "存在未解答的题目，确定要提前结束吗？";
       }
-
+      this.confirmSubmit(message);
+    },
+    confirmSubmit(message) {
       let _this = this;
       this.$confirm({
         title: "温馨提示",
@@ -1491,6 +1545,9 @@ export default create({
     &.scale-container-nopadding {
       height: 100%;
     }
+    &::-webkit-scrollbar {
+      width: 10px;
+    }
   }
   /deep/ .no-data-tip {
     width: 100%;
@@ -1569,6 +1626,29 @@ export default create({
   .required-text {
     color: #e02828;
   }
+  .evalute-label {
+    display: inline-block;
+    height: 20px;
+    line-height: 20px;
+    padding: 0 5px;
+    margin-left: 4px;
+    font-size: 12px;
+    color: #2d7aff;
+    border-radius: 4px;
+    border: 1px solid rgba(45, 122, 255, 0.5);
+    background: rgba(45, 122, 255, 0.1);
+  }
+  /deep/ .ant-form-item-label {
+    // white-space: break-spaces;
+    white-space: unset;
+    text-align: left;
+    line-height: 20px;
+    padding: 6px 0;
+    width: 100%;
+    .ant-form-item-no-colon {
+      width: 100%;
+    }
+  }
 }
 .footer {
   position: absolute;

package/packages/select-person/select-person.vue

@@ -138,6 +138,8 @@
 import { Icon, Checkbox, Tree, Tooltip, Input, Spin } from "ant-design-vue";
 import searchTree from "./search-tree";
 import create from '@/core/create';
+import vexutils from '@/utils/vexutils';
+
 /**
  * 查询没有部门的分类时，parent_id_obj 为 undefined a-tree 展示异常。
  * 前端 赋上固定key 标识 该分类 无部门，该key 不能提交接口。
@@ -749,8 +751,8 @@ export default create({
 
         let allSearchkeysOther = this.search.dataListKeys.other;
 
-        this.checkedKeys.main = this.$utils.uniq([...this.checkedKeys.main, ...allSearchkeysMain]);
-        this.checkedKeys.other = this.$utils.uniq([
+        this.checkedKeys.main = vexutils.uniq([...this.checkedKeys.main, ...allSearchkeysMain]);
+        this.checkedKeys.other = vexutils.uniq([
           ...this.checkedKeys.other,
           ...allSearchkeysOther
         ]);
@@ -842,7 +844,7 @@ export default create({
     },
 
     removeCheckedkeysMain(keys) {
-      let checkedKeysMain = this.$utils.clone(this.checkedKeys.main, true);
+      let checkedKeysMain = vexutils.clone(this.checkedKeys.main, true);
       keys.forEach(key => {
         //
         let index = checkedKeysMain.findIndex(mainKey => mainKey === key);