cnhis-design-vue 0.2.18-beta → 0.2.22-beta

package/packages/scale-view/scaleView.vue

@@ -36,15 +36,15 @@
           >
             <div class="totalScore-warp" v-if="hasScore">
               <div>
-                测评分数：<span>{{ config.totalScore }}分</span>
+                测评总分：<span>{{ maxScore }}分</span>
               </div>
               <div>
-                测评总分：<span>{{ maxScore }}分</span>
+                测评分数：<span :style="{ color: getEvaResColor }">{{ config.totalScore }}分</span>
               </div>
               <template v-if="hasEvaluateSetting">
                 <div>
                   测评结果：
-                  <span class="score-result">{{ config.evaluateResult }}</span>
+                  <span class="score-result" :style="{ color: getEvaResColor }">{{ config.evaluateResult }}</span>
                 </div>
                 <div>
                   结果说明：<span>{{ config.evaluateResultExplain }}</span>
@@ -517,6 +517,16 @@ export default create({
       return function(item) {
         return item.databaseTitle || item.title;
       };
+    },
+    getEvaResColor() {
+      let { evaluateResultConfig, totalScore } = this.config;
+      totalScore = +totalScore || 0;
+      if (!evaluateResultConfig.length || !totalScore) return "#2474FF";
+      let matchItem = evaluateResultConfig.find(
+        item => item.startScore <= totalScore && totalScore <= item.endScore
+      );
+      if (!matchItem) return "#2474FF";
+      return matchItem.color || "#2474FF";
     }
   },
   watch: {
@@ -1242,12 +1252,12 @@ export default create({
       const { relation_logic_is, condition, relation_logic } = relationLogicObj;
       if (relation_logic_is) {
         const results = condition.map(c => {
-          const { title } = this.formArray.filter(f => f.seq == c.subject_seq)[0];
-          if (utils.isString(form[title])) {
-            return c.value.includes(form[title]);
+          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]);
           } else {
-            if (utils.isArray(form[title])) {
-              return form[title].some(v => c.value.includes(v));
+            if (utils.isArray(form[key])) {
+              return form[key].some(v => c.value.includes(v));
             }
           }
         });

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>