cnhis-design-vue 2.1.45 → 2.1.46

package/package.json

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

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

@@ -98,6 +98,7 @@
         iconOpen: 'iconfont icon-a-xitongtubiaozhediejian',
         iconClose: 'iconfont icon-a-xitongtubiaotianjia'
       }"
+      v-bind="tableAttrs"
     >
       <template v-slot:empty>
         <div v-if="isShowEmpty">
@@ -363,6 +364,9 @@ export default create({
         tableFieldMap[v.tableField] = v;
       });
       return tableFieldMap;
+    },
+    tableAttrs(){
+      return this?.tableProps || {}
     }
   },
   watch: {
@@ -2956,6 +2960,10 @@ export default create({
       }
     },
     setRowStatus(vxeTable, rowIndex, value) {
+      /**
+       * 行编辑状态切换，样式修改
+       * 目前行编辑的状态行高度为66px，普通状态的高度应取配置值（如果有）
+       */
       if (!vxeTable) return false;
 
       let tableWrap = [
@@ -2975,14 +2983,21 @@ export default create({
 
       let height = value ? `${value}px` : value;
       let lineHeight = value ? `${value - 14}px` : value;
-
+      // 如value 没有值，则是恢复默认的行高
+      if(!value){
+        let rowheight = this?.tableAttrs?.rowConfig?.height;
+        if(rowheight){
+          height = `${rowheight}px`;
+          lineHeight = '30px';
+        }
+      }
       rowWrap.forEach(wrap => {
         let rowItemWrap = [...wrap.querySelectorAll('.vxe-cell')];
         rowItemWrap.push(...[...wrap.querySelectorAll('.vxe-body--column')]);
         rowItemWrap.forEach(dom => {
-          dom.style.setProperty('height', height, 'important');
+          dom.style.setProperty('height', height, value? 'important': undefined);
           dom.style.lineHeight = lineHeight;
-          if (height) {
+          if (value) {
             dom.style.backgroundColor = '#EFF5FF';
             setTimeout(() => {
               dom.title = '';

package/packages/big-table/src/utils/bigTableProps.js

@@ -90,6 +90,10 @@ const bigTableProps = {
     default: true
   },
   listCountParams:{ type: Object, default: () => ({}) },
+  tableProps:{
+    type: Object,
+    default:()=>({})
+  }
 };
 
 export default bigTableProps;

package/packages/scale-view/formitem/r-choice.vue

@@ -503,7 +503,7 @@ export default {
     },
     handleDynamic2StaticOptions(options) {
       if (!options || !options.length) return [];
-      return options.map(item => {
+      let arr =  options.map(item => {
         if ('cascadeData' in item) {
           Object.assign(item, {
             ...item.cascadeData
@@ -518,10 +518,22 @@ export default {
         }
         return item;
       });
+      
+      return this.uniqArrObj(arr, this.columnKey);
+    },
+    // 数组对象去重
+    uniqArrObj(arr, name = "value") {
+      let obj = {};
+      return arr.reduce((cur, next) => {
+        obj[next[name]] ? "" : (obj[next[name]] = true && cur.push(next));
+        return cur;
+      }, []);
     },
     // 下拉组件搜索
     async handleSearch(value) {
       try {
+        // 动态数据源转静态数据
+      if (this.cloneItem?.type == 'SELECT' && this.isDynamic2Static) return
         this.curOptions = await this.getSearchOptions(
           {
             values: this.columnKey,

package/packages/table-filter/src/base-search-com/BaseSearch.vue

@@ -53,7 +53,7 @@
           </li>
           <!-- start--筛选外显--start -->
           <template v-for="item in outSearchFieldList">
-            <outQuickSearch :key="item.id + item.random_key" :item="item" :filterApiConfig="filterApiConfigOutSearch" @outFilterChange="outFilterChange"></outQuickSearch>
+            <outQuickSearch :key="item.id + item.random_key" :item="item" :ref="item.columnName + item.random_key" :filterApiConfig="filterApiConfigOutSearch" @outFilterChange="outFilterChange"></outQuickSearch>
           </template>
           <!-- end--筛选外显--end -->
 
@@ -67,41 +67,48 @@
 
           <li v-if="isShowSetting('hideSearch') && !showRelatedTreeBtn" ref="inputSearchLi" class="baseSearch-input-search">
             <template v-if="outSearchFieldList && outSearchFieldList.length">
-              <a-input
-                :style="{ width: (searchInputWidth || inputSearchW) + 'px', margin: '0 8px 8px 0' }"
-                allowClear
-                :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" class="search-placeholder-icon" />
-                  </a-tooltip>
-                </template>
-              </a-input>
+              <slot name="searchInput" :width="(searchInputWidth || inputSearchW)" :searchPlaceHolder="searchPlaceHolder" :showPlaceholderPrefix="showPlaceholderPrefix" :type="'outSearch'">
+                <a-input
+                  :style="{ width: (searchInputWidth || inputSearchW) + 'px', margin: '0 8px 8px 0' }"
+                  allowClear
+                  :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" class="search-placeholder-icon" />
+                    </a-tooltip>
+                  </template>
+                </a-input>
+              </slot>
             </template>
-            <a-input-search
-              v-else
-              class="my-input-search input-search-com"
-              :style="{ width: (searchInputWidth || inputSearchW) + 'px' }"
-              @search="onSearch"
-              allowClear
-              :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" class="search-placeholder-icon" />
-                </a-tooltip>
-              </template>
-              <a-button slot="enterButton" type="primary">
-                <svg-icon icon-class="xitongtubiaosousuo"></svg-icon>
-              </a-button>
-            </a-input-search>
+
+            <template  v-else>
+              <slot name="searchInput" :width="(searchInputWidth || inputSearchW)" :searchPlaceHolder="searchPlaceHolder" :showPlaceholderPrefix="showPlaceholderPrefix" :type="'default'">
+                <a-input-search
+                  class="my-input-search input-search-com"
+                  :style="{ width: (searchInputWidth || inputSearchW) + 'px' }"
+                  @search="onSearch"
+                  allowClear
+                  :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" class="search-placeholder-icon" />
+                    </a-tooltip>
+                  </template>
+                  <a-button slot="enterButton" type="primary">
+                    <svg-icon icon-class="xitongtubiaosousuo"></svg-icon>
+                  </a-button>
+                </a-input-search>
+               </slot>
+            </template>
+
           </li>
           <li v-if="outSearchFieldList && outSearchFieldList.length">
             <a-button type="primary" @click="outFilterChange" style="margin: 0 8px 8px 0">
@@ -129,20 +136,22 @@
           <!-- 平铺列表 tree -->
           <template v-if="showRelatedTreeBtn">
             <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"
-                placeholder="请输入关键字搜索"
-                @search="onRelatedSearch"
-                allowClear
-                :value="currentValue"
-                @input="$emit('input', $event.target.value)"
-              >
-                <a-button slot="enterButton" type="primary">
-                  <a-icon type="search" />
-                  <!-- <svg-icon icon-class="xitongtubiaosousuo"></svg-icon> -->
-                </a-button>
-              </a-input-search>
+            <slot name="searchInput" :searchPlaceHolder="searchPlaceHolder" :showPlaceholderPrefix="showPlaceholderPrefix" :type="'relatedTreeSearch'" :isRelatedSearchFold="isRelatedSearchFold" >
+                <a-input-search
+                  ref="relatedSearchInput"
+                  class="my-input-search my-input-search-related"
+                  placeholder="请输入关键字搜索"
+                  @search="onRelatedSearch"
+                  allowClear
+                  :value="currentValue"
+                  @input="$emit('input', $event.target.value)"
+                >
+                  <a-button slot="enterButton" type="primary">
+                    <a-icon type="search" />
+                    <!-- <svg-icon icon-class="xitongtubiaosousuo"></svg-icon> -->
+                  </a-button>
+                </a-input-search>
+              </slot>
             </li>
             <template v-if="rowTileBtnListTree && rowTileBtnListTree.length === 1">
               <a-button type="primary" style="margin-right: 8px; margin-bottom: 8px" @click="handleAddType(rowTileBtnListTree[0])">
@@ -368,6 +377,16 @@
  * 3、右侧快速弹框保存搜索函数onSave（obj）;
  * 完整例子：<BaseSearch :onSearch='onSearch' @changeSearch='changeSearch' @onSave='onSave'/>
  */
+
+/**
+ * slot:searchInput
+ * width: {number}宽度
+ * searchPlaceHolder:{string} 检索 input 的placeHolder
+ * showPlaceholderPrefix： {boolean} input 是否展示前缀icon
+ * isRelatedSearchFold: {boolean} 平铺列表树状表的检索框是否收起
+ * type：{string} relatedTreeSearch(平铺列表树状表)/outSearch(检索外显)/default(默认)
+ */
+
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 
@@ -1446,7 +1465,7 @@ export default create({
       }
       if (!rowBtnList?.length) return;
       this.setBatchRelationBtnIds(rowBtnList);
-      
+
 
       // 子列表只留下行级按钮
       // if (this.isNestTableClick) {
@@ -2039,6 +2058,58 @@ export default create({
 
     setPrintNumberCache(obj) {
       this.$emit('setPrintNumberCache', obj);
+    },
+
+    getRef(key){
+      let ref = this.$refs[key];
+      if(Array.isArray(ref)){
+        return ref[0];
+      }
+      return ref;
+    },
+
+    /**
+     * 赋值给检索外显
+     */
+    async setOutFilterValues(obj){
+      if(typeof obj === 'object'){
+
+        const outObj = this.outSearchFieldList.reduce((pre,cur)=>{
+          cur.columnName && (pre[cur.columnName]=cur)
+          return pre;
+        },{});
+
+        // 遍历对象赋值
+        Object.keys(obj).forEach(k=>{
+          let val = obj[k];
+          let item = outObj[k] || {}
+          if(vexutils.isObject(val)){
+            let ks = ['bigValue','lessValue'];
+            ks.forEach(kk=>{
+               this.$set(item,kk,val[kk]);
+            })
+          } else {
+          this.$set(item,'value',val);
+          }
+          // 检索组件，触发检索方法
+           if (item?.comType == "SelectMuiWordBook"){
+            this.setSelectMuiWordBookType(item,val)
+           }
+        })
+
+        await this.$nextTick();
+        this.outFilterChange()
+      }
+    },
+
+    setSelectMuiWordBookType(item,val){
+      if(Array.isArray(item.dataSource)){
+        let f = item.dataSource.find(v=>v.myName == val);
+        if(f) return
+      }
+      let rKey = item.columnName + item.random_key
+      let ref = this.getRef(rKey);
+      ref && ref.handleWordBookSearch(val,item)
     }
 
     /*  */

package/packages/table-filter/src/components/multi-select/multi-select.vue

@@ -11,6 +11,7 @@
     :filterOption="false"
     v-model="item.value"
     @search="handleWordBookSearch($event, item)"
+    @change="handleChange"
     @dropdownVisibleChange="dropdownVisibleChange($event, item)"
     class="quick-input-select"
     :allowClear="item.explicitRequired != 1"
@@ -164,6 +165,13 @@ export default {
       let { page, keyword = undefined } = this?.item?.searchPageConfig;
       page = cType === 'next' ? page + 1 : page - 1;
       this.handleWordBookSearch(keyword, this.item, { page });
+    },
+
+    handleChange(){
+      if(this.mode === 'default'){
+        // this.$emit('change')
+        this.outFilterChange()
+      }
     }
   }
 };