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

package/packages/table-filter/src/classification/Classification-com.vue

@@ -1,9 +1,5 @@
 <template>
-  <div :class="[
-      'classification',
-      'classificationIndex-' + classificationIndex,
-      isPackUp ? 'upack-up-wrap' : ''
-    ]" :style="dynamicStyle">
+  <div :class="['classification', 'classificationIndex-' + classificationIndex, isPackUp ? 'upack-up-wrap' : '']" :style="dynamicStyle">
     <template v-if="classificationIndex === 0">
       <div
         class="tree-type classify-0"
@@ -61,13 +57,13 @@
                         class="child-item"
                         :class="{
                           selected: child.selected,
-                          disabled: (!child.digital && getCondiTionDigital)
+                          disabled: !child.digital && getCondiTionDigital
                         }"
                         @click="handleItemClick(child, cIndex, item, index)"
                       >
                         <span class="child-item-name">
                           {{ child.name | fmtChildName(child.isPublic) }}
-                          </span>
+                        </span>
                         <span class="digital-span" v-if="visibleDigital(child)"> ({{ child.digital || 0 }}) </span>
                         <a-icon type="check" v-if="child.selected" />
                       </span>
@@ -114,17 +110,17 @@
             borderBottom: conditionType === 'keyword' && hideClearConditionChange != 1 ? '1px solid #d5d5d5' : 0
           }"
         >
-        <template v-for="(item, index) in treeData.slice(1)">
-          <li class="tile-item"  :key="index" v-if="item.children && item.children.length > 0">
-            <template v-if="!item.children || item.children.length === 0">
-              <span class="child-item" style="padding-left: 17px;" :class="{ selected: item.selected }" @click="handleItemClick(item)"
-                >{{ item.name }}
-                {{ item.digital }}
-                <span class="digital-span" v-if="visibleDigital(item)"> ({{ item.digital || 0 }}) </span>
-              </span>
-            </template>
-            <template v-else>
-              <!-- <text-over-tooltip
+          <template v-for="(item, index) in treeData.slice(1)">
+            <li class="tile-item" :key="index" v-if="item.children && item.children.length > 0">
+              <template v-if="!item.children || item.children.length === 0">
+                <span class="child-item" style="padding-left: 17px;" :class="{ selected: item.selected }" @click="handleItemClick(item)"
+                  >{{ item.name }}
+                  {{ item.digital }}
+                  <span class="digital-span" v-if="visibleDigital(item)"> ({{ item.digital || 0 }}) </span>
+                </span>
+              </template>
+              <template v-else>
+                <!-- <text-over-tooltip
                 refName="digitalTitle"
                 class="parent digitalTitle"
                 :content="
@@ -135,25 +131,25 @@
                 "
                 v-if="item.children.filter(i => i.isShow).length !== 0"
               ></text-over-tooltip> -->
-              <span class="parent ellips">{{ item.name }}</span>
-              <div class="children">
-                <template v-for="(child, cIndex) in item.children">
-                  <span
-                    v-if="child.isShow"
-                    :key="cIndex"
-                    class="child-item"
-                    :class="{
-                      selected: child.selected,
-                      disabled: (!child.digital && getCondiTionDigital)
-                    }"
-                    @click="handleItemClick(child, cIndex, item, index)"
-                    >{{ child.name | fmtChildName(child.isPublic) }}
-                    <span class="digital-span" v-if="visibleDigital(child)"> ({{ child.digital || 0 }}) </span>
-                  </span>
-                </template>
-              </div>
-            </template>
-          </li>
+                <span class="parent ellips">{{ item.name }}</span>
+                <div class="children">
+                  <template v-for="(child, cIndex) in item.children">
+                    <span
+                      v-if="child.isShow"
+                      :key="cIndex"
+                      class="child-item"
+                      :class="{
+                        selected: child.selected,
+                        disabled: !child.digital && getCondiTionDigital
+                      }"
+                      @click="handleItemClick(child, cIndex, item, index)"
+                      >{{ child.name | fmtChildName(child.isPublic) }}
+                      <span class="digital-span" v-if="visibleDigital(child)"> ({{ child.digital || 0 }}) </span>
+                    </span>
+                  </template>
+                </div>
+              </template>
+            </li>
           </template>
         </ul>
         <div class="selected-list" v-if="conditionType === 'keyword' && hideClearConditionChange != 1">
