From 2bc97e315864144926cd757aafd92a4875785d33 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Sat, 21 Dec 2019 15:44:47 +0800
Subject: [PATCH] update

---
 src/api/tools/localStorage.js           |  11 +-
 src/api/tools/qiniu.js                  |  13 +-
 src/views/tools/aliPay/config.vue       |   4 +-
 src/views/tools/storage/index.vue       |   4 +-
 src/views/tools/storage/local/index.vue | 168 ++++++++++--------------
 src/views/tools/storage/qiniu/form.vue  |   2 +-
 src/views/tools/storage/qiniu/index.vue | 159 +++++++++-------------
 7 files changed, 141 insertions(+), 220 deletions(-)

diff --git a/src/api/tools/localStorage.js b/src/api/tools/localStorage.js
index c938de3..63ebe2b 100644
--- a/src/api/tools/localStorage.js
+++ b/src/api/tools/localStorage.js
@@ -8,14 +8,7 @@ export function add(data) {
   })
 }
 
-export function del(id) {
-  return request({
-    url: 'api/localStorage/' + id,
-    method: 'delete'
-  })
-}
-
-export function delAll(ids) {
+export function del(ids) {
   return request({
     url: 'api/localStorage/',
     method: 'delete',
@@ -31,4 +24,4 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del, delAll }
+export default { add, edit, del }
diff --git a/src/api/tools/qiniu.js b/src/api/tools/qiniu.js
index 7b94205..6d56771 100644
--- a/src/api/tools/qiniu.js
+++ b/src/api/tools/qiniu.js
@@ -15,13 +15,6 @@ export function update(data) {
   })
 }
 
-export function del(id) {
-  return request({
-    url: 'api/qiNiuContent/' + id,
-    method: 'delete'
-  })
-}
-
 export function download(id) {
   return request({
     url: 'api/qiNiuContent/download/' + id,
@@ -36,12 +29,12 @@ export function sync() {
   })
 }
 
-export function delAll(ids) {
+export function del(ids) {
   return request({
-    url: 'api/qiNiuContent/',
+    url: 'api/qiNiuContent',
     method: 'delete',
     data: ids
   })
 }
 
-export default { del, download, sync, delAll }
+export default { del, download, sync }
diff --git a/src/views/tools/aliPay/config.vue b/src/views/tools/aliPay/config.vue
index 751e766..8e01f39 100644
--- a/src/views/tools/aliPay/config.vue
+++ b/src/views/tools/aliPay/config.vue
@@ -1,7 +1,7 @@
 <template>
   <el-form ref="form" :model="form" :rules="rules" style="margin-top: 6px;" size="small" label-width="100px">
     <el-form-item label="appID" prop="appID">
-      <el-input v-model="form.appID" style="width: 40%" />
+      <el-input v-model="form.appId" style="width: 40%" />
       <span style="color: #C0C0C0;margin-left: 10px;">应用APPID,收款账号既是APPID对应支付宝账号</span>
     </el-form-item>
     <el-form-item label="商家账号" prop="sysServiceProviderId">
@@ -37,7 +37,7 @@ export default {
   data() {
     return {
       loading: false,
-      form: { appID: '', sysServiceProviderId: '', privateKey: '', publicKey: '', returnUrl: '', notifyUrl: '' },
+      form: { appId: '', sysServiceProviderId: '', privateKey: '', publicKey: '', returnUrl: '', notifyUrl: '' },
       rules: {
         appID: [
           { required: true, message: '请输入appID', trigger: 'blur' }
diff --git a/src/views/tools/storage/index.vue b/src/views/tools/storage/index.vue
index b528bf4..5bb3fc0 100644
--- a/src/views/tools/storage/index.vue
+++ b/src/views/tools/storage/index.vue
@@ -23,9 +23,9 @@ export default {
   methods: {
     tabClick(name) {
       if (this.activeName === 'first') {
-        this.$refs.local.init()
+        this.$refs.local.crud.toQuery()
       } else {
-        this.$refs.qiNiu.init()
+        this.$refs.qiNiu.crud.toQuery()
       }
     }
   }
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue
index 4302cc5..95e0269 100644
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -2,60 +2,44 @@
   <div class="app-container" style="padding: 8px;">
     <!--工具栏-->
     <div class="head-container">
-      <!-- 搜索 -->
-      <el-input v-model="query.blurry" clearable size="small" placeholder="输入内容模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-date-picker
-        v-model="query.createTime"
-        :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="结束日期"
-      />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 新增 -->
-      <el-button
-        v-permission="['admin','storage:add']"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-upload"
-        @click="showAddFormDialog"
-      >文件上传
-      </el-button>
-      <!-- 多选删除 -->
-      <el-button
-        v-permission="['admin','storage:del']"
-        :loading="delAllLoading"
-        :disabled="data.length === 0 || $refs.table.selection.length === 0"
-        class="filter-item"
-        size="mini"
-        type="danger"
-        icon="el-icon-delete"
-        @click="beforeDelAllMethod"
-      >删除
-      </el-button>
-      <!-- 导出 -->
-      <el-button
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="downloadMethod"
-      >导出</el-button>
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.blurry" clearable size="small" placeholder="输入内容模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-date-picker
+          v-model="query.createTime"
+          :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">
+        <!-- 新增 -->
+        <el-button
+          slot="left"
+          v-permission="['admin','storage:add']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-upload"
+          @click="crud.toAdd"
+        >上传
+        </el-button>
+      </crudOperation>
     </div>
     <!--表单组件-->
-    <el-dialog append-to-body :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="getFormTitle()" width="500px">
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.add ? '文件上传' : '编辑文件'" width="500px">
       <el-form ref="form" :model="form" size="small" label-width="80px">
         <el-form-item label="文件名">
           <el-input v-model="form.name" style="width: 370px;" />
         </el-form-item>
         <!--   上传文件   -->
-        <el-form-item v-if="isAdd" label="上传">
+        <el-form-item v-if="crud.status.add" label="上传">
           <el-upload
             ref="upload"
             :limit="1"
@@ -72,14 +56,15 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="submitMethod">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button v-if="crud.status.add" :loading="loading" type="primary" @click="upload">确认</el-button>
+        <el-button v-else :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table ref="table" v-loading="loading" :data="data" style="width: 100%;">
+    <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 prop="name" width="150px" label="文件名">
+      <el-table-column v-if="columns.visible('name')" prop="name" label="文件名">
         <template slot-scope="scope">
           <el-popover
             :content="'file/' + scope.row.type + '/' + scope.row.realName"
@@ -100,7 +85,7 @@
           </el-popover>
         </template>
       </el-table-column>
-      <el-table-column prop="path" label="预览图">
+      <el-table-column v-if="columns.visible('path')" prop="path" label="预览图">
         <template slot-scope="{row}">
           <el-image
             :src=" baseApi + '/file/' + row.type + '/' + row.realName"
@@ -115,61 +100,45 @@
           </el-image>
         </template>
       </el-table-column>
-      <el-table-column prop="suffix" label="文件类型" />
-      <el-table-column prop="type" label="类别" />
-      <el-table-column prop="size" label="大小" />
-      <el-table-column prop="operate" label="操作人" />
-      <el-table-column prop="createTime" label="创建日期">
+      <el-table-column v-if="columns.visible('suffix')" prop="suffix" label="文件类型" />
+      <el-table-column v-if="columns.visible('type')" prop="type" label="类别" />
+      <el-table-column v-if="columns.visible('size')" prop="size" label="大小" />
+      <el-table-column v-if="columns.visible('operate')" prop="operate" label="操作人" />
+      <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建日期">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','storage:edit','storage:del'])" label="操作" width="150px" align="center">
-        <template slot-scope="scope">
-          <el-button v-permission="['admin','storage:edit']" size="mini" type="primary" icon="el-icon-edit" @click="showEditFormDialog(scope.row)" />
-          <el-popover
-            :ref="scope.row.id"
-            v-permission="['admin','storage:del']"
-            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="delMethod(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>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
-import crud from '@/mixins/crud'
 import crudFile from '@/api/tools/localStorage'
+import CRUD, { presenter, header, form, 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/localStorage', crudMethod: { ...crudFile }})
+const defaultForm = { id: null, name: '' }
 export default {
-  mixins: [crud],
+  components: { pagination, crudOperation, rrOperation },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
   data() {
     return {
-      title: '文件',
-      crudMethod: { ...crudFile },
       delAllLoading: false,
+      loading: false,
       headers: { 'Authorization': getToken() },
-      form: { id: null, name: null }
+      permission: {
+        edit: ['admin', 'storage:edit'],
+        del: ['admin', 'storage:del']
+      }
     }
   },
   computed: {
@@ -179,34 +148,29 @@ export default {
     ])
   },
   created() {
-    this.$nextTick(() => {
-      this.init()
-    })
+    this.crud.optShow.add = false
   },
   methods: {
-    // 获取数据前设置好接口地址
-    beforeInit() {
-      this.url = 'api/localStorage'
-      return true
-    },
     // 上传文件
-    addMethod() {
+    upload() {
       this.$refs.upload.submit()
     },
     beforeUpload(file) {
       let isLt2M = true
       isLt2M = file.size / 1024 / 1024 < 100
       if (!isLt2M) {
+        this.loading = false
         this.$message.error('上传文件大小不能超过 100MB!')
       }
-      this.loading = false
+      this.form.name = file.name
       return isLt2M
     },
     handleSuccess(response, file, fileList) {
-      this.dialog = false
-      this.cancel()
+      this.crud.notify('上传成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       this.$refs.upload.clearFiles()
-      this.init()
+      this.crud.status.add = CRUD.STATUS.NORMAL
+      this.crud.resetForm()
+      this.crud.toQuery()
     },
     // 监听上传失败
     handleError(e, file, fileList) {
diff --git a/src/views/tools/storage/qiniu/form.vue b/src/views/tools/storage/qiniu/form.vue
index 570e19f..a9120b7 100644
--- a/src/views/tools/storage/qiniu/form.vue
+++ b/src/views/tools/storage/qiniu/form.vue
@@ -77,7 +77,7 @@ export default {
               type: 'success',
               duration: 2500
             })
-            this.$parent.init()
+            this.$parent.crud.toQuery()
             this.loading = false
             this.dialog = false
           }).catch(err => {
diff --git a/src/views/tools/storage/qiniu/index.vue b/src/views/tools/storage/qiniu/index.vue
index 45b47c1..7b215e3 100644
--- a/src/views/tools/storage/qiniu/index.vue
+++ b/src/views/tools/storage/qiniu/index.vue
@@ -4,51 +4,38 @@
     <eForm ref="form" />
     <!-- 工具栏 -->
     <div class="head-container">
-      <!-- 搜索 -->
-      <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="结束日期"
-      />
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 上传 -->
-      <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>
-      <!-- 多选删除 -->
-      <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="beforeDelAllMethod"
-      >删除</el-button>
-      <!-- 导出 -->
-      <el-button
-        :loading="downloadLoading"
-        size="mini"
-        class="filter-item"
-        type="warning"
-        icon="el-icon-download"
-        @click="downloadMethod"
-      >导出</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
@@ -69,67 +56,52 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="loading" :data="data" style="width: 100%;">
+      <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 :show-overflow-tooltip="true" label="文件名">
+        <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="delMethod(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 crud from '@/mixins/crud'
 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: [crud],
+  components: { eForm, pagination, crudOperation, rrOperation },
+  mixins: [presenter(defaultCrud), header(), crud()],
   data() {
     return {
-      title: '文件',
-      crudMethod: { ...crudQiNiu },
+      permission: {
+        del: ['admin', 'storage:del']
+      },
+      title: '文件', dialog: false,
       icon: 'el-icon-refresh',
-      url: '', headers: { 'Authorization': getToken() }, dialog: false,
+      url: '', headers: { 'Authorization': getToken() },
       dialogImageUrl: '', dialogVisible: false, fileList: [], files: [], newWin: null
     }
   },
@@ -149,12 +121,11 @@ export default {
       }
     }
   },
+  created() {
+    this.crud.optShow.add = false
+    this.crud.optShow.edit = false
+  },
   methods: {
-    // 获取数据前设置好接口地址
-    beforeInit() {
-      this.url = 'api/qiNiuContent'
-      return true
-    },
     // 七牛云配置
     doConfig() {
       const _this = this.$refs.form
@@ -169,7 +140,7 @@ export default {
     handleBeforeRemove(file, fileList) {
       for (let i = 0; i < this.files.length; i++) {
         if (this.files[i].uid === file.uid) {
-          this.crudMethod.del(this.files[i].id).then(res => {})
+          crudQiNiu.del([this.files[i].id]).then(res => {})
           return true
         }
       }
@@ -184,19 +155,19 @@ 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(msg.message, 'error')
+      this.crud.notify(msg.message, CRUD.NOTIFICATION_TYPE.ERROR)
     },
     // 下载文件
     download(id) {
       this.downloadLoading = true
       // 先打开一个空的新窗口，再请求
       this.newWin = window.open()
-      this.crudMethod.download(id).then(res => {
+      crudQiNiu.download(id).then(res => {
         this.downloadLoading = false
         this.url = res.url
       }).catch(err => {
@@ -207,7 +178,7 @@ export default {
     // 同步数据
     synchronize() {
       this.icon = 'el-icon-loading'
-      this.crudMethod.sync().then(res => {
+      crudQiNiu.sync().then(res => {
         this.icon = 'el-icon-refresh'
         this.$message({
           showClose: true,
@@ -215,7 +186,7 @@ export default {
           type: 'success',
           duration: 1500
         })
-        this.toQuery()
+        this.crud.toQuery()
       }).catch(err => {
         this.icon = 'el-icon-refresh'
         console.log(err.response.data.message)