From b65ec1d337495b17a80f69dee03c587b636c5e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Wed, 26 May 2021 22:48:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD(=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6):=20=E6=9B=B4=E6=96=B0CRUD=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dvadmin-ui/src/components/ModelDisplay/index.vue | 11 +++++++----
 dvadmin-ui/src/store/modules/modelSelect.js      |  3 ++-
 dvadmin-ui/src/utils/modelSelect.js              |  6 +++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dvadmin-ui/src/components/ModelDisplay/index.vue b/dvadmin-ui/src/components/ModelDisplay/index.vue
index 6d9f240..fa1eb82 100644
--- a/dvadmin-ui/src/components/ModelDisplay/index.vue
+++ b/dvadmin-ui/src/components/ModelDisplay/index.vue
@@ -426,8 +426,8 @@
         type: Object,
         default: () => {
           return {
-            page: 'page',
-            pageSize: 'page_size',
+            page: 'pageNum',
+            pageSize: 'pageSize',
             count: 'count',
             results: 'results'
           };
@@ -882,6 +882,7 @@
           return func.api(ids);
         }).then(() => {
           this.getTableData();
+          this.$emit('delete', ids)
           this.msgSuccess("删除成功");
         })
       },
@@ -933,12 +934,14 @@
                 this.msgSuccess("修改成功");
                 this.open = false;
                 this.getTableData();
+                this.$emit('update', this.form)
               });
             } else {
               this.submitFormApi(this.form).then(() => {
                 this.msgSuccess("新增成功");
                 this.open = false;
                 this.getTableData();
+                this.$emit('add', this.form)
               });
             }
           }
@@ -956,8 +959,8 @@
       getOperationPermis() {
         let Permis = []
         this.funcs.map(value => {
-          if (['update', 'delete', 'select'].indexOf(value.type) !== 0) {
-            Permis.push(value.permis)
+          if (['update', 'delete', 'select'].indexOf(value.type) !== -1) {
+            Permis = Permis + value.permis
           }
         })
         return Permis
diff --git a/dvadmin-ui/src/store/modules/modelSelect.js b/dvadmin-ui/src/store/modules/modelSelect.js
index 4cdf771..3ba14df 100644
--- a/dvadmin-ui/src/store/modules/modelSelect.js
+++ b/dvadmin-ui/src/store/modules/modelSelect.js
@@ -18,7 +18,8 @@ const modelSelect = {
       let labelName = paramsMap["labelName"]
       let listApi = paramsMap["listApi"]
       let params = paramsMap["params"]
-      if (state.modelSelectMap[modelName]) {
+      let reset = paramsMap["reset"]
+      if (!reset && state.modelSelectMap[modelName]) {
         return state.modelSelectMap[modelName]
       } else {
         const res = await listApi({pageNum: "all", ...params})
diff --git a/dvadmin-ui/src/utils/modelSelect.js b/dvadmin-ui/src/utils/modelSelect.js
index 3c49bd7..e43c1d6 100644
--- a/dvadmin-ui/src/utils/modelSelect.js
+++ b/dvadmin-ui/src/utils/modelSelect.js
@@ -1,7 +1,7 @@
 import store from '@/store'
 //  获取字典方法 使用示例 this.getModelSelect(this.prop, this.label_name, this.listApi).then(res)
 //  或者 async函数下 const res = await this.getModelSelect(this.prop, this.label_name, this.listApi)
-export const getModelSelect = async (modelName, labelName, listApi,params) => {
-    await store.dispatch("modelSelect/getModelSelect", {modelName, labelName, listApi,params})
-    return store.getters["modelSelect/getModelSelect"][modelName]
+export const getModelSelect = async (modelName, labelName, listApi, params, reset) => {
+  await store.dispatch("modelSelect/getModelSelect", {modelName, labelName, listApi, params, reset})
+  return store.getters["modelSelect/getModelSelect"][modelName]
 }