cnhis-design-vue 0.1.72-beta → 0.1.76-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.1.72-beta",
+  "version": "0.1.76-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

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

@@ -685,7 +685,7 @@ export default create({
     },
     // 日期显示格式化
     getDate(row, item) {
-      let obj = row[item.columnName];
+      let obj = row[item.columnName] || "";
       if (vexutils.isEmpty(obj)) {
         if (vexutils.isObject(obj) && 'tooltip' in obj) {
           return [

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

@@ -18,11 +18,14 @@
           {{ formatEditText }}
         </a-menu-item>
       </a-menu>
-      <a-button class="dropdown-button" style="margin: 0 8px 8px 0" @click.stop="handleClickBtn">
-        <a-icon v-if="spinning" type="loading" style="line-height: 10px;" />
-        {{ btnText }}
-        <a-icon type="down" />
-      </a-button>
+      <slot name="button" :handleClickPrintBtn="handleClickBtn" :printSpinning="spinning" :printbtnText="btnText" :printVisible="visible">
+        <a-button class="dropdown-button" style="margin: 0 8px 8px 0" @click.stop="handleClickBtn">
+          <a-icon v-if="spinning" type="loading" style="line-height: 10px;" />
+          {{ btnText }}
+          <a-icon type="down" />
+        </a-button>
+        <slot>
+
     </a-dropdown>
 
     <IdentityVerification

package/packages/scale-view/scaleView.vue

@@ -392,18 +392,21 @@ export default create({
             ? item.showTitle
             : `${item.softcode}、${item.showTitle}`;
         if (!this.isEvaluation(type)) return tempTile;
-        if (this.noBtn) {
-          let score = this.handleEvaluationScore(item);
-          return `${tempTile}&nbsp;<span style="color:#2d7aff;">${score}</span>`;
-        }
-        if (!this.isLock) {
-          let score = this.handleEvaluationScore(item);
-          return `${tempTile}&nbsp;<span style="color:#2d7aff;">${score}</span>`;
-        }
-        if (item.questionScore !== undefined) {
-          return `${tempTile}&nbsp;<span style="color:#2d7aff;">(${item.questionScore}分)</span>`;
-        }
-        return tempTile;
+        
+        let score = this.handleEvaluationScore(item);
+        return `${tempTile}&nbsp;<span style="color:#2d7aff;">${score}</span>`;
+        // if (this.noBtn) {
+        //   let score = this.handleEvaluationScore(item);
+        //   return `${tempTile}&nbsp;<span style="color:#2d7aff;">${score}</span>`;
+        // }
+        // if (!this.isLock) {
+        //   let score = this.handleEvaluationScore(item);
+        //   return `${tempTile}&nbsp;<span style="color:#2d7aff;">${score}</span>`;
+        // }
+        // if (item.questionScore !== undefined) {
+        //   return `${tempTile}&nbsp;<span style="color:#2d7aff;">(${item.questionScore}分)</span>`;
+        // }
+        // return tempTile;
       };
     },
     hasScore() {
@@ -1544,15 +1547,16 @@ export default create({
     },
     handleEvaluationScore(ele) {
       let { minScore = 0, maxScore = 0, scoreType } = ele.scoreConfigs || {};
-      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}分)`;
+      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}分)`;
     }
   }
 });

package/packages/select-label/labelFormContent.vue

@@ -112,6 +112,7 @@
 import utils from '@/utils/utils-map';
 import { Tooltip, Icon, Button, Input, Tag, Tabs, Anchor } from 'ant-design-vue';
 import create from '@/core/create';
+import vexutils from '@/utils/vexutils';
 export default create({
   name: 'label-form-content',
   components: {
@@ -470,7 +471,10 @@ export default create({
     handleLabelChange(v, d, labelGroup) {
       const list = labelGroup.itemList;
       const multipleChoice = labelGroup.multipleChoice;
-      let selectedList = this.labelSelectedEdit || [];
+      // let selectedList = this.labelSelectedEdit || [];
+      // 修复 标签多选 点击modal取消按钮 回显也会被选中
+      let selectedList =
+        (this.labelSelectedEdit?.length && vexutils.clone(this.labelSelectedEdit, true)) || [];
       if (v) {
         if (selectedList.some(n => n.labelId == d.labelId)) {
           return;