doway-coms 1.4.79 → 1.4.81

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -684,9 +684,9 @@ export default {
       default: true,
     },
     defaultSort: {
-      type: Object,
+      type: Array,
       default: function () {
-        return {};
+        return [];
       },
     },
     showFilter: {
@@ -873,6 +873,19 @@ export default {
         this.internalColumns[i].slots.header = this.columns[i].field;
       }
     }
+
+    // 初始化排序和筛选
+    if (this.sortRemote) {
+        let data = []
+        this.defaultSort.forEach(x => {
+            data.push([x.field, x.order])
+        })
+        this.$emit("sortModify", data);
+
+        //设置筛选过滤条件
+        this.setFilterExpression(this.internalColumns);
+    }
+
     if (this.showSeq) {
       this.internalColumns.push(
         // {
@@ -1477,6 +1490,9 @@ export default {
         colInfo["filters"] = [
           { data: { bindingValues: [], displayValues: [] }, checked: false },
         ];
+        if (originCol.filterExpression) {
+            colInfo["filters"] = originCol.filterExpression
+        }
         colInfo["filterMultiple"] = false;
         // colInfo['filterRender'] ={name: filterTypeName,showFilterFooter:false}
         customSlot["filter"] = filterTypeName;
@@ -1626,19 +1642,25 @@ export default {
         dataCode: this.dataCode,
         fields: [],
       };
-      let tableCollectColumn =
-        this.$refs.baseGrid.getTableColumn().collectColumn;
-      let baseAdjustGridViewColumn =
-        this.$refs.baseAdjustGridView.adjustUserDefineColumns;
-      // XEUtils.arrayEach(this.userDefineColumns, (loopCol) => {
-      XEUtils.arrayEach(baseAdjustGridViewColumn, (loopCol) => {
+      let tableCollectColumn = this.$refs.baseGrid.getTableColumn().collectColumn;
+      const baseAdjustGridColumn = this.$refs.baseAdjustGridView.getTableColumn();
+
+      XEUtils.arrayEach(baseAdjustGridColumn, (loopCol) => {
         let tempData = {
           field: loopCol.field,
           sort: postData.fields.length + 1,
           hidden: loopCol.visible !== true,
           width: loopCol.width,
-          // width: colWidth,
+          extraInfo:{}
         };
+        if (loopCol.filters[0].data.bindingValues.length) {
+            loopCol.filters[0].checked = true;
+            tempData.extraInfo.filterExpression = loopCol.filters
+        }
+        if (loopCol.order) {
+            tempData.extraInfo.order = loopCol.order
+        }
+
         postData.fields.push(tempData);
         let tempCol = XEUtils.findTree(
           tableCollectColumn,
@@ -1663,7 +1685,22 @@ export default {
             (p) => p.params.tempCustomSort
           );
           vm.$refs.baseGrid.reloadColumn(tableCollectColumn);
-          //清空store缓存
+          XEUtils.arrayEach(tableCollectColumn, (loopCol) => {
+              const find = XEUtils.find(baseAdjustGridColumn, item => loopCol.field === item.field)
+              if (find) {
+                  loopCol.order = find.order
+                  loopCol.filters = find.filters
+              }
+          })
+          //设置筛选过滤条件
+          this.setFilterExpression();
+          let data = []
+          this.$refs.baseGrid.getSortColumns().forEach(x=> {
+              data.push([x.field,x.order])
+          })
+          this.$emit("sortChange", data);
+
+            //清空store缓存
           vm.$store.commit(
             "SET_MODULE_VIEW_INFO",{
                 moduleCode:this.moduleCode,
@@ -1672,7 +1709,7 @@ export default {
           );
           vm.showGridColumnUserDefine = false;
         })
-        .catch(() => {});
+        .catch((err) => console.error(err));
     },
     setCustomGridParentSort(tableCollectColumn, parentId, sort) {
       let tempParentCol = XEUtils.findTree(
@@ -1710,7 +1747,7 @@ export default {
       );
       this.userDefineColumns = XEUtils.filter(
         tableCollectColumn,
-        (p) => !p.children && p.params.disableUserVisible !== true
+        (p) => !p.children && p.params.disableUserVisible !== true && p.field !== 'operation'
       );
       this.showGridColumnUserDefine = true;
     },
@@ -2358,10 +2395,10 @@ export default {
       }
       return currentVisible
     },
-    setFilterExpression() {
+    setFilterExpression(columns = this.$refs.baseGrid.getTableColumn().collectColumn) {
       XEUtils.clear(this.filterExpression);
       XEUtils.clear(this.filterStr);
-      XEUtils.arrayEach(this.internalColumns, (loopColInfo) => {
+      XEUtils.arrayEach(columns, (loopColInfo) => {
         if (!loopColInfo.filters) {
           return;
         }

package/packages/BaseGridAdjust/src/index.vue

@@ -5,11 +5,20 @@
       v-bind="adjustGridOptions"
       :loading="adjustGridLoading"
       @resizable-change="resizableChange"
+      :filter-config="{
+        remote: true
+      }"
+      :sort-config="{
+        multiple: true,
+        remote: true,
+        chronological: true,
+      }"
       column-key
     >
       <template #empty>
         <div>拖拽调整字段位置或者宽度</div>
       </template>
+<!--      是否显示字段  -->
       <template #checkbox="{ column }">
         <a-checkbox
           v-model="column.params.show"
@@ -17,6 +26,176 @@
         ></a-checkbox>
         {{ column.title }}
       </template>
+
+        <!-- 筛选过滤 -->
+        <template #text_filter="scope">
+            <div class="interceptor-class">
+                <div
+                        :class="scope.column.field + '_filter_' + $index"
+                        v-for="(loopFilterValue, $index) in scope.column.filters[0].data
+              .displayValues"
+                        :key="$index"
+                >
+                    <a-input allowClear v-model="loopFilterValue.value[0]" @keyup.enter.native="filterConfirm(scope.column)" />
+                </div>
+                <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
+                <a-button @click="filterConfirm(scope.column)">确认</a-button>
+            </div>
+        </template>
+        <template #customCell_filter="scope">
+            <div class="interceptor-class">
+                <div
+                        :class="scope.column.field + '_filter_' + $index"
+                        v-for="(loopFilterValue, $index) in scope.column.filters[0].data
+              .displayValues"
+                        :key="$index"
+                >
+                    <a-input allowClear v-model="loopFilterValue.value[0]" @keyup.enter.native="filterConfirm(scope.column)" />
+                </div>
+                <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
+                <a-button @click="filterConfirm(scope.column)">确认</a-button>
+            </div>
+        </template>
+        <template #pulldown_filter="scope">
+            <div class="interceptor-class">
+                <div
+                        :class="scope.column.field + '_filter_' + $index"
+                        v-for="(loopFilterValue, $index) in scope.column.filters[0].data
+              .displayValues"
+                        :key="$index"
+                >
+                    <a-input allowClear v-model="loopFilterValue.value[0]" @keyup.enter.native="filterConfirm(scope.column)" />
+                </div>
+                <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
+                <a-button @click="filterConfirm(scope.column)">确认</a-button>
+            </div>
+        </template>
+        <template #number_filter="scope">
+            <div class="interceptor-class">
+                <div
+                        :class="scope.column.field + '_filter_' + $index"
+                        v-for="(loopFilterValue, $index) in scope.column.filters[0].data
+              .displayValues"
+                        :key="$index"
+                >
+                    <a-input-number
+                            :precision="0"
+                            size="small"
+                            v-model="loopFilterValue.value[0]"
+                            @keyup.enter.native="filterConfirm(scope.column)"
+                    />~
+                    <a-input-number
+                            :precision="0"
+                            size="small"
+                            v-model="loopFilterValue.value[1]"
+                            @keyup.enter.native="filterConfirm(scope.column)"
+                    />
+                </div>
+                <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
+                <a-button @click="filterConfirm(scope.column)">确认</a-button>
+            </div>
+        </template>
+        <template #select_filter="scope">
+            <div class="interceptor-class">
+                <a-checkbox-group
+                        v-model="scope.column.filters[0].data.displayValues"
+                        :style="{
+                    display: 'flex',
+                    flexWrap: 'wrap',
+                    justifyContent: 'left',
+                    alignItems: 'center',
+                    maxHeight: '150px',
+                    overflow: 'auto',
+                    maxWidth: '100px'
+                  }"
+                        @keyup.enter.native="filterConfirm(scope.column)"
+                >
+                    <br />
+                    <a-checkbox
+                            v-for="loopSource in scope.column.params.dataSource"
+                            :key="loopSource.value"
+                            :value="loopSource.value"
+                            style="margin: 5px 0;"
+                    >{{ loopSource.caption }}
+                    </a-checkbox>
+                </a-checkbox-group>
+                <!--          <a-select-->
+                <!--              v-model="scope.column.filters[0].data.displayValues"-->
+                <!--              mode="multiple"-->
+                <!--              allowClear-->
+                <!--              style="width: 300px;"-->
+                <!--              placeholder="筛选条件"-->
+                <!--              showArrow-->
+                <!--          >-->
+                <!--            <a-select-option-->
+                <!--                v-for="loopSource in scope.column.params.dataSource"-->
+                <!--                :key="loopSource.value"-->
+                <!--                :value="loopSource.value"-->
+                <!--            >{{ loopSource.caption }}</a-select-option-->
+                <!--            >-->
+                <!--          </a-select>-->
+                <br>
+                <a-button @click="filterConfirm(scope.column)">确认</a-button>
+            </div>
+        </template>
+        <template #datetime_filter="scope">
+            <div class="interceptor-class">
+                <div
+                        :class="scope.column.field + '_filter_' + $index"
+                        v-for="(loopFilterValue, $index) in scope.column.filters[0].data
+              .displayValues"
+                        :key="$index"
+                >
+                    <a-date-picker
+                            valueFormat="YYYY-MM-DD HH:mm:ss"
+                            format="YYYY-MM-DD HH:mm:ss"
+                            :show-time="{
+                defaultValue: moment(
+                  '2000-01-01 00:00:00',
+                  'YYYY-MM-DD HH:mm:ss'
+                ),
+              }"
+                            placeholder="开始时间"
+                            v-model="loopFilterValue.value[0]"
+                            @keyup.enter.native="filterConfirm(scope.column)"
+                    />
+                    <a-date-picker
+                            valueFormat="YYYY-MM-DD HH:mm:ss"
+                            format="YYYY-MM-DD HH:mm:ss"
+                            :show-time="{
+                defaultValue: moment(
+                  '2000-01-01 23:59:59',
+                  'YYYY-MM-DD HH:mm:ss'
+                ),
+              }"
+                            placeholder="结束时间"
+                            v-model="loopFilterValue.value[1]"
+                            @keyup.enter.native="filterConfirm(scope.column)"
+                    />
+                </div>
+                <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
+                <a-button @click="filterConfirm(scope.column)">确认</a-button>
+            </div>
+        </template>
+        <template #date_filter="scope">
+            <div class="interceptor-class">
+                <div
+                        :class="scope.column.field + '_filter_' + $index"
+                        v-for="(loopFilterValue, $index) in scope.column.filters[0].data
+              .displayValues"
+                        :key="$index"
+                >
+                    <a-range-picker v-model:value="loopFilterValue.value"
+                                    valueFormat="YYYY-MM-DD"
+                                    format="YYYY-MM-DD"
+                                    @keyup.enter.native="filterConfirm(scope.column)"
+
+                    />
+                </div>
+                <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
+                <a-button @click="filterConfirm(scope.column)">确认</a-button>
+            </div>
+        </template>
     </vxe-grid>
   </div>
 </template>
@@ -24,38 +203,51 @@
 import Sortable from 'sortablejs'
 import VXETable from 'vxe-table'
 export default {
-  props: ['userDefineColumns'],
+  props:{
+      userDefineColumns: {
+          type: Array,
+          default: function () {
+              return [];
+          },
+      },
+  },
   created() {
-    this.adjustUserDefineColumns = JSON.parse(
-      JSON.stringify(this.userDefineColumns)
-    )
+    this.adjustUserDefineColumns = this.userDefineColumns
+
     this.adjustUserDefineColumns.forEach(item => {
-      if (item.visible) {
-        this.$set(item, 'show', true)
-      } else {
-        this.$set(item, 'show', false)
-      }
+        if (item.visible) {
+            this.$set(item, 'show', true)
+        } else {
+            this.$set(item, 'show', false)
+        }
     })
     this.adjustGridOptions.columns = []
     this.adjustUserDefineColumns.forEach(item => {
-      if(item.field === 'operation'){
-        return
-      }
-      this.adjustGridOptions.columns.push({
-        field: item.field,
-        title: item.title,
-        slots: {
-          header: 'checkbox'
-        },
-        params: {
-          show: item.show
-        },
-        width: item.width
-      })
+        if (item.field === 'operation') {
+            return
+        }
+        this.adjustGridOptions.columns.push({
+            field: item.field,
+            title: item.title,
+            slots: {
+                header: 'checkbox',
+                filter: item.slots.filter
+            },
+            params: {
+                show: item.show
+            },
+            width: item.width,
+            filters: item.filters,
+            sortable: true,
+        })
     })
   },
   mounted() {
-    this.columnDrop(this.adjustUserDefineColumns)
+      this.$refs.adjustGrid.getTableColumn().collectColumn.forEach(item => {
+          const find = XEUtils.find(this.adjustUserDefineColumns, innerItem => item.field === innerItem.field)
+          item.order = find.order
+      })
+      this.columnDrop(this.adjustUserDefineColumns)
   },
   beforeDestroy() {
     if (this.sortable) {
@@ -84,11 +276,8 @@ export default {
 
   methods: {
     changeCheckbox(val) {
-      this.adjustUserDefineColumns.forEach(item => {
-        if (item.field === val.field) {
-          item.visible = val.params.show
-        }
-      })
+      const find = XEUtils.find(this.$refs.adjustGrid.getTableColumn().collectColumn,item=>item.field ===val.field)
+      find.visible = val.params.show
     },
     resizableChange($rowIndex) {
       this.adjustUserDefineColumns.forEach(item => {
@@ -146,7 +335,34 @@ export default {
         )
         this.adjustGridLoading = false
       })
-    }
+    },
+    filterAddExp(colInfo) {
+        colInfo.filters[0].data.displayValues.push({
+            value: [null, null],
+        });
+    },
+    filterConfirm(colInfo) {
+        let col = this.adjustUserDefineColumns.find(x => x.field === colInfo.property)
+        this.$set(col.filters[0].data, 'bindingValues', [])
+        colInfo.filters[0].data.bindingValues = [];
+        XEUtils.arrayEach(colInfo.filters[0].data.displayValues, (item) => {
+            if (colInfo.params.controlType === controlType.select) {
+                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]) {
+                    colInfo.filters[0].data.bindingValues.push(item);
+                    this.$set(col.filters[0].data, 'bindingValues', colInfo.filters[0].data.bindingValues)
+                }
+            }
+        });
+        colInfo.filters[0].checked =
+            colInfo.filters[0].data.bindingValues.length > 0;
+        this.$refs.adjustGrid.closeFilter()
+    },
+    getTableColumn() {
+        return this.$refs.adjustGrid.getTableColumn().collectColumn
+    },
   }
 }
 </script>