cnhis-design-vue 2.1.64 → 2.1.65

package/package.json

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

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

@@ -44,7 +44,7 @@
     </div>
     <c-grid
       border
-      show-overflow
+      :show-overflow="isShowOverflow"
       show-header-overflow
       highlight-hover-row
       highlight-current-row
@@ -88,8 +88,8 @@
       }"
       :row-style="getRowStyle"
       :edit-config="{ trigger: 'manual', mode: 'row', autoClear: false, showIcon: false }"
-      :scroll-x="{ gt: 25 }"
-      :scroll-y="{ gt: 50, mode: 'wheel' }"
+      :scroll-x="scrollXConfig"
+      :scroll-y="scrollYConfig"
       :expand-config="{
         lazy: true,
         accordion: columnConfig && columnConfig.accordion,
@@ -265,7 +265,10 @@ export default create({
         del: 'close'
       },
       tableHeight: '100%',
-      allCheckedRows: []
+      allCheckedRows: [],
+      scrollXConfig: { enabled: true, gt: 25 },
+      scrollYConfig: { enabled: true, gt: 50, mode: 'wheel' },
+      isShowOverflow: true
     };
   },
   computed: {
@@ -1238,11 +1241,17 @@ export default create({
       // 配置列表
       let { selectType } = this.getOtherConfigInit() || {};
       let { tableNoSetting } = this;
-      let { isBatchSelect, fieldList, showButtonTop, isScanMultiTable } = map;
+      let { isBatchSelect, fieldList, showButtonTop, isScanMultiTable, autoCellHeight } = map;
       if (selectType) {
         // 有设置 selectType 强制可选。
         isBatchSelect = 1;
       }
+      // 如果表格单行需要内容撑开, 则把虚拟滚动关掉
+      if (autoCellHeight) {
+        this.scrollXConfig.enabled = false;
+        this.scrollYConfig.enabled = false;
+        this.isShowOverflow = false;
+      }
       selectType = selectType || 'checkbox';
       // 扫码弹框 设置为radio
       let { listType } = this.tableOptions;
@@ -1400,6 +1409,8 @@ export default create({
     },
     // 2022/12/1 沈培均/方晶晶要求新增 如果有自定义提示就不显示表格自带的提示
     handleShowOverflow(item) {
+      // 2023/03/17 新增单行高度由内容撑开, 不需要缺省
+      if (!this.isShowOverflow) return false
       if (item.columnName == "operatorColumn") return false;
       // 选人组件 自己的tooltip
       if (item.attrType === "CANDIDATE_COMPONENTS") return false;

package/packages/scale-view/scaleView.vue

@@ -406,6 +406,7 @@ export default create({
       return function (item) {
         let { type } = item || {};
         let tempTile = this.config?.autoQuestionNumber === false ? item.showTitle : `${item.softcode}、${item.showTitle}`;
+        tempTile = this.html2Escape(tempTile);
         if (!this.isEvaluation(type)) return tempTile;
 
         let score = this.handleEvaluationScore(item);
@@ -1848,6 +1849,12 @@ export default create({
     handleEvaluationScore(ele) {
       let { minScore = 0, maxScore = 0, scoreType } = ele.scoreConfigs || {};
       return `(${maxScore}分)`;
+    },
+    html2Escape(sHtml) {
+      if(!sHtml || typeof sHtml != 'string') return sHtml;
+      return sHtml.replace(/[<>&"]/g,function(c){
+        return {'<':'&lt;','>':'&gt;','&':'&amp;','"':'&quot;'}[c];
+      });
     }
   }
 });