cnhis-design-vue 0.2.18-beta → 0.2.19-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/table-filter/src/base-search-com/BaseSearch.vue

@@ -44,25 +44,42 @@
           <li v-if="isShowSetting('hideSearch') && !showRelatedTreeBtn" ref="inputSearchLi" class="baseSearch-input-search">
             <template v-if="outSearchFieldList && outSearchFieldList.length">
               <a-input
-                :style="{ width, margin: '0 8px 8px 0' }"
+                :style="{ width: inputSearchW + 'px', margin: '0 8px 8px 0' }"
                 allowClear
-                placeholder="请输入关键字搜索"
+                :placeholder="searchPlaceHolder"
                 :value="currentValue"
                 @input="$emit('input', $event.target.value)"
                 @pressEnter="outFilterChange"
+                class="input-search-com"
               >
+              <template slot="prefix" v-if="showPlaceholderPrefix">
+                <a-tooltip
+                  :title="searchPlaceHolder"
+                  overlayClassName="basesearch-placeholder-tooltip"
+                >
+                  <a-icon type="info-circle" />
+                </a-tooltip>
+              </template>
               </a-input>
             </template>
             <a-input-search
               v-else
-              class="my-input-search"
-              :style="{ width }"
+              class="my-input-search input-search-com"
+              :style="{ width: inputSearchW + 'px' }"
               @search="onSearch"
               allowClear
-              placeholder="请输入关键字搜索"
+              :placeholder="searchPlaceHolder"
               :value="currentValue"
               @input="$emit('input', $event.target.value)"
             >
+            <template slot="prefix" v-if="showPlaceholderPrefix">
+                <a-tooltip
+                  :title="searchPlaceHolder"
+                  overlayClassName="basesearch-placeholder-tooltip"
+                >
+                  <a-icon type="info-circle" />
+                </a-tooltip>
+              </template>
               <a-button slot="enterButton" type="primary">
                 <svg-icon icon-class="xitongtubiaosousuo"></svg-icon>
               </a-button>
@@ -312,6 +329,10 @@
         >{{ item.name }} {{ countTabCondition == 1 && (item.digital || item.digital === 0) ? '(' + (item.digital || 0) + ')' : '' }}</div
       >
     </div>
+    <!-- palceholder 文字宽度计算 -->
+    <span class="baseSearchPlaceholderSpan" ref="baseSearchPlaceholderSpan">
+      {{ searchPlaceHolder }}
+    </span>
   </div>
 </template>
 
@@ -535,7 +556,8 @@ export default create({
     filterApiConfigOutSearch: {
       type: Object,
       default: () => ({})
-    }
+    },
+    useFieldList: Array
   },
   components: {
     [Button.name]: Button,
@@ -713,6 +735,18 @@ export default create({
       return function(key) {
         return this.$attrs.tableOptions?.[key];
       }
+    },
+    searchPlaceHolder() {
+      if (!this.useFieldList?.length) return "请输入关键字搜索";
+      let str = "";
+      let strList = this.useFieldList
+        ?.map(item => {
+          if (item.isSearch != 1) return "";
+          return item.formTitle || item.alias || item.title;
+        })
+        .filter(Boolean);
+      str = strList.join("/");
+      return str || "请输入关键字搜索";
     }
   },
   data() {
@@ -760,7 +794,9 @@ export default create({
       groupBtnObj: {},
       btnObj: BTNOBJ,
       printBtnStrategys: [], // 打印按钮组策略list
-      outRelationQuickSearch: [] // 关联表 筛选外显
+      outRelationQuickSearch: [], // 关联表 筛选外显
+      inputSearchW: 200,
+      showPlaceholderPrefix: false
     };
   },
   created() {
@@ -2043,6 +2079,25 @@ export default create({
             });
         }
       }
+    },
+    searchPlaceHolder: {
+      immediate: true,
+      handler(val) {
+        if (!val) return;
+        this.$nextTick(() => {
+          this.showPlaceholderPrefix = false;
+          let dom = this.$refs.baseSearchPlaceholderSpan;
+          let w = dom.offsetWidth;
+          console.log(w, "wwww");
+          let maxW = this.showOutSearch ? 284 : 244;
+          this.inputSearchW = w > maxW ? 300 : w < 200 ? 200 : w;
+          if (w > maxW) {
+            this.showPlaceholderPrefix = true;
+          }
+          this.onResize();
+          console.log(this.inputSearchW);
+        });
+      }
     }
   }
 });
@@ -2214,6 +2269,13 @@ export default create({
         }
       }
     }
+    .baseSearch-input-search {
+      .input-search-com {
+        input {
+          padding: 4px 8px;
+        }
+      }
+    }
   }
   /deep/ .num-picker {
     position: relative;
@@ -2308,6 +2370,11 @@ export default create({
     /* Internet Explorer 10+ */
     font-family: 'Avenir', Helvetica, Arial, sans-serif;
   }
+  .baseSearchPlaceholderSpan {
+    visibility: hidden;
+    position: absolute;
+    z-index: -1;
+  }
 }
 </style>
 <style lang="less">

package/packages/table-filter/src/quick-search/QuickSearch.vue

@@ -69,20 +69,20 @@
                   </div>
                   <div class="label-unfold-btn" v-if="v.itemList && v.isShowBtn">
                     <!-- {{ v.isUnfold }} -->
-                    <span>
-                      <a-icon
-                        type="up-square"
-                        theme="filled"
-                        style="color: #2d7aff"
-                        @click.stop="handleLabelUpfold(v)"
-                        v-if="v.isUnfold"
-                      />
-                      <a-icon
-                        v-else
-                        type="down-square"
-                        class="label-unfold-btn-down"
-                        @click.stop="handleLabelUpfold(v)"
-                      />
+                    <span @click.stop="handleLabelUpfold(v)">
+                      <template v-if="v.isUnfold">
+                        <span>收起</span>
+                        <a-icon
+                          type="up-square"
+                          
+                        />
+                      </template>
+                      <template v-else>
+                        <span>展开</span>
+                        <a-icon
+                          type="down-square"
+                        />
+                      </template>
                     </span>
                   </div>
                 </div>
@@ -1693,6 +1693,7 @@ export default create({
     },
 
     handleLabelUpfold(v) {
+      console.log('触发---isUnfold');
       v.isUnfold = !v.isUnfold;
     },
 
@@ -1888,11 +1889,23 @@ export default create({
       padding: 0;
     }
     .label-unfold-btn {
-      padding: 0px 15px;
+      margin: 8px 0;
+      color: rgba(0, 0, 0, 0.6);
+      cursor: pointer;
+      >span {
+        display: flex;
+        align-items: center;
+        line-height: 1;
+      }
+      .anticon {
+        font-size: 16px;
+        margin-left: 8px;
+      }
       &:hover {
-        .label-unfold-btn-down {
-          color: #2d7aff;
-        }
+        color: #2d7aff;
+      }
+      &:active {
+        color: #2d7aff;
       }
     }
   }