doway-coms 1.1.75 → 1.1.76

package/dist/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "doway-coms",
+  "version": "1.0.0",
+  "description": "",
+  "main": "doway-coms.common.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}

package/package.json

@@ -1,50 +1,50 @@
-{
-  "name": "doway-coms",
-  "version": "1.1.75",
-  "description": "doway组件库",
-  "author": "dowaysoft",
-  "main": "packages/index.js",
-  "license": "MIT",
-  "scripts": {
-    "dev": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint",
-    "lib": "vue-cli-service build --target lib --name doway-coms --dest lib packages/index.js",
-    "build:test": "vue-cli-service build --report"
-  },
-  
-  "dependencies": {
-    "ant-design-vue": "1.7.8",
-    "vue": "2.7.14",
-    "vuex": "3.6.2",
-    "vue-router": "3.6.5",
-    "vee-validate": "3.4.14",
-    "vxe-table": "3.5.4",
-    "xe-utils": "3.5.4",
-    "axios": "0.18.0",
-    "js-cookie": "2.2.0",
-    "xe-clipboard":"1.10.2"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.2.0",
-    "@vue/cli-plugin-eslint": "~4.2.0",
-    "@vue/cli-plugin-vuex": "~4.2.0",
-    "@vue/cli-service": "~4.2.0",
-    "babel-eslint": "^10.0.3",
-    "babel-plugin-component": "^1.1.1",
-    "babel-plugin-import": "^1.13.6",
-    "eslint": "^6.7.2",
-    "eslint-plugin-vue": "^6.1.2",
-    "extract-text-webpack-plugin": "^3.0.2",
-    "less-loader": "^6.0.0",
-    "node-sass": "8.0.0",
-    "sass-loader": "10.4.1",
-    "vue-template-compiler": "^2.6.11"
-  },
-  "bundleDependencies":false,
-  "repository": {
-    "type": "git",
-    "url": "https://www.npmjs.com/package/doway-coms.git"
-  },
-  "keywords": []
-}
+{
+  "name": "doway-coms",
+  "version": "1.1.76",
+  "description": "doway组件库",
+  "author": "dowaysoft",
+  "main": "packages/index.js",
+  "license": "MIT",
+  "scripts": {
+    "dev": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint",
+    "lib": "vue-cli-service build --target lib --name doway-coms --dest lib packages/index.js",
+    "build:test": "vue-cli-service build --report"
+  },
+  
+  "dependencies": {
+    "ant-design-vue": "1.7.8",
+    "vue": "2.7.14",
+    "vuex": "3.6.2",
+    "vue-router": "3.6.5",
+    "vee-validate": "3.4.14",
+    "vxe-table": "3.5.4",
+    "xe-utils": "3.5.4",
+    "axios": "0.18.0",
+    "js-cookie": "2.2.0",
+    "xe-clipboard":"1.10.2"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "~4.2.0",
+    "@vue/cli-plugin-eslint": "~4.2.0",
+    "@vue/cli-plugin-vuex": "~4.2.0",
+    "@vue/cli-service": "~4.2.0",
+    "babel-eslint": "^10.0.3",
+    "babel-plugin-component": "^1.1.1",
+    "babel-plugin-import": "^1.13.6",
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^6.1.2",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "less-loader": "^6.0.0",
+    "node-sass": "8.0.0",
+    "sass-loader": "10.4.1",
+    "vue-template-compiler": "^2.6.11"
+  },
+  "bundleDependencies":false,
+  "repository": {
+    "type": "git",
+    "url": "https://www.npmjs.com/package/doway-coms.git"
+  },
+  "keywords": []
+}

package/packages/BaseGridAdjust/index.js

@@ -0,0 +1,10 @@
+// 导入组件，组件必须声明 name
+import BaseGridAdjust from './src/index.vue';
+import VXETable from 'vxe-table'
+// 为组件提供 install 安装方法，供按需引入
+BaseGridAdjust.install = function(Vue) {
+    Vue.use(VXETable)
+    Vue.component(BaseGridAdjust.name, BaseGridAdjust);
+};
+// 默认导出组件
+export default BaseGridAdjust;

package/packages/BaseGridAdjust/src/index.vue