@@ -234,7 +230,7 @@
                           class="child-item"
                           :class="{
                             selected: child.selected,
-                            disabled: (!child.digital && getCondiTionDigital)
+                            disabled: !child.digital && getCondiTionDigital
                           }"
                           @click="handleItemClick(child, cIndex, item, index)"
                         >
@@ -318,12 +314,12 @@
                   v-for="(child, cIndex) in item.children.filter(i => i.isShow)"
                   :key="child.sid"
                   :value="child.sid"
-                  :label="child.name + (countCondition == 1 && (visibleDigital(child)) ? ' (' + (child.digital || 0) + ')' : '')"
+                  :label="child.name + (countCondition == 1 && visibleDigital(child) ? ' (' + (child.digital || 0) + ')' : '')"
                   :child="child"
                   :cIndex="cIndex"
                   :index="index"
                   :item="item"
-                  :disabled="(!child.digital && getCondiTionDigital)"
+                  :disabled="!child.digital && getCondiTionDigital"
                   class="group-select-option"
                   @click="(value, option) => conditionSid.indexOf(child.sid) !== -1 && handleItemClick(child, cIndex, item, index)"
                 >
@@ -369,20 +365,14 @@
           <!-- @click="handleItemClick({ sid: 'all_data', name: '全部数据', digital: allObj.digital })" -->
           <span class="all-data" :class="{ selected: conditionSid.indexOf('all_data') !== -1 }">
             {{ showTitleName }}
-            <template v-if="allObj.digital || allObj.digital === 0">
-              ({{ allObj.digital || 0 }})
-            </template>
+            <template v-if="allObj.digital || allObj.digital === 0"> ({{ allObj.digital || 0 }}) </template>
           </span>
           <div class="right-setting">
             <span style="margin-right: 30px;" class="upack-up-btn" @click="isPackUp = !isPackUp">
-              {{ isPackUp ? "展开" : "收起" }}
+              {{ isPackUp ? '展开' : '收起' }}
               <a-icon style="color:#2d7aff" :type="isPackUp ? 'down' : 'up'" />
             </span>
-            <span
-              @click="handleModeChange"
-              style="margin-right: 30px;"
-              v-if="hideConditionChangeBtn != 1"
-            >
+            <span @click="handleModeChange" style="margin-right: 30px;" v-if="hideConditionChangeBtn != 1">
               <a-icon type="swap" />
               <!-- {{ $t("1.1.5.2") }} -->
               切换
@@ -440,7 +430,7 @@ import setClassification from '../components/search-modal/set-classification';
 import { filterApiFn } from '~/table-filter/src/mixins/mixins';
 import { Icon, Tooltip, Select } from 'ant-design-vue';
 import svgIcon from '@/component/svg/index.vue';
