From 9cb75775f10b19ee68b5d584c55fc2e3ac10388c Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Thu, 2 Mar 2023 21:49:43 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=20JTable=E6=9B=B4=E6=94=B9=E4=B8=BAj?=
 =?UTF-8?q?-pro-table?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NotificationSubscription/index.vue        |  4 +-
 src/views/system/Apply/index.vue              |  4 +-
 .../system/DataSource/Management/index.vue    |  4 +-
 src/views/system/DataSource/index.vue         |  4 +-
 .../components/AddDeviceOrProductDialog.vue   |  5 +-
 src/views/system/Department/device/index.vue  |  4 +-
 src/views/system/Department/product/index.vue |  4 +-
 .../user/components/AddBindUserDialog.vue     |  2 +-
 src/views/system/Department/user/index.vue    |  4 +-
 src/views/system/Menu/Detail/ButtonMange.vue  |  4 +-
 src/views/system/Menu/index.vue               |  4 +-
 src/views/system/Permission/index.vue         |  4 +-
 .../Platforms/Api/components/ApiDoes.vue      | 12 ++--
 .../Platforms/Api/components/ChooseApi.vue    |  4 +-
 .../Platforms/Api/components/HomePage.vue     |  2 +-
 src/views/system/Relationship/index.vue       |  4 +-
 src/views/system/Role/Detail/User/index.vue   |  4 +-
 .../Role/Detail/components/AddUserDialog.vue  |  4 +-
 src/views/system/Role/index.vue               |  4 +-
 src/views/system/User/index.vue               | 60 +------------------
 20 files changed, 43 insertions(+), 98 deletions(-)

diff --git a/src/views/account/NotificationSubscription/index.vue b/src/views/account/NotificationSubscription/index.vue
index bee5dd42..ba131175 100644
--- a/src/views/account/NotificationSubscription/index.vue
+++ b/src/views/account/NotificationSubscription/index.vue
@@ -2,7 +2,7 @@
     <page-container>
         <div class="notification-subscription-container">
             <Search :columns="columns" @search="query.search" />
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="columns"
                 :request="getNoticeList_api"
@@ -87,7 +87,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
 
             <EditDialog
                 v-if="dialogVisible"
diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue
index 967e61de..60116290 100644
--- a/src/views/system/Apply/index.vue
+++ b/src/views/system/Apply/index.vue
@@ -3,7 +3,7 @@
         <div class="apply-container">
             <Search :columns="columns" @search="search" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="columns"
                 :request="getApplyList_api"
@@ -158,7 +158,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
         </div>
         <div class="dialogs">
             <MenuDialog ref="dialogRef" mode="edit" />
diff --git a/src/views/system/DataSource/Management/index.vue b/src/views/system/DataSource/Management/index.vue
index c9d62113..900ff82f 100644
--- a/src/views/system/DataSource/Management/index.vue
+++ b/src/views/system/DataSource/Management/index.vue
@@ -45,7 +45,7 @@
                     >保存</a-button
                 >
             </div>
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 model="TABLE"
@@ -109,7 +109,7 @@
                         <AIcon type="DeleteOutlined" />
                     </PermissionButton>
                 </template>
-            </JTable>
+            </j-pro-table>
             <a-botton class="add-row" @click="table.addRow">
                 <AIcon type="PlusOutlined" /> 新增行
             </a-botton>
diff --git a/src/views/system/DataSource/index.vue b/src/views/system/DataSource/index.vue
index ac3c1d7b..035c5f6a 100644
--- a/src/views/system/DataSource/index.vue
+++ b/src/views/system/DataSource/index.vue
@@ -3,7 +3,7 @@
         <div class="data-source-container">
             <Search :columns="query.columns" @search="query.search" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 :request="getDataSourceList_api"
@@ -122,7 +122,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
 
             <div class="dialogs">
                 <EditDialog ref="editDialogRef" @confirm="table.refresh" />
diff --git a/src/views/system/Department/components/AddDeviceOrProductDialog.vue b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
index 8f60be9a..ac1f2ad2 100644
--- a/src/views/system/Department/components/AddDeviceOrProductDialog.vue
+++ b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
@@ -30,7 +30,7 @@
 
         <Search :columns="props.queryColumns" @search="query.search" />
 
-        <JTable
+        <j-pro-table
             ref="tableRef"
             :request="table.requestFun"
             :gridColumn="2"