@@ -0,0 +1,158 @@
+<template>
+  <div>
+    <vxe-grid
+      ref="adjustGrid"
+      v-bind="adjustGridOptions"
+      :loading="adjustGridLoading"
+      @resizable-change="resizableChange"
+      column-key
+    >
+      <template #empty>
+        <div>拖拽调整字段位置或者宽度</div>
+      </template>
+      <template #checkbox="{ column }">
+        <a-checkbox
+          v-model:checked="column.params.show"
+          @change="changeCheckbox(column)"
+        ></a-checkbox>
+        {{ column.title }}
+      </template>
+    </vxe-grid>
+  </div>
+</template>
+<script>
+import Sortable from 'sortablejs'
+import VXETable from 'vxe-table'
+export default {
+  props: ['userDefineColumns'],
+  created() {
+    this.adjustUserDefineColumns = JSON.parse(
+      JSON.stringify(this.userDefineColumns)
+    )
+    this.adjustUserDefineColumns.forEach(item => {
+      if (item.visible) {
+        this.$set(item, 'show', true)
+      } else {
+        this.$set(item, 'show', false)
+      }
+    })
+    this.adjustGridOptions.columns = []
+    this.adjustUserDefineColumns.forEach(item => {
+      this.adjustGridOptions.columns.push({
+        field: item.field,
+        title: item.title,
+        slots: {
+          header: 'checkbox'
+        },
+        params: {
+          show: item.show
+        },
+        width: item.width
+      })
+    })
+  },
+  mounted() {
+    this.columnDrop(this.adjustUserDefineColumns)
+  },
+  beforeDestroy() {
+    if (this.sortable) {
+      this.sortable.destroy()
+    }
+  },
+  data() {
+    return {
+      adjustGridLoading: false,
+      adjustUserDefineColumns: null,
+      adjustGridOptions: {
+        border: true,
+        class: 'sortable-column-demo',
+        columnConfig: {
+          useKey: true,
+          resizable: true
+        },
+        scrollX: {
+          enabled: false
+        },
+        columns: [],
+        data: []
+      }
+    }
+  },
+
+  methods: {
+    changeCheckbox(val) {
+      this.adjustUserDefineColumns.forEach(item => {
+        if (item.field === val.field) {
+          item.visible = val.params.show
+        }
+      })
+    },
+    resizableChange($rowIndex) {
+      this.adjustUserDefineColumns.forEach(item => {
+        if (item.field === $rowIndex.column.field) {
+          item.width = $rowIndex.column.resizeWidth
+        }
+      })
+    },
+    columnDrop() {
+      this.$nextTick(() => {
+        this.adjustGridLoading = true
+        const $table = this.$refs.adjustGrid
+        this.sortable = Sortable.create(
+          $table.$el.querySelector(
+            '.body--wrapper>.vxe-table--header .vxe-header--row'
+          ),
+          {
+            handle: '.vxe-header--column',
+            onEnd: ({ item, newIndex, oldIndex }) => {
+              const { fullColumn, tableColumn } = $table.getTableColumn()
+              const targetThElem = item
+              const wrapperElem = targetThElem.parentNode
+              const newColumn = fullColumn[newIndex]
+              if (newColumn.fixed) {
+                const oldThElem = wrapperElem.children[oldIndex]
+                // 错误的移动
+                if (newIndex > oldIndex) {
+                  wrapperElem.insertBefore(targetThElem, oldThElem)
+                } else {
+                  wrapperElem.insertBefore(
+                    targetThElem,
+                    oldThElem ? oldThElem.nextElementSibling : oldThElem
+                  )
+                }
+                VXETable.modal.message({
+                  content: '固定列不允许拖动，即将还原操作！',
+                  status: 'error'
+                })
+                return
+              }
+              // 获取列索引 columnIndex > fullColumn
+              const oldColumnIndex = $table.getColumnIndex(
+                tableColumn[oldIndex]
+              )
+              const newColumnIndex = $table.getColumnIndex(
+                tableColumn[newIndex]
+              )
+              // 移动到目标列
+              const currRow = fullColumn.splice(oldColumnIndex, 1)[0]
+              fullColumn.splice(newColumnIndex, 0, currRow)
+              $table.loadColumn(fullColumn)
+              this.adjustUserDefineColumns = fullColumn
+            }
+          }
+        )
+        this.adjustGridLoading = false
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.sortable-column-demo .vxe-header--row .vxe-header--column.sortable-ghost,
+.sortable-column-demo .vxe-header--row .vxe-header--column.sortable-chosen {
+  background-color: #dfecfb;
+}
+.sortable-column-demo .vxe-header--row .vxe-header--column.col--fixed {
+  cursor: no-drop;
+}
+</style>

package/packages/BasePulldown/src/index.vue

@@ -386,14 +386,14 @@
       },
       routeLinkClick() {
         //首先需要判断是否有权限
-        // let treeModule = XEUtils.findTree(
-        //   this.$store.getters.addRouters,
-        //   item => item.name === this.route.name
-        // )
-        // if (!treeModule) {
-        //   this.$antwarning('没有权限')
-        //   return
-        // }
+        let treeModule = XEUtils.findTree(
+          this.$store.getters.addRouters,
+          item => item.name === this.route.name
+        )
+        if (!treeModule) {
+          this.$antwarning('没有权限')
+          return
+        }
         this.$router.pushRoute({
           name: this.route.name,
           query: { id: this.row[this.route.field] }