cnhis-design-vue 0.2.19-beta → 0.2.20-beta

package/package.json

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

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

@@ -353,6 +353,10 @@ export default create({
     },
     isScanMultiTable() {
       return this.columnConfig?.isScanMultiTable
+    },
+    tableNoSetting(){
+      let { noSetting } = this.getOtherConfigInit() || {};
+      return noSetting || this.showSettings?.hideSettingBtn == 1;
     }
   },
   watch: {
@@ -2864,10 +2868,6 @@ export default create({
       const config = tableOptions?.config || {};
       return config || undefined;
     },
-    tableNoSetting(){
-      let { noSetting } = this.getOtherConfigInit() || {};
-      return noSetting || this.showSettings?.hideSettingBtn == 1;
-    },
     // 单选
     radioOnChange(rowData = {}) {
       let { data, row, $rowIndex } = rowData;

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

@@ -100,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"
@@ -737,7 +737,7 @@ export default create({
       }
     },
     searchPlaceHolder() {
-      if (!this.useFieldList?.length) return "请输入关键字搜索";
+      if (!this.useFieldList?.length || this.showRelatedTreeBtn) return "请输入关键字搜索";
       let str = "";
       let strList = this.useFieldList
         ?.map(item => {
@@ -745,8 +745,11 @@ export default create({
           return item.formTitle || item.alias || item.title;
         })
         .filter(Boolean);
-      str = strList.join("/");
+      str = "输入" + strList.join("/");
       return str || "请输入关键字搜索";
+    },
+    showRelatedSearch() {
+      return this.showRelatedTreeBtn && this.isShowSetting('hideSearch')
     }
   },
   data() {
@@ -2083,10 +2086,11 @@ export default create({
     searchPlaceHolder: {
       immediate: true,
       handler(val) {
-        if (!val) return;
+        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;