-import searchProfessionalModel from "./search-professional-model.vue";
+import searchProfessionalModel from './search-professional-model.vue';
 import create from '@/core/create';
 export default create({
   name: 'Classification',
@@ -477,7 +467,7 @@ export default create({
       searchDefName: '', // no use ?
       classifyModal: false, // 筛选分类的弹窗
 
-      showTitleName: "全部数据",
+      showTitleName: '全部数据',
       isPackUp: false // 是否收起 目前只用于 classificationIndex = 4 （专业模式）
     };
   },
@@ -579,8 +569,8 @@ export default create({
     },
 
     // 这两个配置都要请求 筛选分类统计接口
-    getCondiTionDigital(){
-      return this.countCondition === 1 || this.countTabCondition === 1
+    getCondiTionDigital() {
+      return this.countCondition === 1 || this.countTabCondition === 1;
     },
 
     showIconBtn() {
@@ -805,7 +795,7 @@ export default create({
                 condition.selected = true;
                 map.open = true;
               }
-              if(condition.isShow){
+              if (condition.isShow) {
                 map.children.push(condition);
               }
             }
@@ -1021,8 +1011,8 @@ export default create({
     },
     /*  */
     visibleDigital(item) {
-      if (this.countCondition !== 1) return false
-      return item.digital || item.digital === 0
+      if (this.countCondition !== 1) return false;
+      return item.digital || item.digital === 0;
     },
 
     changeShowName(name) {
@@ -1032,10 +1022,10 @@ export default create({
     /**
      * 清空专业模式设置的条件
      */
-    handleClearClassConObj(...arg){
+    handleClearClassConObj(...arg) {
       let fn = this?.$refs?.professional?.handleClearConObj;
-      if(typeof fn === 'function'){
-        fn(...arg)
+      if (typeof fn === 'function') {
+        fn(...arg);
       }
     }
   },

package/packages/table-filter/src/components/search-modal/set-classification.vue

@@ -7,6 +7,7 @@
       @handleOk="oneSave"
       @close="oneCancel"
       @changeData="changeData"
+      @resetPopconfirm="e => $emit('resetPopconfirm', e)"
       :edit="edit"
       :copy="copy"
       :delItem="delItem"
@@ -43,6 +44,7 @@
 import { filterApiFn } from '~/table-filter/src/mixins/mixins';
 import TableModal from '../table-modal/TableModal';
 import SearchFilter from '../search-filter/SearchFilter';
+import { Button } from 'ant-design-vue';
 export default {
   mixins: [filterApiFn],
   name: 'set-classification',
@@ -89,7 +91,8 @@ export default {
   },
   components: {
     TableModal,
-    SearchFilter
+    SearchFilter,
+    [Button.name]: Button
   },
   watch: {
     searchDefName() {

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

@@ -25,6 +25,10 @@
       </div>
     </slot>
     <template #footer v-if="type == 'search'">
+      <a-popconfirm class="btn-reset" title="确认要恢复系统默认设置吗？" ok-text="确认" cancel-text="取消" @confirm="popconfirm">
+        <a-button>恢复默认设置</a-button>
+      </a-popconfirm>
+
       <a-button @click="close">取消</a-button>
       <slot name="add"></slot>
       <a-button type="primary" @click="handleOk">保存</a-button>
@@ -358,6 +362,9 @@ export default {
       let docHeight = document.body.clientHeight;
       this.modalWidth = this.modalWidth === '860px' ? `100%` : '860px';
       this.modalHeight = this.modalHeight === '496px' ? `${docHeight - 108}px` : '496px';
+    },
+    popconfirm(e) {
+      this.$emit('resetPopconfirm', e);
     }
   }
 };
@@ -449,4 +456,7 @@ export default {
     margin-left: 8px;
   }
 }
+.btn-reset {
+  float: left;
+}
 </style>

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>
@@ -1701,6 +1701,7 @@ export default create({
     },
 
     handleLabelUpfold(v) {
+      console.log('触发---isUnfold');
       v.isUnfold = !v.isUnfold;
     },
 
@@ -1790,6 +1791,7 @@ export default create({
         line-height: 32px;
         text-align: right;
         padding-left: 12px;
+        color: #000;
       }
       .quick-item-col {
         padding: 0 12px;
@@ -1880,11 +1882,11 @@ export default create({
 
   // 标签
   .label-attr-container {
-    div.label-container {
-      // overflow: hidden;
-      // width: 380px;
-      // height: 84px;
-      // flex: none;
+    .edit-label {
+      color: #000000;
+      font-size: 14px;
+      line-height: 32px;
+      padding-left: 0;;
     }
     .label-container-height {
       overflow: hidden;
@@ -1896,11 +1898,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;
       }
     }
   }