@@ -101,7 +101,7 @@
                     </template>
                 </CardBox>
             </template>
-        </JTable>
+        </j-pro-table>
     </a-modal>
 </template>
 
@@ -115,6 +115,7 @@ import {
     bindDeviceOrProductList_api,
 } from '@/api/system/department';
 import { message } from 'ant-design-vue';
+import { dictType } from '../typing';
 
 const emits = defineEmits(['confirm']);
 const props = defineProps<{
diff --git a/src/views/system/Department/device/index.vue b/src/views/system/Department/device/index.vue
index c29f60f7..cc474d9f 100644
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="product-container">
         <Search :columns="query.columns" @search="query.search" />
-        <JTable
+        <j-pro-table
             ref="tableRef"
             :request="table.requestFun"
             :gridColumn="2"
@@ -130,7 +130,7 @@
                     </template>
                 </CardBox>
             </template>
-        </JTable>
+        </j-pro-table>
 
         <div class="dialogs">
             <AddDeviceOrProductDialog
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index b69609d4..d7345663 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="product-container">
         <Search :columns="query.columns" @search="query.search" />
-        <JTable
+        <j-pro-table
             ref="tableRef"
             :request="table.requestFun"
             :gridColumn="2"
@@ -130,7 +130,7 @@
                     </template>
                 </CardBox>
             </template>
-        </JTable>
+        </j-pro-table>
 
         <div class="dialogs">
             <AddDeviceOrProductDialog
diff --git a/src/views/system/Department/user/components/AddBindUserDialog.vue b/src/views/system/Department/user/components/AddBindUserDialog.vue
index b0521777..e6a894ff 100644
--- a/src/views/system/Department/user/components/AddBindUserDialog.vue
+++ b/src/views/system/Department/user/components/AddBindUserDialog.vue
@@ -12,7 +12,7 @@
     >
         <Search :columns="query.columns" @search="query.search" />
         <div class="table">
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 :request="table.requestFun"
diff --git a/src/views/system/Department/user/index.vue b/src/views/system/Department/user/index.vue
index 53f582ca..857b02a1 100644
--- a/src/views/system/Department/user/index.vue
+++ b/src/views/system/Department/user/index.vue
@@ -2,7 +2,7 @@
     <div>
         <Search :columns="query.columns" @search="query.search" />
 
-        <JTable
+        <j-pro-table
             ref="tableRef"
             :columns="table.columns"
             :request="table.requestFun"
@@ -58,7 +58,7 @@
                     </PermissionButton>
                 </a-space>
             </template>
-        </JTable>
+        </j-pro-table>
 
         <div class="dialogs">
             <AddBindUserDialog
diff --git a/src/views/system/Menu/Detail/ButtonMange.vue b/src/views/system/Menu/Detail/ButtonMange.vue
index ec2702c5..ebe8a14c 100644
--- a/src/views/system/Menu/Detail/ButtonMange.vue
+++ b/src/views/system/Menu/Detail/ButtonMange.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="button-mange-container">
-        <JTable
+        <j-pro-table
             ref="tableRef"
             :columns="table.columns"
             model="TABLE"
@@ -47,7 +47,7 @@
                     </PermissionButton>
                 </a-space>
             </template>
-        </JTable>
+        </j-pro-table>
 
         <div class="dialog">
             <ButtonAddDialog
diff --git a/src/views/system/Menu/index.vue b/src/views/system/Menu/index.vue
index 9349c2eb..e58fb3e1 100644
--- a/src/views/system/Menu/index.vue
+++ b/src/views/system/Menu/index.vue
@@ -3,7 +3,7 @@
         <div class="menu-container">
             <Search :columns="query.columns" @search="query.search" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 :request="table.getList"
@@ -71,7 +71,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
         </div>
     </page-container>
 </template>
diff --git a/src/views/system/Permission/index.vue b/src/views/system/Permission/index.vue
index 8d141adc..1f6bb14d 100644
--- a/src/views/system/Permission/index.vue
+++ b/src/views/system/Permission/index.vue
@@ -3,7 +3,7 @@
         <div class="permission-container">
             <Search :columns="query.columns" @search="query.search" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 :request="getPermission_api"
@@ -115,7 +115,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
 
             <div class="dialogs">
                 <EditDialog ref="editDialogRef" @refresh="table.refresh" />
diff --git a/src/views/system/Platforms/Api/components/ApiDoes.vue b/src/views/system/Platforms/Api/components/ApiDoes.vue
index b7f8f8f3..b865a90a 100644
--- a/src/views/system/Platforms/Api/components/ApiDoes.vue
+++ b/src/views/system/Platforms/Api/components/ApiDoes.vue
@@ -21,7 +21,7 @@
         <div class="api-card">
             <h5>请求参数</h5>
             <div class="content">
-                <JTable
+                <j-pro-table
                     :columns="requestCard.columns"
                     :dataSource="requestCard.tableData"
                     noPagination
@@ -33,19 +33,19 @@
                     <template #type="slotProps">
                         <span>{{ slotProps.schema.type }}</span>
                     </template>
-                </JTable>
+                </j-pro-table>
             </div>
         </div>
         <div class="api-card">
             <h5>响应状态</h5>
             <div class="content">
-                <JTable
+                <j-pro-table
                     :columns="responseStatusCard.columns"
                     :dataSource="responseStatusCard.tableData"
                     noPagination
                     model="TABLE"
                 >
-                </JTable>
+                </j-pro-table>
 
                 <a-tabs v-model:activeKey="responseStatusCard.activeKey">
                     <a-tab-pane
@@ -60,13 +60,13 @@
         <div class="api-card">
             <h5>响应参数</h5>
             <div class="content">
-                <JTable
+                <j-pro-table
                     :columns="respParamsCard.columns"
                     :dataSource="respParamsCard.tableData"
                     noPagination
                     model="TABLE"
                 >
-                </JTable>
+                </j-pro-table>
             </div>
 
             <MonacoEditor
diff --git a/src/views/system/Platforms/Api/components/ChooseApi.vue b/src/views/system/Platforms/Api/components/ChooseApi.vue
index 675968e9..54b04158 100644
--- a/src/views/system/Platforms/Api/components/ChooseApi.vue
+++ b/src/views/system/Platforms/Api/components/ChooseApi.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="choose-api-container">
-        <JTable
+        <j-pro-table
             :columns="columns"
             :dataSource="props.tableData"
             :rowSelection="props.mode !== 'home' ? rowSelection : undefined"
@@ -14,7 +14,7 @@
                     >{{ slotProps.url }}</span
                 >
             </template>
-        </JTable>
+        </j-pro-table>
 
         <a-button type="primary" @click="save" v-if="props.mode !== 'home'"
             >保存</a-button
diff --git a/src/views/system/Platforms/Api/components/HomePage.vue b/src/views/system/Platforms/Api/components/HomePage.vue
index 8576eb8d..eefcac13 100644
--- a/src/views/system/Platforms/Api/components/HomePage.vue
+++ b/src/views/system/Platforms/Api/components/HomePage.vue
@@ -60,7 +60,7 @@
             <div style="width: 50%">
                 <h3>示例数据</h3>
                 <div>
-                    <JTable
+                    <j-pro-table
                         :dataSource="data"
                         model="TABLE"
                         noPagination
diff --git a/src/views/system/Relationship/index.vue b/src/views/system/Relationship/index.vue
index 96ae1579..3b527d8a 100644
--- a/src/views/system/Relationship/index.vue
+++ b/src/views/system/Relationship/index.vue
@@ -3,7 +3,7 @@
         <div class="relationship-container">
             <Search :columns="query.columns" @search="query.search" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 :request="getRelationshipList_api"
@@ -49,7 +49,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
 
             <EditDialog ref="editDialogRef" @refresh="table.refresh" />
         </div>
diff --git a/src/views/system/Role/Detail/User/index.vue b/src/views/system/Role/Detail/User/index.vue
index ffe3b533..abb633d8 100644
--- a/src/views/system/Role/Detail/User/index.vue
+++ b/src/views/system/Role/Detail/User/index.vue
@@ -2,7 +2,7 @@
     <a-card class="role-user-container">
         <Search :columns="query.columns" />
 
-        <JTable
+        <j-pro-table
             ref="tableRef"
             :columns="table.columns"
             :request="getUserByRole_api"
@@ -37,7 +37,7 @@
                     </a-popconfirm>
                 </a-space>
             </template>
-        </JTable>
+        </j-pro-table>
 
         <div class="dialogs">
             <AddUserDialog :open="dialog.openAdd" @refresh="table.refresh" />
diff --git a/src/views/system/Role/Detail/components/AddUserDialog.vue b/src/views/system/Role/Detail/components/AddUserDialog.vue
index 7a3a4ee3..e22e46ba 100644
--- a/src/views/system/Role/Detail/components/AddUserDialog.vue
+++ b/src/views/system/Role/Detail/components/AddUserDialog.vue
@@ -7,7 +7,7 @@
     >
         <Search :columns="query.columns" type="simple" />
 
-        <JTable
+        <j-pro-table
             ref="tableRef"
             :columns="table.columns"
             :request="getUserByRole_api"
@@ -19,7 +19,7 @@
             }"
             @cancelSelect="table.cancelSelect"
         >
