From dcc5661c28674fa99fa3c77628d56eb537d0077d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=BA=A2=E4=B8=BD?= <1181930680@qq.com>
Date: Mon, 15 Jul 2024 13:45:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/src/Table.vue   |  6 +++++-
 src/hooks/web/usePermission.ts       |  6 +++---
 src/styles/common.scss               |  3 +++
 src/views/content/tag/index.vue      |  6 +-----
 src/views/data/config/index.vue      |  4 ----
 src/views/data/notice/edit.vue       | 19 +++++++++++--------
 src/views/data/notice/index.vue      |  4 ----
 src/views/data/param/index.vue       |  4 ----
 src/views/system/level/index.vue     |  4 ----
 src/views/system/logger/loginlog.vue |  4 ----
 src/views/system/logger/operlog.vue  |  4 ----
 src/views/system/position/index.vue  |  4 ----
 src/views/system/role/index.vue      |  4 ----
 13 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
index aef61ed..84fea79 100644
--- a/src/components/Table/src/Table.vue
+++ b/src/components/Table/src/Table.vue
@@ -90,13 +90,17 @@
             :type="item.type"
             :width="item.width"
           />
+          <el-table-column align="center" v-else-if="item.isSlot" v-bind="item">
+            <template #default="scope">
+              <slot  :name="item.value" :scope="scope"/>
+            </template>
+          </el-table-column>
           <el-table-column v-else :prop="item.prop" v-bind="item" show-overflow-tooltip align="center">
             <template #default="scope" v-if="item.render">
               <Render :column="item" :row="scope.row" :render="item.render" :index="scope.$index" />
             </template>
           </el-table-column>
         </template>
-
         <template v-for="item in Object.keys($slots)" :key="item" #[item]="data">
           <slot v-bind="data" :name="item"></slot>
         </template>
diff --git a/src/hooks/web/usePermission.ts b/src/hooks/web/usePermission.ts
index 2e2c17f..2692385 100644
--- a/src/hooks/web/usePermission.ts
+++ b/src/hooks/web/usePermission.ts
@@ -8,9 +8,9 @@ export function usePermission() {
    * @param accesses
    */
   function _somePermissions(accesses: string[]) {
-    return userStore.getPermissions.some((item) => {
-      const { value }: any = item;
-      return accesses.includes(value);
+    const permissionsList = userStore.getPermissions;
+    return accesses.some((item) => {
+      return permissionsList.includes(item);
     });
   }
 
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 8d714fe..283d8b8 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -170,3 +170,6 @@ body .n-modal {
 .el-table .el-table__body td .cell:empty::after {
   content: "-";
 }
+.el-drawer__header {
+  margin-bottom: 15px;
+}
diff --git a/src/views/content/tag/index.vue b/src/views/content/tag/index.vue
index c022a83..8f993c3 100644
--- a/src/views/content/tag/index.vue
+++ b/src/views/content/tag/index.vue
@@ -30,10 +30,6 @@
               删除
             </el-button>
         </template>
-
-        <template #action>
-          <TableAction />
-        </template>
       </BasicTable>
     </el-card>
 
@@ -83,7 +79,7 @@ const selectionData = ref([])
             ifShow: () => {
               return true;
             },
-            // auth: ['basic_list'],
+            // auth: ['sys:user:list'],
           },
           {
             label: '删除',
diff --git a/src/views/data/config/index.vue b/src/views/data/config/index.vue
index b793cdf..a08332b 100644
--- a/src/views/data/config/index.vue
+++ b/src/views/data/config/index.vue
@@ -30,10 +30,6 @@
               删除
             </el-button>
         </template>
-
-        <template #action>
-          <TableAction />
-        </template>
       </BasicTable>
     </el-card>
 
diff --git a/src/views/data/notice/edit.vue b/src/views/data/notice/edit.vue
index 646b439..9853217 100644
--- a/src/views/data/notice/edit.vue
+++ b/src/views/data/notice/edit.vue
@@ -40,13 +40,16 @@
             <el-radio :value="2">关闭</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item
-          label="内容"
-          prop="content"
-          :rules="{ required: true, message: '请输入通知内容', trigger: 'blur' }"
-      >
-        <Editor ref="editorRef" :height="600"/>
-      </el-form-item>
+        <div class="flex">
+          <el-form-item
+          class="flex-1"
+            label="内容"
+            prop="content"
+            :rules="{ required: true, message: '请输入通知内容', trigger: 'blur' }"
+        >
+          <Editor ref="editorRef" :height="fwbHeight" class="flex-1"/>
+        </el-form-item>
+    </div>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
@@ -90,7 +93,7 @@ const props = defineProps({
     default: 0
   }
 });
-
+const fwbHeight=document.body.clientHeight -400
 const handleSubmit = async () => {
     formData.content=editorRef.value.myValue
     await formRef.value?.validate();
diff --git a/src/views/data/notice/index.vue b/src/views/data/notice/index.vue
index 939de6a..1b58973 100644
--- a/src/views/data/notice/index.vue
+++ b/src/views/data/notice/index.vue
@@ -32,10 +32,6 @@
             </el-button>
           </el-space>
         </template>
-
-        <template #action>
-          <TableAction />
-        </template>
       </BasicTable>
     </el-card>
 
diff --git a/src/views/data/param/index.vue b/src/views/data/param/index.vue
index 1a47aab..18f53b3 100644
--- a/src/views/data/param/index.vue
+++ b/src/views/data/param/index.vue
@@ -30,10 +30,6 @@
               删除
             </el-button>
         </template>
-
-        <template #action>
-          <TableAction />
-        </template>
       </BasicTable>
     </el-card>
 
diff --git a/src/views/system/level/index.vue b/src/views/system/level/index.vue
index 935b042..69b5686 100644
--- a/src/views/system/level/index.vue
+++ b/src/views/system/level/index.vue
@@ -59,10 +59,6 @@
             </el-button>
           </el-space>
         </template>
-
-        <template #action>
-          <TableAction />
-        </template>
       </BasicTable>
     </el-card>
 
diff --git a/src/views/system/logger/loginlog.vue b/src/views/system/logger/loginlog.vue
index 395f64d..103175b 100644
--- a/src/views/system/logger/loginlog.vue
+++ b/src/views/system/logger/loginlog.vue
@@ -22,10 +22,6 @@
               删除
             </el-button>
         </template>
-
-        <template #action>
-          <TableAction />
-        </template>
       </BasicTable>
     </el-card>
 
diff --git a/src/views/system/logger/operlog.vue b/src/views/system/logger/operlog.vue
index 8265291..8ff6701 100644
--- a/src/views/system/logger/operlog.vue
+++ b/src/views/system/logger/operlog.vue
@@ -22,10 +22,6 @@
               删除
             </el-button>
         </template>
-
-        <template #action>
-          <TableAction />
-        </template>
       </BasicTable>
     </el-card>
 
diff --git a/src/views/system/position/index.vue b/src/views/system/position/index.vue
index 446263d..900ec5b 100644
--- a/src/views/system/position/index.vue
+++ b/src/views/system/position/index.vue
@@ -30,10 +30,6 @@
               删除
             </el-button>
         </template>
-
-        <template #action>
-          <TableAction />
-        </template>
       </BasicTable>
     </el-card>
 
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 9ca1aab..c5fdd4f 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -30,10 +30,6 @@
               删除
             </el-button>
         </template>
-
-        <template #action>
-          <TableAction />
-        </template>
       </BasicTable>
     </el-card>