cnhis-design-vue 2.1.111 → 2.1.113

package/package.json

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

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

@@ -2138,31 +2138,66 @@ export default create({
       field.searchFilterCONVERT = newValue;
       beforeSearchConvert = vexutils.clone(newValue, true);
     },
+    getOffsetLocation(element, cls, offsetKey){
+      let actualTop = element[offsetKey];
+      let current = element.offsetParent;
+      while (current && current.classList && !current.classList.contains(cls)) {
+        actualTop += current[offsetKey];
+        current = current.offsetParent;
+      }
+      return actualTop;
+    },
+    showFilterHandleLocationNew(target, tempWrapId){
+      let resTop = this.getOffsetLocation(target, tempWrapId, 'offsetTop');
+      let resLeft = this.getOffsetLocation(target, tempWrapId, 'offsetLeft');
+      let resWidth = target.offsetWidth;
+      let resHeight = target.offsetHeight;
+      return {resTop, resLeft, resWidth, resHeight}
+    },
     showFilter(field, columnName, event) {
       if (this.isInlineOperating) return false;
       let target = event.target;
+      if(!target) return false;
       const FILTER_BOX_WIDTH = 400;
       let fontSize = this.styleSetting?.fontSize ||  'small'
-      const scaleNum = fontSizeMap[fontSize]
-      const FILTER_BOX_TOP_OFFSET = filterTopOffsetMap[fontSize]
+      let scaleNum = fontSizeMap[fontSize]
+      let FILTER_BOX_TOP_OFFSET = filterTopOffsetMap[fontSize]
 
       let transformWrap = document.body;
       let { left: btnRectLeft, right: btnRectRight, top: btnRectTop, width: btnWidth } = target.getBoundingClientRect();
+      let transformWrapWidth = transformWrap.clientWidth;
+      let isOverLeft = btnRectLeft + FILTER_BOX_WIDTH > transformWrapWidth;
+      let right= 0;
+      // 位置不够左定位
+      if(isOverLeft) {
+        let transformWrapRight = transformWrap?.getBoundingClientRect().right || 0;
+        right = transformWrapRight - btnRectRight - btnWidth / 2
+      }
+      // 定位一直有问题, 最后还是相对于editTable定位, 不然弹框打开的列表会错位
+      // 如果是相对app的话, filter-wrap插入的位置可能会有问题, 因为通过micro打开的列表, app id是重复的
+      if(this.filterDomPortal && this.filterDomPortal != 'body' && this.filterDomPortal.includes("#")) {
+        let tempWrapId = this.filterDomPortal.slice(1, this.filterDomPortal.length);
+        scaleNum = 1;
+        FILTER_BOX_TOP_OFFSET = 0;
+        const {resTop = 0, resLeft = 0, resWidth = 0, resHeight = 0} = this.showFilterHandleLocationNew(target, tempWrapId)
+        btnRectTop = resTop + resHeight + 8;
+        btnWidth = resWidth;
+        btnRectLeft = resLeft;
+        btnRectRight = resWidth + btnRectLeft;
+        right = document.getElementById(tempWrapId).offsetWidth - btnWidth - resLeft;  
+      }
 
       field.left = 'initial';
       field.right = 'initial';
       field.top = 'initial';
-      let transformWrapWidth = transformWrap.clientWidth;
-      if (btnRectLeft + FILTER_BOX_WIDTH > transformWrapWidth) {
-        let transformWrapRight = transformWrap?.getBoundingClientRect().right || 0;
-        const right = transformWrapRight - btnRectRight - btnWidth / 2
+      
+      if (isOverLeft) {
         field.right = right / scaleNum  + 'px';
       } else {
         const left = btnRectLeft + (this.filterLeftOffset || 0)
         field.left = left / scaleNum + 'px';
       }
 
-
       const top = btnRectTop + FILTER_BOX_TOP_OFFSET + (this.filterTopOffset || 0)
       field.top = top / scaleNum + 'px';
 

package/packages/big-table/src/assets/style/table-global.less

@@ -1,6 +1,6 @@
 @import '../iconfont/iconfont.css';
 .big-table-filter-wrap {
-  position: fixed;
+  position: absolute;
   z-index: 99998;
   transform: translateX(-2%);
 

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

@@ -849,8 +849,13 @@ export default create({
     isCard() {
       return this.TypeOfDisplay === 'cardNew' && this.isBatchSelect == 1
     },
+    isHideSearchAndQuickSearch(){
+      let hideSearch = this.isShowSetting('hideSearch');
+      let hideQuickSearch = this.isShowSetting('hideQuickSearch');
+      return  !hideSearch && !hideQuickSearch;
+    },
     showApiSearch(){
-      return !this.outSearchFieldList?.length && this.isAvailableApiType
+      return !this.outSearchFieldList?.length && this.isAvailableApiType && !this.isHideSearchAndQuickSearch
     },
     // sql类型的列表, 且有筛选外显的时候不展示平铺列表的search
     relatedSqlOutSearch() {