cnhis-design-vue 0.2.35-beta → 0.2.36-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.35-beta",
+  "version": "0.2.36-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -93,4 +93,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

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

@@ -435,6 +435,11 @@ import create from '@/core/create';
 export default create({
   name: 'Classification',
   mixins: [filterApiFn],
+  provide() {
+    return {
+      root_isShowResetButton: this.isShowResetButton
+    };
+  },
   components: {
     // Search,
     [Icon.name]: Icon,
@@ -487,6 +492,7 @@ export default create({
     countCondition: { type: Number }, // 是否统计筛选分类，1统计筛选分类，0反之
     countTabCondition: { type: Number }, // 筛选页签是否进行数量统计，1统计筛选页签，0反之
     keyword: { type: String },
+    isShowResetButton: { type: Boolean, default: true }, // 是否显示  恢复默认设置 按钮
     fieldKeys: {
       type: Array,
       default: () => []

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

@@ -25,7 +25,7 @@
       </div>
     </slot>
     <template #footer v-if="type == 'search'">
-      <a-popconfirm class="btn-reset" title="确认要恢复系统默认设置吗？" ok-text="确认" cancel-text="取消" @confirm="popconfirm">
+      <a-popconfirm v-if="isShowResetButton" class="btn-reset" title="确认要恢复系统默认设置吗？" ok-text="确认" cancel-text="取消" @confirm="popconfirm">
         <a-button>恢复默认设置</a-button>
       </a-popconfirm>
 
@@ -144,6 +144,7 @@ import draggable from 'vuedraggable';
 import svgIcon from '@/component/svg/index.vue';
 export default {
   mixins: [filterApiFn],
+  inject: { isShowResetButton: { from: 'root_isShowResetButton' } },
   props: {
     visibleIn: Boolean,
     loading: Boolean,