cnhis-design-vue 0.2.17-beta → 0.2.21-beta

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

@@ -26,14 +26,17 @@
           <a-icon class="label-close" v-show="!(item.isPublic && item.isPublic == 1)" type="close" @click.native.stop="handleDelLabel(item, classifyItem)" />
         </template>
       </a-checkable-tag>
-      <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>
-      <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 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>
@@ -118,4 +121,9 @@ export default create({
 .label-disable-wrap {
   text-align: center;
 }
+.label-content {
+  /deep/ .ant-tag {
+    border: 1px solid #f1f1f1;
+  }
+}
 </style>

package/packages/select-label/labelFormContent.vue

@@ -8,7 +8,7 @@
       <div class="label-wrap">
         <!-- 表单内嵌打开标签组件的样式 -->
         <div v-if="explicit" class="explicit-continer">
-          <a-tabs hideAdd :activeKey="labelAnchorKey" @change="labelAnchorTabsOnChange" tab-position="top">
+          <a-tabs hideAdd :activeKey="labelAnchorKey" type="card" @change="labelAnchorTabsOnChange" tab-position="top">
             <template v-for="(v, i) in labelConfig">
               <a-tab-pane :key="v.curKey">
                 <span slot="tab">
@@ -198,9 +198,12 @@ export default create({
         return !labelObj[key].itemList;
       });
     },
-
+    SelectedList() {
+      const { labelSelectedList = [], labelSelectedEdit = [] } = this;
+      return labelSelectedList.concat(labelSelectedEdit);
+    },
     selectLabelId() {
-      const list = this?.labelSelectedList || [];
+      const list = this?.SelectedList || [];
       if (Array.isArray(list)) {
         return list.map(v => v.labelId);
       }
@@ -248,7 +251,6 @@ export default create({
           curKey: `${key}_${typeId}~${this.randomId()}`
         });
       }
-
       this.$set(this, 'labelConfig', copy);
       this.$nextTick(() => {
         this.hanldeBackfill();
@@ -262,8 +264,8 @@ export default create({
     },
 
     hanldeBackfill() {
-      const { labelConfig, labelSelectedList, selectLabelId } = this;
-      this.$set(this, 'labelSelectedEdit', labelSelectedList);
+      const { labelConfig, SelectedList = [], selectLabelId} = this;
+      this.$set(this, 'labelSelectedEdit', SelectedList);
       if (typeof labelConfig === 'object') {
         let keys = Object.keys(labelConfig || {});
         keys.forEach(k => {
@@ -280,76 +282,76 @@ export default create({
     },
 
     // 标签处理
-    async handleEditLabel(v = {}, update = false) {
-      try {
-        if (this.isLock) return;
-        if (v.labelList && !update) {
-          this.handleLabelSelected(v.labelList, this.labelSelectedList, v.labelObj);
-          this.inited = true;
-          this.editLabelItem = v;
-          this.setLabelDeafultClick(v.labelObj);
-        } else {
-          // TODO:
-          const { rows, results } = await this.getLabelList(v);
-          const labelList = rows || [];
-          const labelObj = {};
-          const cacheKey = `${v.val_key}_${v.name}`;
-          //  this.labelSelected[d.cacheKey]
-          let isSelect = false;
-          const selectList = update ? [...(this.labelSelectedEdit || [])] : [...(this.labelSelectedList || [])];
-          labelList.forEach(n => {
-            n.cacheKey = cacheKey;
-            // 根据 labelId 处理默认选中
-
-            /**
-             * 回填的值可能不在数据中，但是不能丢失。
-             */
-            isSelect = selectList.findIndex(i => i.labelId == n.labelId) !== -1;
-            n.isSelect = isSelect; // 是否已选
-            this.$set(n, 'isSelect', isSelect);
-            /**
-             * typeName 按照分类处理
-             * 没有分类创建分类，有则添加
-             */
-            if (labelObj[n.typeName]) {
-              labelObj[n.typeName].itemList.push({ ...n });
-            } else {
-              labelObj[n.typeName] = {
-                itemList: [{ ...n }],
-                showAdd: false,
-                addVal: '',
-                typeName: n.typeName,
-                typeId: n.typeId
-              };
-            }
-          });
-          /**
-           * labelObj 展示的分类值
-           * labelList 原始数据结构
-           * selectList 已选的数据
-           */
-          this.$set(v, 'labelObj', labelObj);
-          this.$set(v, 'labelList', labelList);
-          this.$set(this, 'labelSelectedEdit', selectList);
-          // 缓存
-          this.editLabelItem = v;
-          this.setLabelTypeStatus(results);
-          for (let key in labelObj) {
-            Object.assign(labelObj[key], {
-              curKey: this.randomId()
-            });
-          }
-          this.setLabelDeafultClick(labelObj);
+    // async handleEditLabel(v = {}, update = false) {
+    //   try {
+    //     if (this.isLock) return;
+    //     if (v.labelList && !update) {
+    //       this.handleLabelSelected(v.labelList, this.labelSelectedList, v.labelObj);
+    //       this.inited = true;
+    //       this.editLabelItem = v;
+    //       this.setLabelDeafultClick(v.labelObj);
+    //     } else {
+    //       // TODO:
+    //       const { rows, results } = await this.getLabelList(v);
+    //       const labelList = rows || [];
+    //       const labelObj = {};
+    //       const cacheKey = `${v.val_key}_${v.name}`;
+    //       //  this.labelSelected[d.cacheKey]
+    //       let isSelect = false;
+    //       const selectList = update ? [...(this.labelSelectedEdit || [])] : [...(this.labelSelectedList || [])];
+    //       labelList.forEach(n => {
+    //         n.cacheKey = cacheKey;
+    //         // 根据 labelId 处理默认选中
 
-          this.inited = true;
-        }
-      } catch (error) {
-        this.$set(v, 'labelObj', {});
-        this.$set(v, 'labelList', []);
-        console.log(error);
-        this.inited = true;
-      }
-    },
+    //         /**
+    //          * 回填的值可能不在数据中，但是不能丢失。
+    //          */
+    //         isSelect = selectList.findIndex(i => i.labelId == n.labelId) !== -1;
+    //         n.isSelect = isSelect; // 是否已选
+    //         this.$set(n, 'isSelect', isSelect);
+    //         /**
+    //          * typeName 按照分类处理
+    //          * 没有分类创建分类，有则添加
+    //          */
+    //         if (labelObj[n.typeName]) {
+    //           labelObj[n.typeName].itemList.push({ ...n });
+    //         } else {
+    //           labelObj[n.typeName] = {
+    //             itemList: [{ ...n }],
+    //             showAdd: false,
+    //             addVal: '',
+    //             typeName: n.typeName,
+    //             typeId: n.typeId
+    //           };
+    //         }
+    //       });
+    //       /**
+    //        * labelObj 展示的分类值
+    //        * labelList 原始数据结构
+    //        * selectList 已选的数据
+    //        */
+    //       this.$set(v, 'labelObj', labelObj);
+    //       this.$set(v, 'labelList', labelList);
+    //       this.$set(this, 'labelSelectedEdit', selectList);
+    //       // 缓存
+    //       this.editLabelItem = v;
+    //       this.setLabelTypeStatus(results);
+    //       for (let key in labelObj) {
+    //         Object.assign(labelObj[key], {
+    //           curKey: this.randomId()
+    //         });
+    //       }
+    //       this.setLabelDeafultClick(labelObj);
+
+    //       this.inited = true;
+    //     }
+    //   } catch (error) {
+    //     this.$set(v, 'labelObj', {});
+    //     this.$set(v, 'labelList', []);
+    //     console.log(error);
+    //     this.inited = true;
+    //   }
+    // },
     // 默认选中第一个分类
     setLabelDeafultClick(labelObj, deafulteKey) {
       if (!labelObj) return;
@@ -484,6 +486,8 @@ export default create({
       let parentColor = '';
       if (v.itemList?.length) {
         parentColor = v.itemList[0].parentColor || v.parentColor || '';
+      } else {
+        parentColor = v?.parentColor || "";
       }
 
       const params = {
@@ -703,6 +707,64 @@ export default create({
         max-height: calc(100vh - 109px);
       }
     }
+    .explicit-continer {
+      width: 100%;
+      border: 1px solid #d5d5d5;
+      // background: #F9F9F9;
+      /deep/ .ant-tabs-card {
+        .ant-tabs-nav-container {
+          height: 30px;
+          line-height: 30px;
+          margin-top: 0px;
+          .ant-tabs-tab-prev {
+            border-bottom: 1px solid #e8e8e8;
+            border-right: 1px solid #e8e8e8;
+          }
+          .ant-tabs-tab-next {
+            border-bottom: 1px solid #e8e8e8;
+            border-left: 1px solid #e8e8e8;
+          }
+        }
+        > .ant-tabs-content {
+          // height: 120px;
+          margin-top: -16px;
+
+          > .ant-tabs-tabpane {
+            background: #fff;
+            padding: 16px;
+          }
+        }
+
+        // ant-tabs-tab
+
+        > .ant-tabs-bar {
+          border-color: #fff;
+          .ant-tabs-tab {
+            margin-right:0;
+            border-radius:0;
+            line-height: 30px;
+            height: 30px;
+
+            border-right: 1px solid #e8e8e8!important;
+            border-bottom: 1px solid #e8e8e8;
+            border-top: none;
+
+            // border-color: transparent;
+            background: #F9F9F9;
+            &:first-of-type{
+               border-left: 1px solid #e8e8e8;
+            }
+            &.ant-tabs-tab-active {
+             border-bottom-color: #fff;
+             background: #fff;
+          }
+          }
+
+        }
+
+        .ant-tabs-bar;
+      }
+    }
   }
   .edit-label-type {
     font-size: 12px;

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

@@ -40,6 +40,7 @@
       @ok="handleSaveLabel"
       @cancel="handleLabelCancel"
       :maskClosable="false"
+      :destroyOnClose="true"
       :width="modalWidth"
       :cancelText="'取消'"
       :okText="'确定'"
@@ -124,7 +125,8 @@ export default create({
       modalWidth: '763px',
       modalHeight: '404px',
       maxHeight: '404px',
-      commonLabelList: []
+      commonLabelList: [],
+      multipleChoiceConfig: {}
     };
   },
   props: {
@@ -179,7 +181,11 @@ export default create({
     // 外显初始化
     if(this.explicit){
       this.handleEditLabel();
+    } else {
+      // 获取标签分类
+      this.handleGetMultipleChoiceConfig(this.item);
     }
+
   },
   watch: {
     selectedList: {
@@ -227,11 +233,16 @@ export default create({
       this.hanldeSetLabelItem(d.labelId, false);
     },
     handleCommonLabelChange(v, d) {
-      const selectedList = this.labelSelectedList || [];
+       let multipleChoiceConfig = this.multipleChoiceConfig;
+      let selectedList = this.labelSelectedList || [];
       if (v) {
         if (selectedList.some(n => n.labelId == d.labelId)) {
           return;
         }
+        // 不允许多选的类型，先删除，再新增
+        if('2' == multipleChoiceConfig[d.typeId]){
+          selectedList = selectedList.filter(item => item.typeId !== d.typeId);
+        }
         selectedList.push(d);
       } else {
         const fdIndex = selectedList.findIndex(n => n.labelId == d.labelId);
@@ -251,9 +262,9 @@ export default create({
         }
       });
     },
-    handleEditLabel() {
+    handleEditLabel(type) {
       if (this.isLock) return;
-      if(!this.explicit) {
+      if(!this.explicit && type !== 'init') {
         this.labelVisible = true;
       }
       this.handleGetLabelData(this.item)
@@ -331,7 +342,7 @@ export default create({
        */
       this.$set(v, 'labelObj', labelObj);
       this.$set(v, 'labelList', labelList);
-      this.$set(this, 'labelSelectedEdit', selectList);
+      update && this.$set(this, 'labelSelectedEdit', selectList);
       // 缓存
       this.editLabelItem = v;
       this.setLabelTypeStatus(results);
@@ -340,51 +351,63 @@ export default create({
     setLabelTypeStatus(results) {
       if (!results) return false;
       let keys = Object.keys(results);
-
+      let multipleChoiceConfig ={};
       let choiceTypes = (results.typeList || []).reduce((obj, item) => {
-        obj[item.typeName] = item.multipleChoice;
+        multipleChoiceConfig[item.typeId] = item.multipleChoice
+
+        obj[item.typeName] = {
+          multipleChoice:item.multipleChoice,
+          parentColor: item.parentColor,
+          allowCreateByPersonal:item.allowCreateByPersonal
+        }
         return obj;
       }, {});
+
+      if(this.explicit){
+        this.multipleChoiceConfig = multipleChoiceConfig;
+      }
       keys.forEach(key => {
         if (key === 'typeList') return;
         // 空，允许
         if (key === 'emptyTypes') {
           results[key].forEach(item => {
-            this.$set(this.editLabelItem.labelObj, item.typeName, {
-              multipleChoice: choiceTypes[item.typeName],
+            this.$set(this.editLabelItem.labelObj, item.typeName, Object.assign({
               addVal: '',
               showAdd: false,
               itemList: [],
               typeId: item.typeId,
               typeName: item.typeName
-            });
+            },choiceTypes[item.typeName] || {}));
           });
           return;
         }
         if (utils.isPlainObject(results[key])) {
           // 空，不允许
           if (!this.editLabelItem.labelObj[key]) {
-            this.$set(this.editLabelItem.labelObj, key, {
-              multipleChoice: choiceTypes[key],
+            this.$set(this.editLabelItem.labelObj, key, Object.assign({
               addVal: '',
               showAdd: false,
               itemList: false,
               typeId: '',
               typeName: key
-            });
+            },{...(choiceTypes[key] || {})}));
           } else {
             // 非空，不允许
             this.$set(this.editLabelItem.labelObj[key], 'isNoAdd', true);
-            this.$set(this.editLabelItem.labelObj[key], 'multipleChoice', choiceTypes[key]);
+            this.$set(this.editLabelItem.labelObj[key], 'multipleChoice', choiceTypes[key]?.multipleChoice);
+            this.$set(this.editLabelItem.labelObj[key], 'allowCreateByPersonal', choiceTypes[key]?.allowCreateByPersonal);
+            this.$set(this.editLabelItem.labelObj[key], 'parentColor', choiceTypes[key]?.parentColor);
           }
         } else {
-          this.$set(this.editLabelItem.labelObj[key], 'multipleChoice', choiceTypes[key]);
+          this.$set(this.editLabelItem.labelObj[key], 'multipleChoice', choiceTypes[key]?.multipleChoice);
+          this.$set(this.editLabelItem.labelObj[key], 'allowCreateByPersonal', choiceTypes[key]?.allowCreateByPersonal);
+          this.$set(this.editLabelItem.labelObj[key], 'parentColor', choiceTypes[key]?.parentColor);
         }
       });
-    },
+   },
 
     updateLabelData(){
-      this.handleGetLabelData(this.item)
+      this.handleGetLabelData(this.item, true)
     },
 
    /**
@@ -414,6 +437,18 @@ export default create({
           this.$refs.labelFormContent?.hanldeSetLabelItem(id, state);
         })
       }
+    },
+
+    async handleGetMultipleChoiceConfig(v){
+      const { rows, results } = await this.getLabelList(v);
+      if (!results) return false;
+      let multipleChoiceConfig = (results.typeList || []).reduce((obj, item) => {
+        obj[item.typeId] = item.multipleChoice
+        return obj;
+      }, {});
+
+       this.multipleChoiceConfig = multipleChoiceConfig;
+      this.$set(this,'multipleChoiceConfig',multipleChoiceConfig);
     }
   }
 });
@@ -445,6 +480,10 @@ export default create({
 .tag-label {
   /deep/ .ant-tag {
     margin-bottom: 4px;
+    border: 1px solid #f1f1f1;
+    .anticon-close {
+      color: #fff;
+    }
   }
 }
 .common-label {

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>
@@ -83,7 +100,7 @@
 
           <!-- 平铺列表 tree -->
           <template v-if="showRelatedTreeBtn">
-            <li :class="[showRelatedSearchFold ? 'related-search-input' : 'related-search-input-expand']">
+            <li v-if="showRelatedSearch" :class="[isRelatedSearchFold ? 'related-search-input' : 'related-search-input-expand']">
               <a-input-search
                 ref="relatedSearchInput"
                 class="my-input-search my-input-search-related"
@@ -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,21 @@ export default create({
       return function(key) {
         return this.$attrs.tableOptions?.[key];
       }
+    },
+    searchPlaceHolder() {
+      if (!this.useFieldList?.length || this.showRelatedTreeBtn) 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 || "请输入关键字搜索";
+    },
+    showRelatedSearch() {
+      return this.showRelatedTreeBtn && this.isShowSetting('hideSearch')
     }
   },
   data() {
@@ -760,7 +797,9 @@ export default create({
       groupBtnObj: {},
       btnObj: BTNOBJ,
       printBtnStrategys: [], // 打印按钮组策略list
-      outRelationQuickSearch: [] // 关联表 筛选外显
+      outRelationQuickSearch: [], // 关联表 筛选外显
+      inputSearchW: 200,
+      showPlaceholderPrefix: false
     };
   },
   created() {
@@ -1719,7 +1758,8 @@ export default create({
         const obj = {
           table: i
         };
-        paramsArray.push(utils.setParamsValue(setData[0].params, Object.assign(paramsData, { obj })));
+        // paramsArray.push(utils.setParamsValue(setData[0].params, Object.assign(paramsData, { obj })));
+        paramsArray.push(utils.setParamsValue(setData[0].params, Object.assign(paramsData, { obj, table: i })));
       });
 
       return paramsArray;
@@ -1728,13 +1768,23 @@ export default create({
       let cloneList = _.cloneDeep(btnList);
 
       printNumberList.forEach((item, index) => {
-        cloneList[index].__printConfig = {
-          number: item.number,
-          authorizationKey: item.authorizationKey,
-          port: item.port,
-          versionType: item.versionType,
-          hisParams: { reportid: item.number }
-        };
+        const i = cloneList.findIndex(v => v.settingObj[0].trigger_id == item.id);
+        if (i > -1) {
+          cloneList[i].__printConfig = {
+            number: item.number,
+            authorizationKey: item.authorizationKey,
+            port: item.port,
+            versionType: item.versionType,
+            hisParams: { reportid: item.number }
+          };
+        }
+        // cloneList[index].__printConfig = {
+        //   number: item.number,
+        //   authorizationKey: item.authorizationKey,
+        //   port: item.port,
+        //   versionType: item.versionType,
+        //   hisParams: { reportid: item.number }
+        // };
       });
 
       return cloneList;
@@ -1761,7 +1811,8 @@ export default create({
             number: item.number,
             authorizationKey: data.authorizationKey,
             versionType: data.versionType,
-            port: data.port
+            port: data.port,
+            id: item.id
           };
         });
         this.setPrintNumberCache({
@@ -2031,6 +2082,26 @@ export default create({
             });
         }
       }
+    },
+    searchPlaceHolder: {
+      immediate: true,
+      handler(val) {
+        if (!val || this.showRelatedTreeBtn) return;
+        this.$nextTick(() => {
+          this.showPlaceholderPrefix = false;
+          let dom = this.$refs.baseSearchPlaceholderSpan;
+          if(!dom) return;
+          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);
+        });
+      }
     }
   }
 });
@@ -2202,6 +2273,13 @@ export default create({
         }
       }
     }
+    .baseSearch-input-search {
+      .input-search-com {
+        input {
+          padding: 4px 8px;
+        }
+      }
+    }
   }
   /deep/ .num-picker {
     position: relative;
@@ -2296,6 +2374,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">