yshop1.7发布,后台升級eladmin2.4(前端,后台权限,代码生成器等重构),修复商品分类等一些问题

src/views/tools/storage/qiniu/index.vue

@@ -1,38 +1,41 @@
 <template>
   <div class="app-container" style="padding: 8px;">
     <!--表单组件-->
-    <eForm ref="form"/>
+    <eForm ref="form" />
     <!-- 工具栏 -->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.value" clearable placeholder="输入文件名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 上传 -->
-      <div style="display: inline-block;margin: 0px 2px;">
-        <el-button class="filter-item" size="mini" type="primary" icon="el-icon-upload" @click="dialog = true">上传文件</el-button>
-      </div>
-      <!-- 同步 -->
-      <el-button :icon="icon" class="filter-item" size="mini" type="warning" @click="synchronize">同步数据</el-button>
-      <!-- 配置 -->
-      <div style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          class="filter-item"
-          size="mini"
-          type="success"
-          icon="el-icon-s-tools"
-          @click="doConfig">七牛配置</el-button>
-      </div>
-      <!-- 多选删除 -->
-      <div style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          :loading="delAllLoading"
-          :disabled="data.length === 0 || $refs.table.selection.length === 0"
-          class="filter-item"
-          size="mini"
-          type="danger"
-          icon="el-icon-delete"
-          @click="open">删除</el-button>
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.key" clearable size="small" placeholder="输入文件名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+        <el-date-picker
+          v-model="query.c"
+          :default-time="['00:00:00','23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+        <rrOperation :crud="crud" />
       </div>
+      <crudOperation :permission="permission">
+        <template slot="left">
+          <!-- 上传 -->
+          <el-button class="filter-item" size="mini" type="primary" icon="el-icon-upload" @click="dialog = true">上传</el-button>
+          <!-- 同步 -->
+          <el-button :icon="icon" class="filter-item" size="mini" type="warning" @click="synchronize">同步</el-button>
+          <!-- 配置 -->
+          <el-button
+            class="filter-item"
+            size="mini"
+            type="success"
+            icon="el-icon-s-tools"
+            @click="doConfig"
+          >配置</el-button>
+        </template>
+      </crudOperation>
       <!-- 文件上传 -->
       <el-dialog :visible.sync="dialog" :close-on-click-modal="false" append-to-body width="500px" @close="doSubmit">
         <el-upload
@@ -43,7 +46,8 @@
           :headers="headers"
           :action="qiNiuUploadApi"
           class="upload-demo"
-          multiple>
+          multiple
+        >
           <el-button size="small" type="primary">点击上传</el-button>
           <div slot="tip" style="display: block;" class="el-upload__tip">请勿上传违法文件，且文件不超过15M</div>
         </el-upload>
@@ -52,66 +56,53 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table v-loading="loading" ref="table" :data="data" size="small" style="width: 100%;">
-        <el-table-column type="selection" width="55"/>
-        <el-table-column :show-overflow-tooltip="true" label="文件名">
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="columns.visible('name')" prop="name" :show-overflow-tooltip="true" label="文件名">
           <template slot-scope="scope">
-            <a href="JavaScript:;" class="el-link el-link--primary" target="_blank" type="primary" @click="download(scope.row.id)">{{ scope.row.key }}</a>
+            <a href="JavaScript:" class="el-link el-link--primary" target="_blank" type="primary" @click="download(scope.row.id)">{{ scope.row.key }}</a>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="suffix" label="文件类型"/>
-        <el-table-column prop="bucket" label="空间名称"/>
-        <el-table-column prop="size" label="文件大小"/>
-        <el-table-column prop="type" label="空间类型"/>
-        <el-table-column width="180px" prop="updateTime" label="创建日期">
+        <el-table-column v-if="columns.visible('suffix')" :show-overflow-tooltip="true" prop="suffix" label="文件类型" @selection-change="crud.selectionChangeHandler" />
+        <el-table-column v-if="columns.visible('bucket')" prop="bucket" label="空间名称" />
+        <el-table-column v-if="columns.visible('size')" prop="size" label="文件大小" />
+        <el-table-column v-if="columns.visible('type')" prop="type" label="空间类型" />
+        <el-table-column v-if="columns.visible('updateTime')" prop="updateTime" label="创建日期">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.updateTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="100px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <el-popover
-              :ref="scope.row.id"
-              placement="top"
-              width="180">
-              <p>确定删除本条数据吗？</p>
-              <div style="text-align: right; margin: 0">
-                <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-                <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
-              </div>
-              <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
-            </el-popover>
-          </template>
-        </el-table-column>
       </el-table>
       <!--分页组件-->
-      <el-pagination
-        :total="total"
-        :current-page="page + 1"
-        style="margin-top: 8px;"
-        layout="total, prev, pager, next, sizes"
-        @size-change="sizeChange"
-        @current-change="pageChange"/>
+      <pagination />
     </div>
   </div>
 </template>
 
 <script>
