Merge remote-tracking branch 'origin/dev' into dev

backend/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dataease-server</artifactId>
         <groupId>io.dataease</groupId>
-        <version>1.12.0</version>
+        <version>1.13.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -214,17 +214,17 @@
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-interface</artifactId>
-            <version>1.12.0</version>
+            <version>1.13.0</version>
         </dependency>
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-view</artifactId>
-            <version>1.12.0</version>
+            <version>1.13.0</version>
         </dependency>
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-datasource</artifactId>
-            <version>1.12.0</version>
+            <version>1.13.0</version>
         </dependency>
         <!-- kettle及数据源依赖 -->
         <dependency>

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataease",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "description": "dataease front",
   "private": true,
   "scripts": {

frontend/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>dataease-server</artifactId>
     <groupId>io.dataease</groupId>
-    <version>1.12.0</version>
+    <version>1.13.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -61,5 +61,5 @@
       </plugin>
     </plugins>
   </build>
-  
+
 </project>

frontend/src/components/DragItem/index.vue

@@ -132,6 +132,13 @@ export default {
       return this.index > 0
     }
   },
+  watch: {
+    index(val, old) {
+      if (val !== old) {
+        this.sortChange('none')
+      }
+    }
+  },
   mounted() {
   },
   created() {

frontend/src/views/panel/filter/filterDialog.vue

@@ -181,7 +181,7 @@
 
     <de-main-container class="ms-main-container">
       <div v-if="currentElement.options && currentElement.options.attrs">
-        <filter-head :element="currentElement" :all-fields="allFields" :widget="widget" />
+        <filter-head :element="currentElement" :table-fields-map="tableFieldsMap" :widget="widget" />
 
         <filter-control :element="currentElement" :widget="widget" :control-attrs="myAttrs" :child-views="childViews" />
 
@@ -297,7 +297,7 @@ export default {
         datasetParams: []
       },
       currentElement: null,
-      allFields: [],
+      tableFieldsMap: {},
       tempTreeDatas: null,
       showTips: false
     }
@@ -632,7 +632,7 @@ export default {
     loadField(tableId) {
       fieldListWithPermission(tableId).then(res => {
         let datas = res.data
-        this.allFields = JSON.parse(JSON.stringify(datas))
+        this.$set(this.tableFieldsMap, tableId, JSON.parse(JSON.stringify(datas)))
         if (this.widget && this.widget.filterFieldMethod) {
           datas = this.widget.filterFieldMethod(datas)
         }
@@ -643,7 +643,7 @@ export default {
     comLoadField(tableId) {
       fieldListWithPermission(tableId).then(res => {
         let datas = res.data
-        this.allFields = JSON.parse(JSON.stringify(datas))
+        this.$set(this.tableFieldsMap, tableId, JSON.parse(JSON.stringify(datas)))
         if (this.widget && this.widget.filterFieldMethod) {
           datas = this.widget.filterFieldMethod(datas)
         }

frontend/src/views/panel/filter/filterMain/FilterHead.vue

@@ -18,8 +18,7 @@
               >
 
                 <v-flex v-for="(item,index) in element.options.attrs.dragItems" :key="item.id">
-
-                  <drag-item :key="item.id" :is-sort-widget="isSortWidget" :item="item" :index="index" :sort="element.options.attrs.sort" :all-fields="index ? [] : allFields" @closeItem="closeItem" @sort-change="sortChange" />
+                  <drag-item :key="item.id" :is-sort-widget="isSortWidget" :item="item" :index="index" :sort="element.options.attrs.sort" :all-fields="index ? [] : fieldsMap[item.tableId]" @closeItem="closeItem" @sort-change="sortChange" />
                 </v-flex>
 
                 <span solt="footer">{{ $t('panel.drag_here') }}</span>
@@ -46,9 +45,9 @@ export default {
       type: Object,
       default: () => {}
     },
-    allFields: {
-      type: Array,
-      default: () => []
+    tableFieldsMap: {
+      type: Object,
+      default: () => {}
     },
     widget: {
       type: Object,
@@ -63,6 +62,9 @@ export default {
   computed: {
     isSortWidget() {
       return this.widget && this.widget.isSortWidget && this.widget.isSortWidget()
+    },
+    fieldsMap() {
+      return JSON.parse(JSON.stringify(this.tableFieldsMap))
     }
   },
 
@@ -74,7 +76,6 @@ export default {
   },
   methods: {
     onMove(e, originalEvent) {
-      // this.moveId = e.draggedContext.element.id
       return true
     },
     end2(e) {},
@@ -88,7 +89,6 @@ export default {
     },
     sortChange(param) {
       this.element.options.attrs.sort = param
-      // this.$emit('sort-change', param)
     }
   }
 }

mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataease-mobile",
-  "version": "1.11.1",
+  "version": "1.13.0",
   "private": true,
   "scripts": {
     "serve": "npm run dev:h5",

mobile/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dataease-server</artifactId>
         <groupId>io.dataease</groupId>
-        <version>1.12.0</version>
+        <version>1.13.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.dataease</groupId>
     <artifactId>dataease-server</artifactId>
-    <version>1.12.0</version>
+    <version>1.13.0</version>
     <packaging>pom</packaging>
 
     <parent>