cnhis-design-vue 0.2.19-beta → 0.2.23-beta

package/package.json

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

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

@@ -353,6 +353,10 @@ export default create({
     },
     isScanMultiTable() {
       return this.columnConfig?.isScanMultiTable
+    },
+    tableNoSetting(){
+      let { noSetting } = this.getOtherConfigInit() || {};
+      return noSetting || this.showSettings?.hideSettingBtn == 1;
     }
   },
   watch: {
@@ -2145,6 +2149,7 @@ export default create({
       if (!imageArr || !imageArr.length) return curSrc;
       let matchItem = imageArr.find(item => item.type === type);
       if (!matchItem) return curSrc;
+      if(matchItem.suffix) return curSrc + matchItem.suffix
       let h = matchItem.h;
       let w = matchItem.w;
       if (matchItem.h === 'adaptive' && matchItem.w != 'adaptive') {
@@ -2864,10 +2869,6 @@ export default create({
       const config = tableOptions?.config || {};
       return config || undefined;
     },
-    tableNoSetting(){
-      let { noSetting } = this.getOtherConfigInit() || {};
-      return noSetting || this.showSettings?.hideSettingBtn == 1;
-    },
     // 单选
     radioOnChange(rowData = {}) {
       let { data, row, $rowIndex } = rowData;

package/packages/big-table/src/assets/style/table-base.less

@@ -189,6 +189,7 @@ body {
       .vxe-header--column .vxe-cell--title {
         height: 100%;
         line-height: unset;
+        width: 100%;
       }
     }
     .vxe-table--footer-wrapper.body--wrapper,
@@ -219,6 +220,10 @@ body {
   /deep/ .filter-box {
     display: flex;
     align-items: center;
+    width: 100%;
+    .text-over-tooltip-components {
+      max-width: calc(100% - 20px);
+    }
     .vxe-filter--btn {
       border-top-color: #c0c4cc;
       border-right-color: #c0c4cc;

package/packages/big-table/src/components/TextOverTooltip.vue

@@ -89,7 +89,7 @@ export default {
 <style lang="less" scoped>
 .text-over-tooltip-components {
   display: inline-block;
-  max-width: 100%;
+  max-width: 98%;
   /* 文字超出宽度显示省略号 单行 */
   .ellipsis {
     font-size: 14px;

package/packages/multi-chat/chat/index.vue

@@ -131,7 +131,7 @@
         </a-tabs>
         <div v-if="isNormalStyle" class="footer-operate">
           <!-- 状态切换 -->
-          <UserStatus v-if="hideHeader" type="left-bottom" />
+          <UserStatus v-if="hideHeader" placement="topCenter" />
           <div class="footer-operate-right">
             <span v-if="showSetting" class="setting-span">
               <svg-icon icon-class="a-xitongtubiaoliaotianshezhi" @click="handleSetting" />

package/packages/multi-chat/components/user-status.vue

@@ -18,7 +18,7 @@
         <svg-icon v-if="statusIcon" :icon-class="statusIcon" style="font-size: 16px"></svg-icon>
         <img v-else :src="getImg(status)" height="16" />
         {{ statusDesc }}
-        <a-icon type="down" />
+        <a-icon type="up" />
       </div>
       <a-menu slot="overlay">
         <a-menu-item v-for="{ title, status, description, icon } in statusList" :key="status" @click="handleStatusChange(status)">

package/packages/scale-view/answerParse.vue

@@ -27,11 +27,11 @@ export default {
   },
 
   computed: {
+    questionScore() {
+      return this.item?.questionScore;
+    },
     answerSuccess() {
-      let { questionScore } = this.item;
-      // let { questionScore, maxScore } = this.item?.scoreConfigs || {};
-      // if (questionScore && questionScore == maxScore) return true;
-      return questionScore > 0;
+      return this.questionScore > 0;
     },
     answerIcon() {
       return this.answerSuccess ? "xitongtubiaodui" : "xitongtubiaocuo";

package/packages/select-label/label-classify.vue

@@ -0,0 +1,129 @@
+<template>
+  <div class="edit-content">
+    <!-- disable -->
+    <div v-if="!itemList" class="label-disable-wrap">
+      <p class="label-disable-title">无可选标签</p>
+      <p class="label-disable-desc">请联系管理员进行标签管理设置</p>
+    </div>
+    <!--  -->
+    <div v-else class="label-content">
+      <a-checkable-tag
+        v-for="item in itemList"
+        v-model="item.isSelect"
+        @change="handleLabelChange($event, item, classifyItem)"
+        :key="item.labelId"
+        :style="handleLabelColor(item)"
+        :class="{ 'sys-label-tag': item.isPublic && item.isPublic == 1 }"
+      >
+        <a-tooltip placement="topLeft">
+          <template slot="title">
+            <span>{{ item.labelName }}</span>
+          </template>
+          {{ item.labelName }}
+        </a-tooltip>
+
+        <template v-if="sourceType != 'guage'">
+          <a-icon class="label-close" v-show="!(item.isPublic && item.isPublic == 1)" type="close" @click.native.stop="handleDelLabel(item, classifyItem)" />
+        </template>
+      </a-checkable-tag>
+      <template v-if="classifyItem.allowCreateByPersonal == 1 ">
+        <a-button v-if="isEdit && !classifyItem.isNoAdd && sourceType != 'guage'" type="dashed" class="label-add" v-show="!classifyItem.showAdd" @click="handleAddLabel($event, classifyItem)">
+          <a-icon type="plus" />
+          <!-- {{ $t("1.1.2") }} -->
+          标签
+        </a-button>
+        <!-- 是否允许新增个人标签 allowCreateByPersonal -->
+        <a-input v-if="isEdit && !classifyItem.isNoAdd && sourceType != 'guage'" class="label-add add-input" v-model.trim="classifyItem.addVal" v-show="classifyItem.showAdd" @blur="hanldeBlur($event, classifyItem)">
+          <a-icon slot="suffix" type="close" @click.native.stop="clearaddVal($event, classifyItem)" />
+        </a-input>
+      </template>
+    </div>
+  </div>
+</template>
+
+<script>
+import { Tooltip, Icon, Button, Input, Tag, Tabs, Anchor } from 'ant-design-vue';
+import create from '@/core/create';
+export default create({
+  name: 'label-classify',
+  data() {
+    return {};
+  },
+  props: {
+    classifyItem:{
+      type: Object,
+      default:()=>({})
+    },
+
+    handleLabelChange: {
+      type: Function,
+      default: ()=>{}
+    },
+    handleLabelColor: {
+      type: Function,
+      default: ()=>{}
+    },
+    handleDelLabel: {
+      type: Function,
+      default: ()=>{}
+    },
+    handleAddLabel : {
+      type: Function,
+      default: ()=>{}
+    },
+    hanldeBlur: {
+      type: Function,
+      default: ()=>{}
+    },
+    clearaddVal: {
+      type: Function,
+      default: ()=>{}
+    },
+    isEdit:{
+      type: Boolean,
+      default: false
+    },
+    sourceType: String,
+
+  },
+  computed: {
+    itemList(){
+      return this?.classifyItem?.itemList || [];
+    }
+  },
+  watch: {},
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  activated() {},
+  methods: {},
+  components: {
+    [Input.name]: Input,
+    [Icon.name]: Icon,
+    [Tabs.name]: Tabs,
+    [Tabs.TabPane.name]: Tabs.TabPane,
+    [Anchor.name]: Anchor,
+    [Anchor.Link.name]: Anchor.Link,
+    [Tooltip.name]: Tooltip,
+    [Button.name]: Button,
+    [Tag.name]: Tag,
+    [Tag.CheckableTag.name]: Tag.CheckableTag
+  },
+});
+</script>
+
+<style lang="less" scoped>
+.label-disable-wrap {
+  text-align: center;
+}
+.label-content {
+  /deep/ .ant-tag {
+    border: 1px solid #f1f1f1;
+  }
+}
+</style>