doway-coms 1.6.84 → 1.6.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.6.84",
+  "version": "1.6.86",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/SeqSetting.vue

@@ -9,7 +9,7 @@
       ><a-icon slot="prefix" type="search" />
       </a-input>
     </div>
-    <div :style="{ height: height-160+'px', overflow:'auto' }" class="field-content">
+    <div :style="{ height: height-250+'px', overflow:'auto' }" class="field-content">
        <div class="field-card">
           <div class="card-tltle">显示字段</div>
           <div ref="dragForm">
@@ -20,10 +20,10 @@
               :data-id="item.currentKey"
               class="drag-row show-sort"
             >
-              <div style="margin-right: 7px;">
+              <div style="margin-right: 7px;"  class="move">
                 <img src="../../styles/icon/drag.svg" alt="" style="width: 20px" >
               </div>
-              <div>{{ item.title }}</div>
+              <div style="flex: 1;" class="move">{{ item.title }}</div>
               <div style="margin-left: auto;"><a-switch v-model="item.visible" @change="onCheckboxChange(item)" size="small"/></div>
             </div>
           </div>
@@ -115,8 +115,12 @@ export default {
     this.setOptions()
   },
   methods: {
+    updateColumns(currentColumns) {
+      this.adjustUserDefineColumns = JSON.parse(JSON.stringify(currentColumns))
+      this.setColumnsOptions()
+    },
     setColumnsOptions() {
-      this.adjustUserDefineColumns = this.userDefineColumns;
+      this.adjustUserDefineColumns = this.userDefineColumns
       // 设置唯一标识，用于保存时找到字段并重新排序
       this.adjustUserDefineColumns.forEach((x, index)=> x.currentKey = index + x.field)
       this.columns = [];
@@ -146,6 +150,7 @@ export default {
         vm.options = {
           group:'sortableDrag',
           animation: 200,
+          handle:".move",
           sort: true,
           filter: ".not-sort",  // not-sort用来控制筛选时不可拖拽
           forceFallback: true,  // 禁用html5原生拖拽行为，使得可以同时使用拖拽及鼠标滚轴
@@ -207,14 +212,6 @@ export default {
       })
       saveUserModuleDataFieldApi(postData)
         .then(res => {
-          // 更改columns序号
-          // vm.columns.forEach(column => {
-          //   let tempObject = postData.fields.find(x => x.field == column.field)
-          //   if (tempObject) {
-          //     column.sort = tempObject.sort
-          //   }
-          // })
-          // console.log('1',vm.columns);
           // 返回表格组件触发更新
           vm.$emit('saveSeqConfig',postData, res.content)
         })
@@ -242,8 +239,8 @@ export default {
   background-color: #f7f7f7;
 }
 .drag-row {
+  cursor: pointer;
   padding-right: 5px;
-  font-size: 15px;
   height: 36px;
   display: flex;
   align-items: center;
@@ -266,6 +263,7 @@ export default {
 }
 .field-card {
   margin: 10px 10px 0px 0px;
+  font-size: 15px;
   .card-tltle {
     margin-bottom: 10px;
   }

package/packages/BaseGrid/src/index.vue

@@ -1,7 +1,13 @@
 <template>
-  <div :style="{ height: height - 40 + 'px' }">
-    <div class="head-tag" v-if="tagData.length">
-      <a-tag closable v-for="item in tagData" :key="item.column.field" @close="tagClosable(item.column)">
+  <div :style="{ height: height-tagHeight-10 + 'px' }">
+    <div class="head-tag" v-if="tagData.length" ref="tagView">
+      <a-tag
+        closable
+        v-for="item in tagData"
+        :key="item.column.field"
+        @close="tagClosable(item.column)"
+        @change="tagChange"
+      >
         <span>{{ tagContent(item) }} </span>
       </a-tag>
       <span style="color:#006cd9;cursor:pointer;font-size: 14px;" @click="clearFilter">清空</span>
@@ -90,6 +96,7 @@
             trigger="click"
             placement="rightTop"
             overlayClassName='popover-content-card'
+            style="top:40px"
           >
             <template slot="title">
               <div style="font-size: 17px;">表头设置</div>
@@ -512,7 +519,7 @@
         </div>
       </template>
     </VxeGrid>
-    <VxeModal
+    <!-- <VxeModal
       v-model="showGridColumnUserDefine"
       title="表格布局设置"
       width="70%"
@@ -537,7 +544,7 @@
           确认
         </a-button>
       </template>
-    </VxeModal>
+    </VxeModal> -->
   </div>
 </template>
   <script>
@@ -682,6 +689,7 @@ export default {
       filterExpression: [],
       filterStr: [],
       // 表格上方显示全部筛选条件
+      tagHeight: 0,
       tagData: [],
       // 默认配置条件-存储初始字段参数
       defaultPostData: {},
@@ -744,7 +752,7 @@ export default {
   props: {
     isSeqPopover: {
       type: Boolean,
-      default: false,
+      default: true,
     },
     showOverFlow: {
       type: Boolean,
@@ -927,7 +935,16 @@ export default {
   beforeCreate() {
     this.simpleImage = Empty.PRESENTED_IMAGE_SIMPLE;
   },
-
+  watch: {
+    tagData: {
+      handler: function(newVal) {
+        this.$nextTick(()=>{
+          this.tagChange()
+        })
+      },
+      deep: true
+    }
+  },
   created() {
 
     try{
@@ -1035,6 +1052,10 @@ export default {
     })
   },
   methods: {
+    tagChange() {
+      if (!this.$refs.tagView) return
+      this.tagHeight = this.$refs.tagView.offsetHeight
+    },
     // 取消当前字段筛选
     tagClosable(colInfo) {
       colInfo.filters[0].data.bindingValues = [];
@@ -1819,7 +1840,6 @@ export default {
         ).item;
         tempCol.visible = loopCol.params.show;
         tempCol.width = loopCol.width;
-        // tempCol.width = colWidth;
         //设置顺序
         tempCol.params["tempCustomSort"] = tempData.sort;
         this.setCustomGridParentSort(
@@ -1866,6 +1886,8 @@ export default {
     },
     // 确认保存自定义表格信息，更新表格
     saveSeqConfig(emitColumns, resData) {
+      // 深拷贝一份参数用来初始化后赋值筛选排序
+      let seqColumns = JSON.parse(JSON.stringify(emitColumns))
       // 获取表格字段数据
       let tableCollectColumn = this.$refs.baseGrid.getTableColumn().collectColumn;
       // 表格排序信息更新
@@ -1873,6 +1895,7 @@ export default {
         const find = XEUtils.find(emitColumns.fields, item => loopCol.field === item.field)
         if (find) {
           loopCol.params.sort = find.sort
+          loopCol.visible = !find.hidden
         }
       })
       //设置表格顺序
@@ -1882,8 +1905,24 @@ export default {
       );
       // 更新表格
       this.$refs.baseGrid.reloadColumn(tableCollectColumn)
-      this.userDefineColumns = this.tableCollectColumn
-      // this.$refs.baseAdjustGridView.setColumnsOptions()
+      tableCollectColumn.forEach((loopCol) => {
+        const find = XEUtils.find(seqColumns.fields, item => loopCol.field === item.field)
+        if (!find) {
+          return
+        }
+        find.extraInfo.filterExpression ?
+          loopCol.filters = find.extraInfo.filterExpression :
+          loopCol.filters[0].data = {
+            bindingValues: [],
+            displayValues: [],
+            displayValueSearchText:''
+          }
+        find.extraInfo.order ?
+          loopCol.order = find.extraInfo.order :
+          loopCol.order = null
+        loopCol.visible = !find.hidden
+      })
+      this.$refs.baseAdjustGridView.updateColumns(tableCollectColumn)
       //清空store缓存
       this.$store.commit(
         "SET_MODULE_VIEW_INFO",{
@@ -2562,7 +2601,7 @@ export default {
           colInfo.filters[0].data.bindingValues.push(item);
           this.$set(col.filters[0].data,'bindingValues',colInfo.filters[0].data.bindingValues)
         } else {
-          if (item.value[0] || item.value[1]) {
+          if (item.value[0] || item.value[1]||item.value[0]==0||item.value[1]==0) {
             colInfo.filters[0].data.bindingValues.push(item);
             this.$set(col.filters[0].data,'bindingValues',colInfo.filters[0].data.bindingValues)
           }
@@ -2783,20 +2822,14 @@ export default {
     saveTableHeight() {
       let vm = this
       // 去除操作列和序号、多选框列
-      let showColumns = vm.$refs.baseGrid.getTableColumn().collectColumn
-        .filter(x=>
-          (x.field !== "operation") &&
-          (x.field !== undefined) &&
-          x.visible
+      let resizeColumns = JSON.parse(JSON.stringify(
+        vm.$refs.baseGrid.getTableColumn().collectColumn
+          .filter(x=>
+            (x.field !== "operation") &&
+            (x.field !== undefined)
+          )
         )
-      let notShowColumns = vm.$refs.baseGrid.getTableColumn().collectColumn
-        .filter(x=>
-          (x.field !== "operation") &&
-          (x.field !== undefined) &&
-          !x.visible
-        )
-      let resizeColumns = []
-      resizeColumns.push(...showColumns, ...notShowColumns)
+      )
       // 保存参数
       let postData = {
         moduleCode: vm.moduleCode,
@@ -2804,24 +2837,37 @@ export default {
         fields: [],
       }
       resizeColumns.forEach((item, index)=> {
+        item.width = item.resizeWidth ? item.resizeWidth : item.width
+        // 获取初始字段筛选条件，用于避免赋值宽度将普通筛选条件加入默认筛选
+        let tempObject = vm.defaultPostData.fields.find(x => x.field == item.field)
         let tempData = {
           field: item.field,
           sort: index + 1,
           hidden: !item.visible,
-          width: item.resizeWidth,
+          width: item.width,
           extraInfo:{}
         }
-        if (item.filters && item.filters[0].data.bindingValues.length) {
+        if (
+          tempObject.extraInfo.filterExpression &&
+          tempObject.extraInfo.filterExpression[0].data.bindingValues.length
+        ) {
           item.filters[0].checked = true;
-          tempData.extraInfo.filterExpression = item.filters
+          tempData.extraInfo.filterExpression = tempObject.extraInfo.filterExpression
         }
-        if (item.order) {
-          tempData.extraInfo.order = item.order
+        if (tempObject.extraInfo.order) {
+          tempData.extraInfo.order = tempObject.extraInfo.order
         }
         postData.fields.push(tempData)
       })
       saveUserModuleDataFieldApi(postData)
-        .then(res => {})
+        .then(res => {
+          // 更新默认参数
+          vm.defaultPostData = postData
+          // 更新拖拽弹窗数据，避免宽度改变失效
+          if (vm.$refs.baseAdjustGridView) {
+            vm.$refs.baseAdjustGridView.updateColumns(resizeColumns)
+          }
+        })
         .catch((err) => {
           console.debug(err)
         })
@@ -2829,9 +2875,12 @@ export default {
     // 头部筛选条件展示内容
     tagContent(info) {
       let displayValues = info.column.filters[0].data.displayValues
+      // 筛选条件
+      let returnOperator = null
       // 筛选条件重组数组
       let curretnArr = []
       if(info.column.params.controlType === controlType.number) {
+        returnOperator = '范围'
         // 数字范围选择
         // 去除空值
         displayValues = displayValues.filter(f=>f.value[0])
@@ -2848,6 +2897,7 @@ export default {
       ) {
         // 日期范围选择
         // 去除空值
+        returnOperator = '范围'
         displayValues = displayValues.filter(f=>f.value[0])
         displayValues.forEach(x=> {
           let tempDate = []
@@ -2857,16 +2907,19 @@ export default {
         })
       } else if (info.column.params.controlType === controlType.select) {
         // 下拉
+        returnOperator = '包含'
         displayValues.forEach(x=> {
           let findValue = info.column.params.dataSource.find(f=>f.value == x)
           curretnArr.push(findValue?findValue.caption : x)
         })
       } else if (info.column.params.controlType === controlType.checkbox) {
+        returnOperator = '包含'
         // 单选
         displayValues.forEach(x=> curretnArr.push(x?'是':'否'))
       } else {
         // 其余字符串
         // 去除空值
+        returnOperator = '包含'
         displayValues = displayValues.filter(f=>f.value[0])
         displayValues.forEach(display=> {
           curretnArr.push(display.value[0])
@@ -2878,7 +2931,7 @@ export default {
       // 筛选值数组拼接为字符串
       let curretnValue = '"' + curretnArr.join(' , ') + '"'
       // 三项内容拼接-字段名、筛选条件(组件暂时只有包含)、字段编码
-      returnField = title + ' ' + '包含' + ' ' + curretnValue
+      returnField = title + ' ' + returnOperator + ' ' + curretnValue
       return returnField
     },
     // 保存默认配置条件
@@ -2912,8 +2965,7 @@ export default {
         .then(res => {
           // 更新默认参数
           this.defaultPostData = postData
-          console.debug('2',this.defaultPostData);
-          this.$refs.baseGrid.closeFilter();
+          this.$refs.baseGrid.closeFilter()
           // 初始标签
           this.tagData = JSON.parse(JSON.stringify(this.$refs.baseGrid.getCheckedFilters()))
           // 设置表格顺序
@@ -2921,20 +2973,21 @@ export default {
             tableCollectColumn,
             (p) => p.params.tempCustomSort
           );
-          //设置筛选过滤条件
+          //设置筛选过滤条件及排序，用于保存后回调刷新
           this.setFilterExpression();
           let data = []
           this.$refs.baseGrid.getSortColumns().forEach(x=> {
               data.push([x.field,x.order])
           })
           this.$emit("sortChange", data);
+          
           //清空store缓存
           this.$store.commit(
             "SET_MODULE_VIEW_INFO",{
               moduleCode:this.moduleCode,
               info:res.content
             }
-          );
+          )
         })
         .catch((err) => {
           console.debug(err)
@@ -2985,6 +3038,7 @@ export default {
 }
 .popover-content-card .ant-popover-inner {
   padding-left: 12px;
+  top: 40px;
 }
 .popover-content-card .ant-popover-inner-content {
   padding: 0px;
@@ -3105,10 +3159,6 @@ export default {
       border-radius: 0;
       border: 0;
       background-color: #f6f7f9;
-      
-      // :hover {
-      //   background-color: #e9ebf0 ;
-      // }
        .anticon-close {
         font-size: 14px;
       }

package/packages/BasePulldown/src/index.vue

@@ -552,6 +552,8 @@ export default {
         this.searchData();
       } else {
         this.$refs.pulldownRef.hidePanel();
+        // 点击输入框隐藏panel时清空输入框
+        this.currentValue = ''
       }
     },
     /**