cnhis-design-vue 0.1.85-beta → 0.1.86-beta

package/package.json

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

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

@@ -848,7 +848,7 @@ export default create({
           key = temp.tooltip || temp.value; // temp.tooltip 日期的处理
         }
       }
-      return [<a-switch checked={key == item.btnLinkSwitchDefVal} disabled={disabled} on-change={e => this.switchBtnOnChange(e, row, item)} />];
+      return [<a-switch checked={key == item.btnLinkSwitchDefVal} disabled={disabled} on-change={e => this.switchBtnOnChange(e, row, item, index)} />];
     },
     // 字段显示 jsx
     getField(row, item, index, isLink) {
@@ -2613,8 +2613,8 @@ export default create({
       if (!data) data = require('./assets/img/xb_big.png');
       this.$emit('handlePreView', data, i);
     },
-    switchBtnOnChange(e, r, i) {
-      this.$emit('switchBtnOnChange', e, r, i);
+    switchBtnOnChange(e, r, i, index) {
+      this.$emit('switchBtnOnChange', e, r, i, index);
     },
     hanldeCopyContent(e, value) {
       e.preventDefault();
@@ -2624,9 +2624,15 @@ export default create({
     // 链接按钮详情
     linkDetail(row, col, index, e) {
       if (this.isInlineOperating) return false;
+      let vxeTable = this.$refs.xGrid;
       e.preventDefault();
       // e.stopPropagation();
-      this.$refs.xGrid.setCurrentRow(row);
+      // 方晶晶验收2.5.12需求, 要求link字段第一次可选中checkbox, 第二次点击不取消选中
+      let isCheckedByCheckboxRow = vxeTable.isCheckedByCheckboxRow(row);
+      if (isCheckedByCheckboxRow) {
+        e.stopPropagation();
+      }
+      vxeTable.setCurrentRow(row);
       this.$emit('setNestTableClick', this.isNestTable);
       this.$emit('setCurRowIndex', index);
       this.$emit('linkDetail', row, col, row[this.handlePrimaryKey], null, false, index);

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

@@ -8,17 +8,28 @@
               设置
               <!-- {{ $t("1.1.5.3") }} -->
             </a-button>
-            <a-dropdown overlayClassName="viewList-dropdown" v-if="showViewList">
-              <a-button class="viewList-button">
-                <svg-icon :icon-class="'anniuqiehuanmoshi'" style="font-size: 22px"></svg-icon>
-              </a-button>
-              <a-menu slot="overlay">
-                <a-menu-item v-for="(item, index) in viewList" :value="item.id" :key="index" @click="handlerSelectTemp(item.id)" :class="{ 'menu-active': currentTempId === item.id }">
-                  <span>{{ item.name }}</span>
-                  <!-- <a-icon v-if="currentTempId === item.id" type="check" /> -->
-                </a-menu-item>
-              </a-menu>
-            </a-dropdown>
+            <template v-if="showViewList">
+              <a-popover v-model="viewListVisible" placement="bottom" overlayClassName="product-line-popover viewList-popover" >
+                <a-button class="viewList-button">
+                  <svg-icon :icon-class="'anniuqiehuanmoshi'" style="font-size: 22px"></svg-icon>
+                </a-button>
+                <template slot="content">
+                  <ul class="product-line-list">
+                    <li
+                      v-for="(item, index) in viewList"
+                      :value="item.id"
+                      :key="index"
+                      @click="handlerSelectTemp(item.id)"
+                      class="product-line-list-item"
+                      :class="{ 'active': currentTempId === item.id }"
+                    >
+                      <span>{{ item.name }}</span>
+                      <a-icon v-if="currentTempId === item.id" type="check" class="check-icon product-line-check-icon" />
+                    </li>
+                  </ul>
+                </template>
+              </a-popover>
+            </template>
           </div>
           <slot name="classification"></slot>
           <li v-if="isShowSetting('hideQuickSearch') && isRelatedSearchFold" ref="quickSearchLi">
@@ -760,7 +771,8 @@ export default create({
       groupBtnObj: {},
       btnObj: BTNOBJ,
       printBtnStrategys: [], // 打印按钮组策略list
-      outRelationQuickSearch: [] // 关联表 筛选外显
+      outRelationQuickSearch: [], // 关联表 筛选外显
+      viewListVisible: false
     };
   },
   created() {
@@ -1183,6 +1195,7 @@ export default create({
     },
     handlerSelectTemp(e) {
       if (this.currentTempId === e) return;
+      this.viewListVisible = false;
       this.currentTempId = e;
       const tab = e == 0 ? 'bigTable' : null;
       this.$emit('handlerChangeView', e, tab);
@@ -1565,7 +1578,7 @@ export default create({
 
       if (editTableWrapper.options && utils.isPlainObject(editTableWrapper.options.extendParams)) {
         // 有额外的参数
-        this.options?.extendParams && Object.assign(tableParams.form, this.options.extendParams);
+        editTableWrapper.options?.extendParams && Object.assign(tableParams.form, editTableWrapper.options.extendParams);
       }
       const paramsData = Object.assign(tableParams, {
         table: btn
@@ -2281,27 +2294,7 @@ export default create({
     }
   }
 }
-.viewList-dropdown {
+.viewList-popover {
   min-width: 120px;
-  .ant-dropdown-menu-item {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    color: #2e2e2e;
-    margin: 1px 0;
-    &:hover {
-      background: #f2f2f2;
-    }
-    > span {
-      display: inline;
-      width: 85%;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-    }
-  }
-  .ant-dropdown-menu-item.menu-active {
-    color: #2d7aff;
-  }
 }
 </style>

package/packages/table-filter/src/components/table-modal/TableModal.vue

@@ -39,11 +39,11 @@
       <div class="list-title">
         <span class="list-title-item" style="width:6%"></span>
         <span class="list-title-item">
-          父类名称
+          名称
           <!-- {{ $t("1.9.362") }} -->
         </span>
         <span class="list-title-item">
-          名称
+          父类名称
           <!-- {{ $t("1.1.3.1.1") }} -->
         </span>
         <span class="list-title-item">
@@ -73,10 +73,10 @@
               </a-tooltip>
             </span>
             <span :title="item.displayCategory" class="list-content-item">
-              {{ item.displayCategory }}
+              {{ item.name }}
             </span>
             <span :title="item.name" class="list-content-item">
-              {{ item.name }}
+              {{ item.displayCategory }}
             </span>
             <!-- <span v-show="item.type == 'line'" class="list-content-line"
               ><span class="text">{{ item.name }}</span></span