build v3.4.6

nmxiaowei · Jun 12, 2024 · 9cc63b1 · 9cc63b1
1 parent 6b422a0
commit 9cc63b1
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 42 deletions.
diff --git a/lib/avue.js b/lib/avue.js
diff --git a/lib/avue.min.js b/lib/avue.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@smallwei/avue",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "description": "A Magic Configurable Web Framework",
   "main": "lib/avue.min.js",
   "unpkg": "lib/avue.min.js",

diff --git a/packages/element-ui/crud/column/column-default.vue b/packages/element-ui/crud/column/column-default.vue
@@ -54,15 +54,30 @@ export default create({
   data () {
     return {
       config: config,
+      rowSortable: null,
+      columnSortable: null,
     }
   },
   components: {
     tableItemCard
   },
   mixins: [locale],
   inject: ["crud"],
+  watch: {
+    'crud.isSortable' (val) {
+      this.rowDrop(val)
+      this.columnDrop(val)
+    },
+    'crud.isRowSort' (val) {
+      this.rowDrop(val)
+    },
+    'crud.isColumnSort' (val) {
+      this.columnDrop(val)
+    }
+  },
   mounted () {
-    this.setSort()
+    this.rowDrop()
+    this.columnDrop()
   },
   methods: {
     indexMethod (index) {
@@ -73,33 +88,38 @@ export default create({
         (this.crud.page.pageSize || 10)
       );
     },
-    setSort () {
-      this.rowDrop()
-      this.columnDrop()
-    },
-    rowDrop () {
-      if (!this.crud.$refs.table.$el) return
-      const el = this.crud.$refs.table.$el.querySelectorAll(this.config.dropRowClass)[0]
-      this.crud.tableDrop('row', el, evt => {
-        const oldIndex = evt.oldIndex;
-        const newIndex = evt.newIndex;
-        const targetRow = this.crud.list.splice(oldIndex, 1)[0]
-        this.crud.list.splice(newIndex, 0, targetRow)
-        this.crud.$emit('sortable-change', oldIndex, newIndex)
-        this.crud.refreshTable(() => this.rowDrop())
-
+    rowDrop (flag) {
+      this.$nextTick(() => {
+        if (flag == false) {
+          this.rowSortable && this.rowSortable.destroy();
+          return
+        }
+        if (!this.crud.$refs.table.$el) return
+        const el = this.crud.$refs.table.$el.querySelectorAll(this.config.dropRowClass)[0]
+        this.rowSortable = this.crud.tableDrop('row', el, evt => {
+          const oldIndex = evt.oldIndex;
+          const newIndex = evt.newIndex;
+          const targetRow = this.crud.list.splice(oldIndex, 1)[0]
+          this.crud.list.splice(newIndex, 0, targetRow)
+          this.crud.$emit('sortable-change', oldIndex, newIndex)
+        })
       })
     },
-    columnDrop () {
-      if (!this.crud.$refs.table.$el) return
-      const el = this.crud.$refs.table.$el.querySelector(this.config.dropColClass);
-      let noIndexCount = 0;
-      ['selection', 'index', 'expand'].forEach(ele => {
-        if (this.crud.tableOption[ele]) { noIndexCount += 1 }
-      })
-      this.crud.tableDrop('column', el, evt => {
-        this.crud.headerSort(evt.oldIndex - noIndexCount, evt.newIndex - noIndexCount)
-        this.columnDrop()
+    columnDrop (flag) {
+      this.$nextTick(() => {
+        if (flag == false) {
+          this.columnSortable && this.columnSortable.destroy();
+          return
+        }
+        if (!this.crud.$refs.table.$el) return
+        const el = this.crud.$refs.table.$el.querySelector(this.config.dropColClass);
+        let noIndexCount = 0;
+        ['selection', 'index', 'expand'].forEach(ele => {
+          if (this.crud.tableOption[ele]) { noIndexCount += 1 }
+        })
+        this.columnSortable = this.crud.tableDrop('column', el, evt => {
+          this.crud.headerSort(evt.oldIndex - noIndexCount, evt.newIndex - noIndexCount)
+        })
       })
     },
   }

diff --git a/packages/element-ui/crud/dialog/dialog-column.vue b/packages/element-ui/crud/dialog/dialog-column.vue
@@ -83,7 +83,7 @@ export default create({
     },
     handleChange (prop) {
       if (['hide', 'filters'].includes(prop)) {
-        this.crud.refreshTable()
+        this.crud.doLayout()
       }
     },
     rowDrop () {
@@ -92,7 +92,6 @@ export default create({
         const oldIndex = evt.oldIndex;
         const newIndex = evt.newIndex;
         this.crud.headerSort(oldIndex, newIndex)
-        this.crud.refreshTable(() => this.rowDrop())
       })
     },
   }

diff --git a/packages/element-ui/crud/index.vue b/packages/element-ui/crud/index.vue
@@ -537,7 +537,7 @@ export default create({
         } else {
           this.tableHeight = this.tableOption.height;
         }
-        this.refreshTable()
+        this.doLayout();
       });
     },
     doLayout () {
@@ -605,7 +605,7 @@ export default create({
       let column = this.columnOption;
       let targetRow = column.splice(oldIndex, 1)[0]
       column.splice(newIndex, 0, targetRow)
-      this.refreshTable()
+      this.doLayout()
     },
     clearFilter (name) {
       this.$refs.table.clearFilter(name);
@@ -908,7 +908,7 @@ export default create({
         packages.logs("Sortable")
         return
       }
-      window.Sortable.create(el, {
+      return window.Sortable.create(el, {
         ghostClass: config.ghostClass,
         chosenClass: config.ghostClass,
         animation: 100,

diff --git a/packages/element-ui/select/index.vue b/packages/element-ui/select/index.vue
@@ -128,7 +128,10 @@ export default create({
   props: {
     virtualize: Boolean,
     emptyValues: Array,
-    valueOnClear: [String, Number, Boolean, Function],
+    valueOnClear: {
+      type: [String, Number, Boolean, Function],
+      default: undefined,
+    },
     loadingText: {
       type: String,
     },

diff --git a/src/version.js b/src/version.js
@@ -1 +1 @@
-export const version = '3.4.5'
+export const version = '3.4.6'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const version = '3.4.5'
		export const version = '3.4.6'