-        </JTable>
+        </j-pro-table>
 
         <template #footer>
             <a-button key="back" @click="dialog.visible = false">取消</a-button>
diff --git a/src/views/system/Role/index.vue b/src/views/system/Role/index.vue
index 19d798ec..72ee4749 100644
--- a/src/views/system/Role/index.vue
+++ b/src/views/system/Role/index.vue
@@ -3,7 +3,7 @@
         <a-card class="role-container">
             <Search :columns="query.columns" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 :request="getRoleList_api"
@@ -45,7 +45,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
 
             <div class="dialogs">
                 <AddDialog ref="addDialogRef" />
diff --git a/src/views/system/User/index.vue b/src/views/system/User/index.vue
index 0ec9fe64..017106c0 100644
--- a/src/views/system/User/index.vue
+++ b/src/views/system/User/index.vue
@@ -3,7 +3,7 @@
         <div class="user-container">
             <Search :columns="query.columns" @search="query.search" />
 
-            <JTable
+            <j-pro-table
                 ref="tableRef"
                 :columns="table.columns"
                 :request="getUserList_api"
@@ -43,62 +43,6 @@
                 </template>
                 <template #action="slotProps">
                     <a-space :size="16">
-                        <!-- <a-tooltip>
-                        <template #title>编辑</template>
-                        <a-button
-                            style="padding: 0"
-                            type="link"
-                            @click="table.openDialog('edit', slotProps)"
-                        >
-                            <AIcon type="EditOutlined" />
-                        </a-button>
-                    </a-tooltip> -->
-                        <!-- <a-popconfirm
-                        :title="`确定${slotProps.status ? '禁用' : '启用'}吗？`"
-                        ok-text="确定"
-                        cancel-text="取消"
-                        @confirm="table.changeStatus(slotProps)"
-                    >
-                        <a-tooltip>
-                            <template #title>{{
-                                slotProps.status ? '禁用' : '启用'
-                            }}</template>
-                            <a-button style="padding: 0" type="link">
-                                <stop-outlined v-if="slotProps.status" />
-                                <play-circle-outlined v-else />
-                            </a-button>
-                        </a-tooltip>
-                    </a-popconfirm> -->
-                        <!-- <a-tooltip>
-                        <template #title>重置密码</template>
-                        <a-button
-                            style="padding: 0"
-                            type="link"
-                            @click="table.openDialog('reset', slotProps)"
-                        >
-                            <AIcon type="icon-zhongzhimima" />
-                        </a-button>
-                    </a-tooltip> -->
-                        <!-- <a-popconfirm
-                        title="确认删除"
-                        ok-text="确定"
-                        cancel-text="取消"
-                        @confirm="table.clickDel(slotProps)"
-                        :disabled="slotProps.status"
-                    >
-                        <a-tooltip>
-                            <template #title>{{
-                                slotProps.status ? '请先禁用，再删除' : '删除'
-                            }}</template>
-                            <a-button
-                                style="padding: 0"
-                                type="link"
-                                :disabled="slotProps.status"
-                            >
-                                <AIcon type="DeleteOutlined" />
-                            </a-button>
-                        </a-tooltip>
-                    </a-popconfirm> -->
 
                         <PermissionButton
                             :uhasPermission="`${permission}:update`"
@@ -154,7 +98,7 @@
                         </PermissionButton>
                     </a-space>
                 </template>
-            </JTable>
+            </j-pro-table>
 
             <div class="dialogs">
                 <EditUserDialog ref="editDialogRef" @confirm="table.refresh" />