-import initData from '@/mixins/initData'
-import { del, download, sync, delAll } from '@/api/qiniu'
-import { parseTime } from '@/utils/index'
+import crudQiNiu from '@/api/tools/qiniu'
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
 import eForm from './form'
+import CRUD, { presenter, header, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '七牛云文件', url: 'api/qiNiuContent', crudMethod: { ...crudQiNiu }})
 export default {
-  components: { eForm },
-  mixins: [initData],
+  components: { eForm, pagination, crudOperation, rrOperation },
+  mixins: [presenter(defaultCrud), header(), crud()],
   data() {
     return {
-      icon: 'el-icon-refresh', delAllLoading: false,
-      url: '', headers: { 'Authorization': 'Bearer ' + getToken() }, dialog: false,
-      dialogImageUrl: '', dialogVisible: false, fileList: [], files: [],
-      newWin: null, downloadLoading: false, delLoading: false
+      permission: {
+        del: ['admin', 'storage:del']
+      },
+      title: '文件', dialog: false,
+      icon: 'el-icon-refresh',
+      url: '', headers: { 'Authorization': getToken() },
+      dialogImageUrl: '', dialogVisible: false, fileList: [], files: [], newWin: null
     }
   },
   computed: {
@@ -130,51 +121,17 @@ export default {
       }
     }
   },
+  created() {
+    this.crud.optShow.add = false
+    this.crud.optShow.edit = false
+  },
   methods: {
-    parseTime,
-    beforeInit() {
-      this.url = 'api/qiNiuContent'
-      const sort = 'id,desc'
-      const query = this.query
-      const value = query.value
-      this.params = { page: this.page, size: this.size, sort: sort }
-      if (value) { this.params['key'] = value }
-      return true
-    },
+    // 七牛云配置
     doConfig() {
       const _this = this.$refs.form
       _this.init()
       _this.dialog = true
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
-      })
-    },
-    download(id) {
-      this.downloadLoading = true
-      // 先打开一个空的新窗口，再请求
-      this.newWin = window.open()
-      download(id).then(res => {
-        this.downloadLoading = false
-        this.url = res.url
-      }).catch(err => {
-        this.downloadLoading = false
-        console.log(err.response.data.message)
-      })
-    },
     handleSuccess(response, file, fileList) {
       const uid = file.uid
       const id = response.id
@@ -183,7 +140,7 @@ export default {
     handleBeforeRemove(file, fileList) {
       for (let i = 0; i < this.files.length; i++) {
         if (this.files[i].uid === file.uid) {
-          del(this.files[i].id).then(res => {})
+          crudQiNiu.del([this.files[i].id]).then(res => {})
           return true
         }
       }
@@ -198,65 +155,42 @@ export default {
       this.dialogVisible = false
       this.dialogImageUrl = ''
       this.dialog = false
-      this.init()
+      this.crud.toQuery()
     },
     // 监听上传失败
     handleError(e, file, fileList) {
       const msg = JSON.parse(e.message)
-      this.$notify({
-        title: msg.message,
-        type: 'error',
-        duration: 2500
+      this.crud.notify(msg.message, CRUD.NOTIFICATION_TYPE.ERROR)
+    },
+    // 下载文件
+    download(id) {
+      this.downloadLoading = true
+      // 先打开一个空的新窗口，再请求
+      this.newWin = window.open()
+      crudQiNiu.download(id).then(res => {
+        this.downloadLoading = false
+        this.url = res.url
+      }).catch(err => {
+        this.downloadLoading = false
+        console.log(err.response.data.message)
       })
     },
+    // 同步数据
     synchronize() {
       this.icon = 'el-icon-loading'
-      this.buttonName = '同步中'
-      sync().then(res => {
+      crudQiNiu.sync().then(res => {
         this.icon = 'el-icon-refresh'
-        this.buttonName = '同步数据'
         this.$message({
           showClose: true,
           message: '数据同步成功',
           type: 'success',
           duration: 1500
         })
-        this.toQuery()
+        this.crud.toQuery()
       }).catch(err => {
         this.icon = 'el-icon-refresh'
-        this.buttonName = '同步数据'
         console.log(err.response.data.message)
       })
-    },
-    doDelete() {
-      this.delAllLoading = true
-      const data = this.$refs.table.selection
-      const ids = []
-      for (let i = 0; i < data.length; i++) {
-        ids.push(data[i].id)
-      }
-      delAll(ids).then(res => {
-        this.delAllLoading = false
-        this.dleChangePage(ids.length)
-        this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delAllLoading = false
-        console.log(err.response.data.message)
-      })
-    },
-    open() {
-      this.$confirm('你确定删除选中的数据吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.doDelete()
-      })
     }
   }
 }