From 78e423cc50bf6792a35421d844b0a49cb4faafb7 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Tue, 10 Jan 2023 18:30:05 +0800
Subject: [PATCH 01/13] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/index.vue | 96 ++++++++++++++++++++++++++++------
 src/views/demo/table/index.vue | 12 +++--
 2 files changed, 90 insertions(+), 18 deletions(-)

diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue
index 9b21c30c..c921bd97 100644
--- a/src/components/Table/index.vue
+++ b/src/components/Table/index.vue
@@ -4,17 +4,17 @@
             <div class="jtable-body-header-left">
                 <slot name="headerTitle"></slot>
             </div>
-            <div class="jtable-body-header-right">
-                <div class="jtable-setting-item" :class="[ModelEnum.CARD === model ? 'active' : '']" @click="modelChange(ModelEnum.CARD)">
+            <div class="jtable-body-header-right" v-if="!model">
+                <div class="jtable-setting-item" :class="[ModelEnum.CARD === _model ? 'active' : '']" @click="modelChange(ModelEnum.CARD)">
                     <AppstoreOutlined />
                 </div>
-                <div class="jtable-setting-item" :class="[ModelEnum.TABLE === model ? 'active' : '']" @click="modelChange(ModelEnum.TABLE)">
+                <div class="jtable-setting-item" :class="[ModelEnum.TABLE === _model ? 'active' : '']" @click="modelChange(ModelEnum.TABLE)">
                     <UnorderedListOutlined  />
                 </div>
             </div>
         </div>
         <div class="jtable-content">
-            <div v-if="model === ModelEnum.CARD" class="jtable-card">
+            <div v-if="_model === ModelEnum.CARD" class="jtable-card">
                 <div 
                     v-if="dataSource.length"
                     class="jtable-card-items"
@@ -33,14 +33,28 @@
                 </div>
             </div>
             <div v-else>
-                <a-table :columns="columns" :dataSource="dataSource" :pagination="false" />
+                <a-table {...props} :columns="[..._columns]" :dataSource="dataSource" :pagination="false">
+                    <template #bodyCell="{ column, record }">
+                        <template v-if="column.key === 'action'">
+                            <a-space>
+                                <a-tooltip v-for="i in actions" :key="i.key" {...i.tooltip}>
+                                    <a-popconfirm v-if="i.popConfirm" {...i.popConfirm}>
+                                        <a>{{i.text}}</a>
+                                    </a-popconfirm>
+                                    <a v-else @click="i.onClick && i.onClick(record)">{{i.text}}</a>
+                                </a-tooltip>
+                            </a-space>
+                        </template>
+                    </template>
+                </a-table>
             </div>
         </div>
         <div class="jtable-pagination" v-if="dataSource.length">
             <a-pagination
                 size="small"
-                :total="50"
+                :total="total"
                 :show-total="total => `第 ${1} - ${1} 条/总共 ${total} 条`"
+                @change="pageChange"
             />
         </div>
     </div>
@@ -49,14 +63,17 @@
 <script setup lang="ts">
 import { UnorderedListOutlined, AppstoreOutlined } from '@ant-design/icons-vue'
 import type { TableProps } from 'ant-design-vue/es/table'
+import type { TooltipProps } from 'ant-design-vue/es/tooltip'
+import type { PopconfirmProps } from 'ant-design-vue/es/popconfirm'
 import { Empty } from 'ant-design-vue'
+import { CSSProperties } from 'vue';
 
 enum ModelEnum {
     TABLE = 'TABLE',
     CARD = 'CARD',
 }
 
-export declare type RequestData = {
+type RequestData = {
     code: string;
     result: {
         data: Record<string, any>[] | undefined;
@@ -67,6 +84,17 @@ export declare type RequestData = {
     status: number;
 } & Record<string, any>;
 
+export interface ActionsType {
+    key: string;
+    text: string;
+    disabled?: boolean;
+    permission: boolean;
+    onClick?: (data: any) => void;
+    style?: CSSProperties;
+    tooltip?: TooltipProps;
+    popConfirm: PopconfirmProps
+}
+
 interface JTableProps extends TableProps{
     request: (params: Record<string, any> & {
         pageSize: number;
@@ -74,28 +102,34 @@ interface JTableProps extends TableProps{
     }) => Promise<Partial<RequestData>>;
     cardBodyClass?: string;
     columns: Record<string, any>[];
-    params: Record<string, any> & {
+    params?: Record<string, any> & {
         pageSize: number;
         pageIndex: number;
-    }
+    };
+    model?: keyof typeof ModelEnum | undefined; // 显示table还是card
+    actions?: ActionsType[]
 }
 // props和emit
-const emit = defineEmits(["modelChange"]);
+// const emit = defineEmits(["modelChange"]);
 const props = withDefaults(defineProps<JTableProps>(), {
     cardBodyClass: '',
-    request: undefined
+    request: undefined,
 })
 
 const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE
-const model = ref<keyof typeof ModelEnum>(ModelEnum.CARD); // 模式切换
+
+const _model = ref<keyof typeof ModelEnum>(props.model ? props.model : ModelEnum.CARD); // 模式切换
 const column = ref<number>(4);
 const dataSource = ref<Record<string, any>[]>([])
-console.log(props)
+const pageIndex = ref<number>(0)
+const pageSize = ref<number>(6)
+const total = ref<number>(0)
+const _columns = ref<Record<string, any>[]>([])
 // 方法
 
 // 切换卡片和表格
 const modelChange = (type: keyof typeof ModelEnum) => {
-    model.value = type
+    _model.value = type
 }
 
 // 请求数据
@@ -106,11 +140,43 @@ const handleSearch = async (params1?: Record<string, any>) => {
         ...params1
     })
     if(resp.status === 200){
-        dataSource.value = resp.result?.data || []
+        dataSource.value = [ // resp.result?.data || 
+          {
+            key: '1',
+            name: '胡彦斌',
+            age: 32,
+            address: '西湖区湖底公园1号',
+          },
+          {
+            key: '2',
+            name: '胡彦祖',
+            age: 42,
+            address: '西湖区湖底公园1号',
+          },
+        ],
+        pageIndex.value = resp.result?.pageIndex || 0
+        pageSize.value = resp.result?.pageSize || 6
+        total.value = resp.result?.total || 0
     }
 }
 
+const pageChange = () => {
+
+}
+
 watchEffect(() => {
+    if(Array.isArray(props.actions) && props.actions.length) {
+         _columns.value = [...props.columns,
+            {
+                title: '操作',
+                key: 'action',
+                fixed: 'right',
+                width: 250
+            }   
+        ]
+    } else {
+         _columns.value = [...props.columns]
+    }
     handleSearch(props.params)
 })
 
diff --git a/src/views/demo/table/index.vue b/src/views/demo/table/index.vue
index 89887a55..1aa3ed02 100644
--- a/src/views/demo/table/index.vue
+++ b/src/views/demo/table/index.vue
@@ -16,15 +16,16 @@
                     title: '住址',
                     dataIndex: 'address',
                     key: 'address',
-                }
+                },
             ]"
+            :actions="actions"
             :request="request"
         >
             <template #headerTitle>
                 <a-button type="primary">新增</a-button>
             </template>
             <template #cardRender="slotProps">
-                <CardBox>
+                <CardBox :actions="actions">
                     <template #content>
                         {{slotProps.item.name}}
                     </template>
@@ -37,8 +38,13 @@
 <script setup lang="ts">
 import server from "@/utils/request";
 import CardBox from '@/components/CardBox/index.vue';
-const request = (data: any) => server.post(`/device-product/_query`, data)
 
+const request = (data: any) => server.post(`/device-product/_query`, data)
+const actions = [{
+    key: 'delete',
+    disabled: true,
+    text: "删除"
+}]
 </script>
 
 

From d682234293d68ddae95b91bf6a6793eeef7e6269 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Wed, 11 Jan 2023 10:01:28 +0800
Subject: [PATCH 02/13] fix: merge

---
 src/components/Table/index.vue | 44 ++++++++++++++++++----------------
 src/views/demo/table/index.vue | 31 ++++++++++++++----------
 2 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue
index c921bd97..c7143149 100644
--- a/src/components/Table/index.vue
+++ b/src/components/Table/index.vue
@@ -53,8 +53,13 @@
             <a-pagination
                 size="small"
                 :total="total"
-                :show-total="total => `第 ${1} - ${1} 条/总共 ${total} 条`"
+                :showQuickJumper="false"
+                :showSizeChanger="true"
+                v-model:current="pageIndex"
+                v-model:page-size="pageSize"
+                :show-total="(total, range) => `第 ${range[0]} - ${range[1]} 条/总共 ${total} 条`"
                 @change="pageChange"
+                :page-size-options="[12, 24, 48, 60, 100]"
             />
         </div>
     </div>
@@ -135,33 +140,30 @@ const modelChange = (type: keyof typeof ModelEnum) => {
 // 请求数据
 const handleSearch = async (params1?: Record<string, any>) => {
     const resp = await props.request({
-        pageSize: 10,
+        pageSize: 12,
         pageIndex: 1,
         ...params1
     })
     if(resp.status === 200){
-        dataSource.value = [ // resp.result?.data || 
-          {
-            key: '1',
-            name: '胡彦斌',
-            age: 32,
-            address: '西湖区湖底公园1号',
-          },
-          {
-            key: '2',
-            name: '胡彦祖',
-            age: 42,
-            address: '西湖区湖底公园1号',
-          },
-        ],
+        dataSource.value = resp.result?.data || []
         pageIndex.value = resp.result?.pageIndex || 0
         pageSize.value = resp.result?.pageSize || 6
         total.value = resp.result?.total || 0
     }
 }
 
-const pageChange = () => {
-
+const pageChange = (page: number, size: number) => {
+    if(pageSize.value === size) {
+        handleSearch({
+            pageSize: size,
+            pageIndex: page,
+        })
+    } else {
+        handleSearch({
+            pageSize: size,
+            pageIndex: 1,
+        })
+    }
 }
 
 watchEffect(() => {
@@ -226,9 +228,9 @@ watchEffect(() => {
         margin-top: 20px;
         display: flex;
         justify-content: flex-end;
-        // position: absolute;
-        // right: 24px;
-        // bottom: 24px;
+        /deep/  .ant-pagination-item {
+            display: none !important;
+        }
     }
 }   
 </style>
\ No newline at end of file
diff --git a/src/views/demo/table/index.vue b/src/views/demo/table/index.vue
index 1aa3ed02..66db096e 100644
--- a/src/views/demo/table/index.vue
+++ b/src/views/demo/table/index.vue
@@ -3,19 +3,19 @@
         <JTable 
             :columns="[
                 {
-                    title: '姓名',
+                    title: '名称',
                     dataIndex: 'name',
                     key: 'name',
                 },
                 {
-                    title: '年龄',
-                    dataIndex: 'age',
-                    key: 'age',
+                    title: 'ID',
+                    dataIndex: 'id',
+                    key: 'id',
                 },
                 {
-                    title: '住址',
-                    dataIndex: 'address',
-                    key: 'address',
+                    title: '分类',
+                    dataIndex: 'classifiedName',
+                    key: 'classifiedName',
                 },
             ]"
             :actions="actions"
@@ -40,11 +40,18 @@ import server from "@/utils/request";
 import CardBox from '@/components/CardBox/index.vue';
 
 const request = (data: any) => server.post(`/device-product/_query`, data)
-const actions = [{
-    key: 'delete',
-    disabled: true,
-    text: "删除"
-}]
+const actions = [
+    {
+        key: 'edit',
+        // disabled: true,
+        text: "编辑"
+    },
+    {
+        key: 'delete',
+        disabled: true,
+        text: "删除"
+    }
+]
 </script>
 
 

From a4830e4c30ece00523cd296824271802c4b163b0 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 11 Jan 2023 10:50:31 +0800
Subject: [PATCH 04/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=E6=96=B0=E5=A2=9E=20=E8=A1=A8=E5=8D=95=E5=A4=9A?=
 =?UTF-8?q?=E5=B1=82=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C=E3=80=81=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=95=B0=E6=8D=AE=E5=8F=8C=E5=90=91?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Certificate/Detail/CertificateFile.vue    |   6 +-
 src/views/link/Certificate/Detail/index.vue   | 106 ++++++++++--------
 src/views/link/Certificate/index.vue          |   7 +-
 3 files changed, 66 insertions(+), 53 deletions(-)

diff --git a/src/views/link/Certificate/Detail/CertificateFile.vue b/src/views/link/Certificate/Detail/CertificateFile.vue
index b6ffb26c..ae64c8f0 100644
--- a/src/views/link/Certificate/Detail/CertificateFile.vue
+++ b/src/views/link/Certificate/Detail/CertificateFile.vue
@@ -64,16 +64,14 @@ const handleChange = (info: UploadChangeParam) => {
         message.success('上传成功！');
         const result = info.file.response?.result;
         keystoreBase64.value = result;
-        console.log(1114, result);
         loading.value = false;
         emit('change', result);
         emit('update:modelValue', result);
     }
 };
 const textChange = (val: any) => {
-    val.name = props.name;
-    emit('change', val);
-    // emit('update:modelValue', val);
+    emit('change', keystoreBase64.value);
+    emit('update:modelValue', keystoreBase64.value);
 };
 
 watch(
diff --git a/src/views/link/Certificate/Detail/index.vue b/src/views/link/Certificate/Detail/index.vue
index ec301a57..1cb904b1 100644
--- a/src/views/link/Certificate/Detail/index.vue
+++ b/src/views/link/Certificate/Detail/index.vue
@@ -10,10 +10,8 @@
                     :label-col="{ span: 8 }"
                     :wrapper-col="{ span: 16 }"
                     autocomplete="off"
-                    @finish="onFinish"
-                    :rules="formRules"
                 >
-                    <a-form-item label="证书标准" name="type">
+                    <a-form-item label="证书标准" v-bind="validateInfos.type">
                         <a-radio-group v-model:value="formData.type">
                             <a-radio-button
                                 class="form-radio-button"
@@ -24,25 +22,29 @@
                         </a-radio-group>
                     </a-form-item>
 
-                    <a-form-item label="证书名称" name="name">
+                    <a-form-item label="证书名称" v-bind="validateInfos.name">
                         <a-input
                             placeholder="请输入证书名称"
                             v-model:value="formData.name"
                         />
                     </a-form-item>
-                    <a-form-item label="证书文件" name="cert">
+                    <a-form-item
+                        label="证书文件"
+                        v-bind="validateInfos['configs.cert']"
+                    >
                         <CertificateFile
                             name="cert"
-                            v-model:modelValue="formData.cert"
-                            @change="changeFileValue"
+                            v-model:modelValue="formData.configs.cert"
                             placeholder='证书格式以"-----BEGIN CERTIFICATE-----"开头，以"-----END CERTIFICATE-----"结尾"'
                         />
                     </a-form-item>
-                    <a-form-item label="证书私钥" name="key">
+                    <a-form-item
+                        label="证书私钥"
+                        v-bind="validateInfos['configs.key']"
+                    >
                         <CertificateFile
                             name="key"
-                            v-model:modelValue="formData.key"
-                            @change="changeFileValue"
+                            v-model:modelValue="formData.configs.key"
                             placeholder='证书私钥格式以"-----BEGIN (RSA|EC) PRIVATE KEY-----"开头，以"-----END(RSA|EC) PRIVATE KEY-----"结尾。'
                         />
                     </a-form-item>
@@ -61,6 +63,8 @@
                             class="form-submit"
                             html-type="submit"
                             type="primary"
+                            @click.prevent="onSubmit"
+                            :loading="loading"
                             >保存</a-button
                         >
                     </a-form-item>
@@ -89,7 +93,7 @@
 </template>
 
 <script lang="ts" setup name="CertificateDetail">
-import { message } from 'ant-design-vue';
+import { message, Form } from 'ant-design-vue';
 import { getImage } from '@/utils/comm';
 import CertificateFile from './CertificateFile.vue';
 import type { UploadChangeParam } from 'ant-design-vue';
@@ -101,57 +105,65 @@ import {
 } from '@/utils/variable';
 import { save } from '@/api/link/certificate';
 
+const router = useRouter();
+
+const useForm = Form.useForm;
+
+const fileLoading = ref(false);
 const loading = ref(false);
 
 const formData = reactive({
     type: 'common',
     name: '',
-    cert: '',
-    key: '',
-    // configs: {
-    //     cert: '',
-    //     key: '',
-    // },
+    configs: {
+        cert: '',
+        key: '',
+    },
     description: '',
 });
 
-const formRules = {
-    type: [{ required: true, message: '请选择证书标准', trigger: 'blur' }],
-    name: [
-        { required: true, message: '请输入证书名称', trigger: 'blur' },
-        { max: 64, message: '最多可输入64个字符' },
-    ],
-    cert: [{ required: true, message: '请输入或上传文件', trigger: 'blur' }],
-    key: [{ required: true, message: '请输入或上传文件', trigger: 'blur' }],
-    description: [{ max: 200, message: '最多可输入200个字符' }],
-};
+const { resetFields, validate, validateInfos } = useForm(
+    formData,
+    reactive({
+        type: [{ required: true, message: '请选择证书标准', trigger: 'blur' }],
+        name: [
+            { required: true, message: '请输入证书名称', trigger: 'blur' },
+            { max: 64, message: '最多可输入64个字符' },
+        ],
+        'configs.cert': [
+            { required: true, message: '请输入或上传文件', trigger: 'blur' },
+        ],
+        'configs.key': [
+            { required: true, message: '请输入或上传文件', trigger: 'blur' },
+        ],
+        description: [{ max: 200, message: '最多可输入200个字符' }],
+    }),
+);
 
-const onFinish = async (values: any) => {
-    values.configs = {
-        cert: formData.cert,
-        key: formData.key,
-    };
-    delete values.cert;
-    delete values.key;
-
-    const response = await save(values)
-      if (response.status === 200) {
-        message.success('操作成功')
-      }
-
-};
-
-const changeFileValue = (v: any) => {
-    formData[v.name] = v.data;
+const onSubmit = () => {
+    validate()
+        .then(async (res) => {
+            const params = toRaw(formData);
+            loading.value = true;
+            const response = await save(params);
+            if (response.status === 200) {
+                message.success('操作成功');
+                router.push('/link/certificate');
+            }
+            loading.value = false;
+        })
+        .catch((err) => {
+            loading.value = false;
+        });
 };
 
 const handleChange = (info: UploadChangeParam) => {
-    loading.value = true;
+    fileLoading.value = true;
     if (info.file.status === 'done') {
         message.success('上传成功！');
         const result = info.file.response?.result;
-        formData.cert = result;
-        loading.value = false;
+        formData.configs.cert = result;
+        fileLoading.value = false;
     }
 };
 </script>
diff --git a/src/views/link/Certificate/index.vue b/src/views/link/Certificate/index.vue
index 757828d4..c289ab74 100644
--- a/src/views/link/Certificate/index.vue
+++ b/src/views/link/Certificate/index.vue
@@ -3,8 +3,11 @@
 </template>
 <script lang="ts" setup name="CertificatePage">
 
-const handlAdd = (e: any) => {
-  console.log(111,e);
+const router = useRouter();
+
+
+const handlAdd = () => {
+  router.push('/link/certificate/detail/add');
   
 }
 

From e3c3e43b31d582e4f67987104a8ae6dcae8584bc Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Wed, 11 Jan 2023 14:33:17 +0800
Subject: [PATCH 05/13] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E6=8F=92?=
 =?UTF-8?q?=E6=A7=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                  |  14 +++
 src/components/CardBox/index.vue |   2 +-
 src/components/Table/index.vue   | 203 ++++++++++++++++++-------------
 src/components/index.ts          |   4 +-
 src/views/demo/table/index.vue   |  58 +++++++--
 5 files changed, 186 insertions(+), 95 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index c6352220..810334ea 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -7,29 +7,43 @@ export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
+    AAlert: typeof import('ant-design-vue/es')['Alert']
+    ABadge: typeof import('ant-design-vue/es')['Badge']
     AButton: typeof import('ant-design-vue/es')['Button']
     ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
     ACheckboxGroup: typeof import('ant-design-vue/es')['CheckboxGroup']
     ACol: typeof import('ant-design-vue/es')['Col']
     ACollapse: typeof import('ant-design-vue/es')['Collapse']
     ACollapsePanel: typeof import('ant-design-vue/es')['CollapsePanel']
+    ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
+    ADivider: typeof import('ant-design-vue/es')['Divider']
+    AEmpty: typeof import('ant-design-vue/es')['Empty']
     AForm: typeof import('ant-design-vue/es')['Form']
     AFormItem: typeof import('ant-design-vue/es')['FormItem']
     AInput: typeof import('ant-design-vue/es')['Input']
     AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
+    AInputPassword: typeof import('ant-design-vue/es')['InputPassword']
     AModal: typeof import('ant-design-vue/es')['Modal']
+    APagination: typeof import('ant-design-vue/es')['Pagination']
+    APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
     ARow: typeof import('ant-design-vue/es')['Row']
     ASelect: typeof import('ant-design-vue/es')['Select']
     ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
+    ASpace: typeof import('ant-design-vue/es')['Space']
     ASpin: typeof import('ant-design-vue/es')['Spin']
+    ATable: typeof import('ant-design-vue/es')['Table']
     ATooltip: typeof import('ant-design-vue/es')['Tooltip']
     AUpload: typeof import('ant-design-vue/es')['Upload']
     BadgeStatus: typeof import('./src/components/BadgeStatus/index.vue')['default']
     CardBox: typeof import('./src/components/CardBox/index.vue')['default']
+    FormFormBuilder: typeof import('./src/components/Form/FormBuilder.vue')['default']
     GeoComponent: typeof import('./src/components/GeoComponent/index.vue')['default']
     MonacoEditor: typeof import('./src/components/MonacoEditor/index.vue')['default']
+    PermissionButton: typeof import('./src/components/PermissionButton/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
+    Table: typeof import('./src/components/Table/index.vue')['default']
+    TitleComponent: typeof import('./src/components/TitleComponent/index.vue')['default']
     ValueItem: typeof import('./src/components/ValueItem/index.vue')['default']
   }
 }
diff --git a/src/components/CardBox/index.vue b/src/components/CardBox/index.vue
index 7eda82d6..fc942f65 100644
--- a/src/components/CardBox/index.vue
+++ b/src/components/CardBox/index.vue
@@ -60,7 +60,7 @@
         </div>
 
         <!-- 按钮 -->
-        <slot name="botton-tool">
+        <slot name="bottom-tool">
             <div v-if="showTool" class="card-tools">
                 <div
                     v-for="item in actions"
diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue
index 3747311c..9a623d59 100644
--- a/src/components/Table/index.vue
+++ b/src/components/Table/index.vue
@@ -1,68 +1,89 @@
 <template>
-    <div class="jtable-body">
-        <div class="jtable-body-header">
-            <div class="jtable-body-header-left">
-                <slot name="headerTitle"></slot>
-            </div>
-            <div class="jtable-body-header-right" v-if="!model">
-                <div class="jtable-setting-item" :class="[ModelEnum.CARD === _model ? 'active' : '']" @click="modelChange(ModelEnum.CARD)">
-                    <AppstoreOutlined />
+    <a-spin :spinning="loading">
+        <div class="jtable-body">
+            <div class="jtable-body-header">
+                <div class="jtable-body-header-left">
+                    <slot name="headerTitle"></slot>
                 </div>
-                <div class="jtable-setting-item" :class="[ModelEnum.TABLE === _model ? 'active' : '']" @click="modelChange(ModelEnum.TABLE)">
-                    <UnorderedListOutlined  />
+                <div class="jtable-body-header-right" v-if="!model">
+                    <div class="jtable-setting-item" :class="[ModelEnum.CARD === _model ? 'active' : '']" @click="modelChange(ModelEnum.CARD)">
+                        <AppstoreOutlined />
+                    </div>
+                    <div class="jtable-setting-item" :class="[ModelEnum.TABLE === _model ? 'active' : '']" @click="modelChange(ModelEnum.TABLE)">
+                        <UnorderedListOutlined  />
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="jtable-content">
-            <div v-if="_model === ModelEnum.CARD" class="jtable-card">
-                <div 
-                    v-if="dataSource.length"
-                    class="jtable-card-items"
-                    :style="{gridTemplateColumns: `repeat(${column}, 1fr)`}"
-                >
+            <div class="jtable-content">
+                <!-- <div class="jtable-alert">
+                    <a-alert message="Info Text" type="info" />
+                </div> -->
+                <div v-if="_model === ModelEnum.CARD" class="jtable-card">
                     <div 
-                        class="jtable-card-item" 
-                        v-for="(item, index) in dataSource" 
-                        :key="index"
+                        v-if="_dataSource.length"
+                        class="jtable-card-items"
+                        :style="{gridTemplateColumns: `repeat(${column}, 1fr)`}"
                     >
-                        <slot name="cardRender" :item="item" :index="index"></slot>
+                        <div 
+                            class="jtable-card-item" 
+                            v-for="(item, index) in _dataSource" 
+                            :key="index"
+                        >
+                            <CardBox :actions="actions" v-bind="cardProps">
+                                <template #img>
+                                    <slot name="img">
+                                        <img :src="getImage('/device-product.png')" />
+                                    </slot>
+                                </template>
+                                <template #content>
+                                    <slot name="cardContent" :item="item" :index="index"></slot>
+                                </template>
+                            </CardBox>
+                        </div>
+                    </div>
+                    <div v-else>
+                        <a-empty :image="Empty.PRESENTED_IMAGE_SIMPLE" />
                     </div>
                 </div>
                 <div v-else>
-                    <a-empty :image="Empty.PRESENTED_IMAGE_SIMPLE" />
+                    <a-table :rowSelection="rowSelection" :columns="[..._columns]" :dataSource="_dataSource" :pagination="false" :scroll="{ x: 1366 }">
+                        <template #bodyCell="{ column, record }">
+                            <template v-if="column.key === 'action'">
+                                <a-space>
+                                    <a-tooltip v-for="i in actions" :key="i.key" v-bind="i.tooltip">
+                                        <a-popconfirm v-if="i.popConfirm" v-bind="i.popConfirm">
+                                            <a>
+                                                {{i.text}}
+                                            </a>
+                                        </a-popconfirm>
+                                        <a v-else @click="i.onClick && i.onClick(record)">
+                                            {{i.text}}
+                                        </a>
+                                    </a-tooltip>
+                                </a-space>
+                            </template>
+                            <template v-else-if="column.scopedSlots">
+                               <slot :name="column.key" :row="record"></slot>
+                            </template>
+                        </template>
+                    </a-table>
                 </div>
             </div>
-            <div v-else>
-                <a-table {...props} :columns="[..._columns]" :dataSource="dataSource" :pagination="false" :scroll="{ x: 1366 }">
-                    <template #bodyCell="{ column, record }">
-                        <template v-if="column.key === 'action'">
-                            <a-space>
-                                <a-tooltip v-for="i in actions" :key="i.key" {...i.tooltip}>
-                                    <a-popconfirm v-if="i.popConfirm" {...i.popConfirm}>
-                                        <a>{{i.text}}</a>
-                                    </a-popconfirm>
-                                    <a v-else @click="i.onClick && i.onClick(record)">{{i.text}}</a>
-                                </a-tooltip>
-                            </a-space>
-                        </template>
-                    </template>
-                </a-table>
+            <div class="jtable-pagination" v-if="_dataSource.length && !noPagination">
+                <a-pagination
+                    size="small"
+                    :total="total"
+                    :showQuickJumper="false"
+                    :showSizeChanger="true"
+                    v-model:current="pageIndex"
+                    v-model:page-size="pageSize"
+                    :show-total="(total, range) => `第 ${range[0]} - ${range[1]} 条/总共 ${total} 条`"
+                    @change="pageChange"
+                    :page-size-options="[12, 24, 48, 60, 100]"
+                />
             </div>
         </div>
-        <div class="jtable-pagination" v-if="dataSource.length">
-            <a-pagination
-                size="small"
-                :total="total"
-                :showQuickJumper="false"
-                :showSizeChanger="true"
-                v-model:current="pageIndex"
-                v-model:page-size="pageSize"
-                :show-total="(total, range) => `第 ${range[0]} - ${range[1]} 条/总共 ${total} 条`"
-                @change="pageChange"
-                :page-size-options="[12, 24, 48, 60, 100]"
-            />
-        </div>
-    </div>
+    </a-spin>
 </template>
 
 <script setup lang="ts">
@@ -72,6 +93,7 @@ import type { TooltipProps } from 'ant-design-vue/es/tooltip'
 import type { PopconfirmProps } from 'ant-design-vue/es/popconfirm'
 import { Empty } from 'ant-design-vue'
 import { CSSProperties } from 'vue';
+import { getImage } from '@/utils/comm';
 
 enum ModelEnum {
     TABLE = 'TABLE',
@@ -91,17 +113,18 @@ type RequestData = {
 
 export interface ActionsType {
     key: string;
-    text: string;
+    text?: string;
     disabled?: boolean;
-    permission: boolean;
+    permission?: boolean;
     onClick?: (data: any) => void;
     style?: CSSProperties;
     tooltip?: TooltipProps;
-    popConfirm: PopconfirmProps
+    popConfirm?: PopconfirmProps;
+    icon?: string;
 }
 
 interface JTableProps extends TableProps{
-    request: (params: Record<string, any> & {
+    request?: (params: Record<string, any> & {
         pageSize: number;
         pageIndex: number;
     }) => Promise<Partial<RequestData>>;
@@ -112,10 +135,13 @@ interface JTableProps extends TableProps{
         pageIndex: number;
     };
     model?: keyof typeof ModelEnum | undefined; // 显示table还是card
-    actions?: ActionsType[]
+    actions?: ActionsType[];
+    noPagination?: boolean;
+    rowSelection?: TableProps['rowSelection'];
+    cardProps?:  Record<string, any>;
+    dataSource?:  Record<string, any>[];
 }
-// props和emit
-// const emit = defineEmits(["modelChange"]);
+// props
 const props = withDefaults(defineProps<JTableProps>(), {
     cardBodyClass: '',
     request: undefined,
@@ -125,45 +151,56 @@ const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE
 
 const _model = ref<keyof typeof ModelEnum>(props.model ? props.model : ModelEnum.CARD); // 模式切换
 const column = ref<number>(4);
-const dataSource = ref<Record<string, any>[]>([])
+const _dataSource = ref<Record<string, any>[]>([])
 const pageIndex = ref<number>(0)
 const pageSize = ref<number>(6)
 const total = ref<number>(0)
 const _columns = ref<Record<string, any>[]>([])
+const loading = ref<boolean>(true)
+// 
+// const slotColumns = computed(() => props.columns.filter((item) => item.scopedSlots))
 // 方法
-
 // 切换卡片和表格
 const modelChange = (type: keyof typeof ModelEnum) => {
     _model.value = type
 }
-
 // 请求数据
-const handleSearch = async (params1?: Record<string, any>) => {
+const handleSearch = async (_params?: Record<string, any>) => {
+    loading.value = true
+    if(props.request) {
     const resp = await props.request({
-        pageSize: 12,
-        pageIndex: 1,
-        ...params1
-    })
-    if(resp.status === 200){
-        dataSource.value = resp.result?.data || []
-        pageIndex.value = resp.result?.pageIndex || 0
-        pageSize.value = resp.result?.pageSize || 6
-        total.value = resp.result?.total || 0
+            pageSize: 12,
+            pageIndex: 1,
+            ..._params
+        })
+        if(resp.status === 200){
+            // 判断如果是最后一页且最后一页为空，就跳转到前一页
+            if(resp.result?.data?.length === 0 && resp.result.total && resp.result.pageSize && resp.result.pageIndex) {
+                handleSearch({
+                    ..._params,
+                    pageSize: pageSize.value,
+                    pageIndex: pageIndex.value - 1,
+                })
+            } else {
+                _dataSource.value = resp.result?.data || []
+                pageIndex.value = resp.result?.pageIndex || 0
+                pageSize.value = resp.result?.pageSize || 6
+                total.value = resp.result?.total || 0
+            }
+        }
+    } else {
+        _dataSource.value = props?.dataSource || []
     }
+    
+    loading.value = false
 }
 
 const pageChange = (page: number, size: number) => {
-    if(pageSize.value === size) {
-        handleSearch({
-            pageSize: size,
-            pageIndex: page,
-        })
-    } else {
-        handleSearch({
-            pageSize: size,
-            pageIndex: 1,
-        })
-    }
+    handleSearch({
+        ...props.params,
+        pageSize: size,
+        pageIndex: pageSize.value === size ? page : 1,
+    })
 }
 
 watchEffect(() => {
diff --git a/src/components/index.ts b/src/components/index.ts
index 7bcdd04e..d3daf534 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -3,7 +3,8 @@ import AIcon from './AIcon'
 import PermissionButton from './PermissionButton/index.vue'
 import JTable from './Table/index.vue'
 import TitleComponent from "./TitleComponent/index.vue";
-import Form from './Form'
+import Form from './Form';
+import CardBox from './CardBox/index.vue';
 
 export default  {
     install(app: App) {
@@ -12,5 +13,6 @@ export default  {
             .component('JTable', JTable)
             .component('TitleComponent', TitleComponent)
             .component('Form', Form)
+            .component('CardBox', CardBox)
     }
 }
diff --git a/src/views/demo/table/index.vue b/src/views/demo/table/index.vue
index 66db096e..c2986eb6 100644
--- a/src/views/demo/table/index.vue
+++ b/src/views/demo/table/index.vue
@@ -11,6 +11,7 @@
                     title: 'ID',
                     dataIndex: 'id',
                     key: 'id',
+                    scopedSlots: true
                 },
                 {
                     title: '分类',
@@ -20,16 +21,30 @@
             ]"
             :actions="actions"
             :request="request"
+            :rowSelection="rowSelection"
         >
             <template #headerTitle>
                 <a-button type="primary">新增</a-button>
             </template>
-            <template #cardRender="slotProps">
-                <CardBox :actions="actions">
-                    <template #content>
-                        {{slotProps.item.name}}
-                    </template>
-                </CardBox>
+            <template #cardContent="slotProps">
+                <h3>{{slotProps.item.name}}</h3>
+                <a-row>
+                    <a-col :span="12">
+                        <div class="card-item-content-text">
+                            设备类型
+                        </div>
+                        <div>直连设备</div>
+                    </a-col>
+                    <a-col :span="12">
+                        <div class="card-item-content-text">
+                            产品名称
+                        </div>
+                        <div>测试固定地址</div>
+                    </a-col>
+                </a-row>
+            </template>
+            <template #id="slotProps">
+                <a>{{slotProps.row.id}}</a>
             </template>
         </JTable>
     </div>
@@ -37,21 +52,44 @@
 
 <script setup lang="ts">
 import server from "@/utils/request";
-import CardBox from '@/components/CardBox/index.vue';
+import type { ActionsType } from '@/components/Table/index.vue'
+import { getImage } from '@/utils/comm';
+import type { TableProps, TableColumnType } from 'ant-design-vue';
 
 const request = (data: any) => server.post(`/device-product/_query`, data)
-const actions = [
+const actions: ActionsType[] = [
     {
         key: 'edit',
         // disabled: true,
-        text: "编辑"
+        text: "编辑",
+        tooltip: {
+            title: '编辑'
+        },
+        // component: <UnorderedListOutlined />
     },
     {
         key: 'delete',
         disabled: true,
-        text: "删除"
+        text: "删除",
+        tooltip: {
+            title: '删除'
+        },
+        popConfirm: {
+            title: '确认删除?'
+        }
     }
 ]
+
+const rowSelection: TableProps['rowSelection'] = {
+    onChange: (selectedRowKeys: string[], selectedRows: any[]) => {
+        console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+    },
+    getCheckboxProps: (record: any) => ({
+        disabled: record.name === 'Disabled User',
+        name: record.name,
+    }),
+};
+
 </script>
 
 

From 2436e8fa0d64e3d4270e096a96d3b2f3231b7683 Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Wed, 11 Jan 2023 14:41:16 +0800
Subject: [PATCH 06/13] =?UTF-8?q?update:=20api=E9=85=8D=E7=BD=AE=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               | 18 ++++--
 .../system/apiPage/components/LeftTree.vue    | 61 +++++++++++++------
 src/views/system/apiPage/index.d.ts           | 14 +++++
 src/views/system/apiPage/index.vue            | 28 ++++++++-
 4 files changed, 94 insertions(+), 27 deletions(-)
 create mode 100644 src/views/system/apiPage/index.d.ts

diff --git a/components.d.ts b/components.d.ts
index c6352220..e1d825a2 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -7,29 +7,39 @@ export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
+    ABadge: typeof import('ant-design-vue/es')['Badge']
     AButton: typeof import('ant-design-vue/es')['Button']
+    ACard: typeof import('ant-design-vue/es')['Card']
     ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
-    ACheckboxGroup: typeof import('ant-design-vue/es')['CheckboxGroup']
     ACol: typeof import('ant-design-vue/es')['Col']
-    ACollapse: typeof import('ant-design-vue/es')['Collapse']
-    ACollapsePanel: typeof import('ant-design-vue/es')['CollapsePanel']
+    ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
+    ADivider: typeof import('ant-design-vue/es')['Divider']
+    AEmpty: typeof import('ant-design-vue/es')['Empty']
     AForm: typeof import('ant-design-vue/es')['Form']
     AFormItem: typeof import('ant-design-vue/es')['FormItem']
     AInput: typeof import('ant-design-vue/es')['Input']
     AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
+    AInputPassword: typeof import('ant-design-vue/es')['InputPassword']
     AModal: typeof import('ant-design-vue/es')['Modal']
+    APagination: typeof import('ant-design-vue/es')['Pagination']
+    APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
     ARow: typeof import('ant-design-vue/es')['Row']
     ASelect: typeof import('ant-design-vue/es')['Select']
-    ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
     ASpin: typeof import('ant-design-vue/es')['Spin']
+    ATable: typeof import('ant-design-vue/es')['Table']
     ATooltip: typeof import('ant-design-vue/es')['Tooltip']
+    ATree: typeof import('ant-design-vue/es')['Tree']
     AUpload: typeof import('ant-design-vue/es')['Upload']
     BadgeStatus: typeof import('./src/components/BadgeStatus/index.vue')['default']
     CardBox: typeof import('./src/components/CardBox/index.vue')['default']
+    FormFormBuilder: typeof import('./src/components/Form/FormBuilder.vue')['default']
     GeoComponent: typeof import('./src/components/GeoComponent/index.vue')['default']
     MonacoEditor: typeof import('./src/components/MonacoEditor/index.vue')['default']
+    PermissionButton: typeof import('./src/components/PermissionButton/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
+    Table: typeof import('./src/components/Table/index.vue')['default']
+    TitleComponent: typeof import('./src/components/TitleComponent/index.vue')['default']
     ValueItem: typeof import('./src/components/ValueItem/index.vue')['default']
   }
 }
diff --git a/src/views/system/apiPage/components/LeftTree.vue b/src/views/system/apiPage/components/LeftTree.vue
index acdd1f5a..91f414d4 100644
--- a/src/views/system/apiPage/components/LeftTree.vue
+++ b/src/views/system/apiPage/components/LeftTree.vue
@@ -15,51 +15,62 @@
 import { TreeProps } from 'ant-design-vue';
 
 import { getTreeOne_api, getTreeTwo_api } from '@/api/system/apiPage';
+import { treeNodeTpye } from '../index';
 
-type treeNodeTpye = {
-    name: string;
-    url: string;
-    children?: treeNodeTpye[];
-};
 const emits = defineEmits(['select']);
 
-const treeData: TreeProps['treeData'] = ref([]);
+const treeData = ref<TreeProps['treeData']>([]);
 
 const getTreeData = () => {
     let tree: treeNodeTpye[] = [];
-    getTreeOne_api().then((resp) => {
-        tree = resp.urls.map((item) => ({
+    getTreeOne_api().then((resp: any) => {
+        tree = resp.urls.map((item: any) => ({
             ...item,
             key: item.url,
         }));
         const allPromise = tree.map((item) => getTreeTwo_api(item.name));
         Promise.all(allPromise).then((values) => {
-            values.forEach((item, i) => {
-                tree[i].children = combData(item.paths);
+            values.forEach((item: any, i) => {
+                tree[i].children = combData(item?.paths);
             });
-            console.log(tree);
-            treeData.value = tree
+            treeData.value = tree;
         });
     });
 };
-const clickSelectItem = (key, { node }) => {
-    emits('select', node);
+const clickSelectItem: TreeProps['onSelect'] = (key, node: any) => {
+    emits('select', node.node.dataRef);
 };
 
 onMounted(() => {
     getTreeData();
 });
 
-const combData = (dataSource: object): object[] => {
-    const apiList: object[] = [];
+const combData = (dataSource: object) => {
+    const apiList: treeNodeTpye[] = [];
     const keys = Object.keys(dataSource);
 
     keys.forEach((key) => {
         const method = Object.keys(dataSource[key] || {})[0];
         const name = dataSource[key][method].tags[0];
-        let apiObj = apiList.find((item) => item.name === name);
-        if (!apiObj) {
-            apiObj = { name, link: key, methods: dataSource[key], key };
+        let apiObj: treeNodeTpye | undefined = apiList.find(
+            (item) => item.name === name,
+        );
+        if (apiObj) {
+            apiObj.apiList?.push({
+                url: key,
+                method: dataSource[key],
+            });
+        } else {
+            apiObj = {
+                name,
+                key: name,
+                apiList: [
+                    {
+                        url: key,
+                        method: dataSource[key],
+                    },
+                ],
+            };
             apiList.push(apiObj);
         }
     });
@@ -68,4 +79,14 @@ const combData = (dataSource: object): object[] => {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less">
+.left-tree-container {
+    .ant-tree-list {
+        .ant-tree-list-holder-inner {
+            .ant-tree-switcher-noop {
+                display: none !important;
+            }
+        }
+    }
+}
+</style>
diff --git a/src/views/system/apiPage/index.d.ts b/src/views/system/apiPage/index.d.ts
new file mode 100644
index 00000000..e0155dde
--- /dev/null
+++ b/src/views/system/apiPage/index.d.ts
@@ -0,0 +1,14 @@
+export type treeNodeTpye = {
+    name: string;
+    key: string;
+    link?: string;
+    apiList?: object[];
+    children?: treeNodeTpye[];
+};
+export type methodType = {
+    [key:string]: object
+}
+export type apiObjType = {
+    url: string,
+    method: methodType
+}
\ No newline at end of file
diff --git a/src/views/system/apiPage/index.vue b/src/views/system/apiPage/index.vue
index 92339a94..6cc516ba 100644
--- a/src/views/system/apiPage/index.vue
+++ b/src/views/system/apiPage/index.vue
@@ -1,15 +1,37 @@
 <template>
-    <a-card class="api-page-container" >
-        <LeftTree />
+    <a-card class="api-page-container">
+        <LeftTree @select="treeSelect" />
+
+        
     </a-card>
 </template>
 
 <script setup lang="ts">
 import LeftTree from './components/LeftTree.vue';
+import { treeNodeTpye, apiObjType } from './index';
+
+const tableData = ref([]);
+const treeSelect = (node: treeNodeTpye) => {
+    const apiList: apiObjType[] = node.apiList as apiObjType[];
+    const table: any = [];
+    // 将对象形式的数据转换为表格需要的形式
+    apiList?.forEach((apiItem) => {
+        const { method, url } = apiItem;
+        for (const key in method) {
+            if (Object.prototype.hasOwnProperty.call(method, key)) {
+                table.push({
+                    ...method[key],
+                    url,
+                });
+            }
+        }
+    });
+    tableData.value = table;
+};
 </script>
 
 <style scoped>
 .api-page-container {
     height: 100%;
 }
-</style>
\ No newline at end of file
+</style>

From bf493c3a96c762d5bccfba4502fdaacb4ed0fd0a Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Wed, 11 Jan 2023 16:06:06 +0800
Subject: [PATCH 07/13] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84FormBuilder?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                        |  17 ++
 src/components/Form/FormBuilder.vue    | 251 ++++++++++++++++++++++++-
 src/components/Form/index.modules.d.ts |  40 ++++
 src/components/Form/index.ts           |   1 +
 src/components/Form/util.ts            |  15 ++
 src/style.css                          |   4 +
 src/views/demo/Form.vue                |  54 +++++-
 7 files changed, 376 insertions(+), 6 deletions(-)
 create mode 100644 src/components/Form/index.modules.d.ts
 create mode 100644 src/components/Form/util.ts

diff --git a/components.d.ts b/components.d.ts
index 7c068950..d63a4b41 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -8,8 +8,25 @@ export {}
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
     AButton: typeof import('ant-design-vue/es')['Button']
+    ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
+    ACheckboxGroup: typeof import('ant-design-vue/es')['CheckboxGroup']
+    ACol: typeof import('ant-design-vue/es')['Col']
+    ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
+    ADivider: typeof import('ant-design-vue/es')['Divider']
+    AForm: typeof import('ant-design-vue/es')['Form']
+    AFormItem: typeof import('ant-design-vue/es')['FormItem']
+    AInput: typeof import('ant-design-vue/es')['Input']
+    AInputPassword: typeof import('ant-design-vue/es')['InputPassword']
     APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
+    ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
+    ARow: typeof import('ant-design-vue/es')['Row']
+    ASelect: typeof import('ant-design-vue/es')['Select']
+    ASpin: typeof import('ant-design-vue/es')['Spin']
+    ASwitch: typeof import('ant-design-vue/es')['Switch']
+    ATimePicker: typeof import('ant-design-vue/es')['TimePicker']
     ATooltip: typeof import('ant-design-vue/es')['Tooltip']
+    ATreeSelect: typeof import('ant-design-vue/es')['TreeSelect']
+    AUpload: typeof import('ant-design-vue/es')['Upload']
     BadgeStatus: typeof import('./src/components/BadgeStatus/index.vue')['default']
     CardBox: typeof import('./src/components/CardBox/index.vue')['default']
     FormFormBuilder: typeof import('./src/components/Form/FormBuilder.vue')['default']
diff --git a/src/components/Form/FormBuilder.vue b/src/components/Form/FormBuilder.vue
index d1a74645..6de34440 100644
--- a/src/components/Form/FormBuilder.vue
+++ b/src/components/Form/FormBuilder.vue
@@ -1,11 +1,254 @@
 <template>
-  <div class=''>
-
+  <div class='JForm-content'>
+    <a-form
+      v-bind='props'
+      :model='formData.data'
+      layout='vertical'
+    >
+      <a-row :type='rowType'>
+        <a-col v-for='item in formOptions.data' :key='item.key' :span='item.span'>
+          <a-form-item
+            :name='item.name'
+            :required='item.required'
+            :rules='item.rules'
+            :noStyle='item.noStyle'
+          >
+            <template #label>
+              <span>{{ item.title }}</span>
+              <a-tooltip :title='item.tooltip'>
+                <QuestionCircleOutlined v-if='!!item.tooltip' style='margin-left: 4px; color: rgba(0,0,0,.45) ' />
+              </a-tooltip>
+            </template>
+            <a-input
+              v-if='item.component === componentType.input'
+              v-bind='item.componentProps'
+              v-model:value='formData.data[item.name]'
+            />
+            <a-select
+              v-else-if='item.component === componentType.select'
+              v-bind='item.componentProps'
+              v-model:value='formData.data[item.name]'
+              :options='item.options'
+            />
+            <a-inputnumber
+              v-else-if='item.component === componentType.inputNumber'
+              v-bind='item.componentProps'
+              v-model:value='formData.data[item.name]'
+            />
+            <a-input-password
+              v-else-if='item.component === componentType.password'
+              v-bind='item.componentProps'
+              v-model:value='formData.data[item.name]'
+            />
+            <a-switch
+              v-else-if='item.component === componentType.switch'
+              v-bind='item.componentProps'
+              v-model:checked='formData.data[item.name]'
+            />
+            <a-radio-group
+              v-else-if='item.component === componentType.radio'
+              v-bind='item.componentProps'
+              v-model:value='formData.data[item.name]'
+            />
+            <a-checkbox-group
+              v-else-if='item.component === componentType.checkbox'
+              v-bind='item.componentProps'
+              v-model:value='formData.data[item.name]'
+              :options='item.options'
+            />
+            <a-time-picker
+              v-else-if='item.component === componentType.time'
+              v-bind='item.componentProps'
+              v-model:value='formData.data[item.name]'
+            />
+            <a-date-picker
+              v-else-if='item.component === componentType.date'
+              v-bind='item.componentProps'
+              v-model:value='formData.data[item.name]'
+            />
+            <a-tree-select
+              v-else-if='item.component === componentType.tree'
+              v-bind='item.componentProps'
+              v-model:value='formData.data[item.name]'
+              :tree-data='item.options'
+            />
+            <a-upload
+              v-else-if='item.component === componentType.upload'
+              v-bind='item.componentProps'
+              v-model:value='formData.data[item.name]'
+            />
+            <component
+              v-else
+              :is='item.component'
+              v-bind='item.componentProps'
+              v-model:value='formData.data[item.name]'
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
   </div>
 </template>
 
-<script setup type='ts' name='FormBuilder'>
-const data = reactive({})
+<script setup lang='ts' name='FormBuilder'>
+import type { Options, OptionsItem, OptionsComponent } from './index.modules'
+import { PropType } from 'vue'
+import { get, isArray, isString, pick, set } from 'lodash-es'
+import { formProps } from 'ant-design-vue/es/form'
+import { Form } from 'ant-design-vue';
+import componentType from './util'
+import {
+  QuestionCircleOutlined
+} from '@ant-design/icons-vue';
+
+const useform = Form.useForm;
+
+const props = defineProps({
+  ...formProps,
+  options: {
+    type: Object as PropType<Options>,
+    default: () => []
+  },
+  initValue: {
+    type: Object,
+    default: () => ({})
+  },
+  column: {
+    type: Number,
+    default: 1
+  }
+})
+
+// 表单数据
+const formData = reactive({
+  data: {}
+})
+
+const formOptions = reactive<{ data: OptionsComponent[]}>({
+  data: []
+}) // 表单Item
+
+const { resetFields, validate} = useform(formData, props.rules)
+
+const rowType = ref<string | undefined>(undefined)
+
+const calculateItemSpan = (span?: number | string) => {
+  const itemSpan = 24 / props.column
+  if (!span) return itemSpan
+
+  if (isString(span) && span.includes('px')) {
+    rowType.value = 'flex'
+  } else {
+    return span
+  }
+}
+
+/**
+ * 根据传入的表单options生成表单
+ * @param data {Options}
+ * @param parentKey
+ */
+const handleFormData = (data: Options, parentKey: Array<string> = []): any => {
+  const cacheModel: any = {}
+
+  Object.keys(data).forEach(async (key) => {
+    const optionItem = data[key]
+    const _key = [...parentKey, key]
+    if ('type' in optionItem && optionItem.type === 'Object') {
+      const dataModel = handleFormData(optionItem.properties, _key)
+      cacheModel[key] = dataModel
+    } else if (!('visible' in optionItem) || ('visible' in optionItem && optionItem.visible !== true)){
+      // 处理默认值以及原始值
+      const keyValue = get(formData.data, _key)
+      let _options: any[] = []
+
+      if (keyValue) { // 当前值在formModel中
+        cacheModel[key] = keyValue
+      } else {
+        cacheModel[key] = (optionItem as OptionsItem).default
+      }
+      // 处理options
+      if ('options' in optionItem) {
+        _options = optionItem.options!
+      }
+      // 处理 onSearch 请求
+      if ('onSearch' in optionItem) {
+        const data = await optionItem.onSearch!()
+        if (data) {
+          _options = data
+        }
+      }
+      const optionsItemProps = pick(optionItem, ['componentProps', 'title', 'component', 'rules', 'required', 'hidden', 'tooltip', 'noStyle'])
+      //
+      formOptions.data.push({
+        ...optionsItemProps,
+        name: _key,
+        options: _options,
+        key: isArray(_key) ? _key.toString() : _key,
+        span: calculateItemSpan((optionItem as OptionsItem).span)
+      })
+    }
+  })
+  return cacheModel
+}
+
+/**
+ * 重置表单
+ */
+const resetModel = () => {
+  resetFields()
+}
+
+/**
+ * 验证并提交表单
+ */
+const formValidate = () => {
+  return new Promise((res, rej) => {
+    validate().then(data => {
+      res(formData.data)
+    }).catch(err => {
+      rej(err)
+    })
+  })
+}
+/**
+ * 改变单个值
+ */
+const setItemValue = (key: string | (string | number)[], value: any) => {
+  set(formData.data, key, value)
+}
+
+/**
+ * 修改整个表单值
+ * @param data
+ */
+const setData = (data: any) => {
+  formData.data = data
+}
+
+
+if (props.initValue) {
+  formData.data = props.initValue
+}
+
+formData.data = handleFormData(props.options)
+
+watch(props.options, (newValue: any) => {
+  formOptions.data = []
+  formData.data = handleFormData(newValue)
+})
+
+watch(props.initValue, (newValue: any) => {
+  formData.data = newValue
+})
+
+defineExpose({
+  resetModel,
+  formValidate,
+  setItemValue,
+  setData
+})
+
 </script>
 
 <style scoped>
diff --git a/src/components/Form/index.modules.d.ts b/src/components/Form/index.modules.d.ts
new file mode 100644
index 00000000..fd4eabaa
--- /dev/null
+++ b/src/components/Form/index.modules.d.ts
@@ -0,0 +1,40 @@
+import type { FormProps } from 'ant-design-vue/es/form'
+
+export interface OptionsComponent {
+  /** FormItem title **/
+  title?: string
+  /** 组件名称 **/
+  component?: string
+  /** 组件Props **/
+  componentProps?: any
+  /** 组件Options **/
+  options?: any[]
+  name?: any
+  [name: string]: any
+}
+
+export interface OptionsItem extends OptionsComponent{
+  /** 内置查询，会覆盖options **/
+  onSearch?: () => Promise<any>
+  default?: any
+  /** 隐藏Item，值不会进入到FormModel中 **/
+  visible?: boolean
+  /** 表单隐藏域 **/
+  hidden?: boolean,
+  span?: number | string
+  rules?: FormProps.rules
+  required?: boolean
+  tooltip?: string
+  noStyle?: boolean
+}
+
+interface ObjectTypes {
+  type: 'Object'
+  properties: {
+    [name: string]: OptionsItem
+  }
+}
+
+export interface Options extends FormProps {
+  [name: string]: ObjectTypes | OptionsItem
+}
\ No newline at end of file
diff --git a/src/components/Form/index.ts b/src/components/Form/index.ts
index 1ae62176..8a209d84 100644
--- a/src/components/Form/index.ts
+++ b/src/components/Form/index.ts
@@ -1,3 +1,4 @@
 import FormBuilder from './FormBuilder.vue'
+export { default as componentType } from './util'
 
 export default FormBuilder
\ No newline at end of file
diff --git a/src/components/Form/util.ts b/src/components/Form/util.ts
new file mode 100644
index 00000000..b0374175
--- /dev/null
+++ b/src/components/Form/util.ts
@@ -0,0 +1,15 @@
+const optionComponentType = {
+  input: 'input',
+  inputNumber: 'inputNumber',
+  password: 'password',
+  switch: 'switch',
+  radio: 'radio',
+  checkbox: 'checkbox',
+  time: 'time',
+  date: 'date',
+  treeSelect: 'treeSelect',
+  upload: 'upload',
+  tree: 'tree',
+  select: 'select'
+}
+export default optionComponentType
\ No newline at end of file
diff --git a/src/style.css b/src/style.css
index e69de29b..30cdc6c2 100644
--- a/src/style.css
+++ b/src/style.css
@@ -0,0 +1,4 @@
+.ant-form-item-required:before {
+    position: absolute;
+    right: -12px;
+}
\ No newline at end of file
diff --git a/src/views/demo/Form.vue b/src/views/demo/Form.vue
index 1f48bc29..cd585a77 100644
--- a/src/views/demo/Form.vue
+++ b/src/views/demo/Form.vue
@@ -1,9 +1,59 @@
 <template>
-  <Form />
+  <Form
+    ref='form'
+    :options='options'
+    :initValue='initValue'
+  />
+  <a-button @click='submit'>提交</a-button>
+  <a-button @click='reset'>重置</a-button>
+  <a-button @click='setValue'>修改name</a-button>
 </template>
 
 <script setup name='FormDemo'>
-const data = reactive({})
+import { componentType } from 'components/Form'
+const form = ref()
+const initValue = reactive({})
+
+const submit = () => {
+  form.value.formValidate().then(res => {
+    console.log(res)
+  })
+}
+
+const reset = () => {
+
+}
+
+const setValue =() => {
+  initValue.name = '111111'
+}
+
+const options = reactive({
+  name: {
+    component: componentType.input,
+    componentProps: {
+      style: {
+        width: '200px'
+      }
+    },
+    title: '测试',
+    required: true
+  },
+  sex: {
+    component: componentType.select,
+    title: '性别',
+    options: [
+      { label: '111', value: 1 },
+      { label: '222', value: 2 },
+    ],
+    required: true,
+    rules: [
+      { required: true, message: '请选择性别'}
+    ],
+    tooltip: '性别',
+    default: 1
+  }
+})
 </script>
 
 <style scoped>

From e2e12cd5c52204d7712265c794641c712424cb63 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Wed, 11 Jan 2023 16:10:58 +0800
Subject: [PATCH 08/13] =?UTF-8?q?update:=20=E4=BC=98=E5=8C=96FormBuilder?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/FormBuilder.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/Form/FormBuilder.vue b/src/components/Form/FormBuilder.vue
index 6de34440..cac91d0a 100644
--- a/src/components/Form/FormBuilder.vue
+++ b/src/components/Form/FormBuilder.vue
@@ -1,6 +1,7 @@
 <template>
   <div class='JForm-content'>
     <a-form
+      ref='form'
       v-bind='props'
       :model='formData.data'
       layout='vertical'
@@ -95,13 +96,12 @@ import type { Options, OptionsItem, OptionsComponent } from './index.modules'
 import { PropType } from 'vue'
 import { get, isArray, isString, pick, set } from 'lodash-es'
 import { formProps } from 'ant-design-vue/es/form'
-import { Form } from 'ant-design-vue';
 import componentType from './util'
 import {
   QuestionCircleOutlined
 } from '@ant-design/icons-vue';
 
-const useform = Form.useForm;
+const form = ref()
 
 const props = defineProps({
   ...formProps,
@@ -128,8 +128,6 @@ const formOptions = reactive<{ data: OptionsComponent[]}>({
   data: []
 }) // 表单Item
 
-const { resetFields, validate} = useform(formData, props.rules)
-
 const rowType = ref<string | undefined>(undefined)
 
 const calculateItemSpan = (span?: number | string) => {
@@ -196,7 +194,7 @@ const handleFormData = (data: Options, parentKey: Array<string> = []): any => {
  * 重置表单
  */
 const resetModel = () => {
-  resetFields()
+  form.value.resetFields()
 }
 
 /**
@@ -204,9 +202,9 @@ const resetModel = () => {
  */
 const formValidate = () => {
   return new Promise((res, rej) => {
-    validate().then(data => {
+    form.value.validate().then(() => {
       res(formData.data)
-    }).catch(err => {
+    }).catch((err: any) => {
       rej(err)
     })
   })

From f687ca0fadb6ba648d3f74e461927dd38c165d33 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Wed, 11 Jan 2023 16:38:57 +0800
Subject: [PATCH 09/13] =?UTF-8?q?fix:=20=E5=8D=95=E7=82=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                         | 13 +++++++++++++
 src/api/bind.ts                         |  6 ++++--
 src/views/account/Center/bind/index.vue |  4 +++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index c6352220..0dbd0e99 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -7,29 +7,42 @@ export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
+    ABadge: typeof import('ant-design-vue/es')['Badge']
     AButton: typeof import('ant-design-vue/es')['Button']
+    ACard: typeof import('ant-design-vue/es')['Card']
     ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
     ACheckboxGroup: typeof import('ant-design-vue/es')['CheckboxGroup']
     ACol: typeof import('ant-design-vue/es')['Col']
     ACollapse: typeof import('ant-design-vue/es')['Collapse']
     ACollapsePanel: typeof import('ant-design-vue/es')['CollapsePanel']
+    ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
+    ADivider: typeof import('ant-design-vue/es')['Divider']
+    AEmpty: typeof import('ant-design-vue/es')['Empty']
     AForm: typeof import('ant-design-vue/es')['Form']
     AFormItem: typeof import('ant-design-vue/es')['FormItem']
     AInput: typeof import('ant-design-vue/es')['Input']
     AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
+    AInputPassword: typeof import('ant-design-vue/es')['InputPassword']
     AModal: typeof import('ant-design-vue/es')['Modal']
+    APagination: typeof import('ant-design-vue/es')['Pagination']
+    APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
     ARow: typeof import('ant-design-vue/es')['Row']
     ASelect: typeof import('ant-design-vue/es')['Select']
     ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
     ASpin: typeof import('ant-design-vue/es')['Spin']
+    ATable: typeof import('ant-design-vue/es')['Table']
     ATooltip: typeof import('ant-design-vue/es')['Tooltip']
     AUpload: typeof import('ant-design-vue/es')['Upload']
     BadgeStatus: typeof import('./src/components/BadgeStatus/index.vue')['default']
     CardBox: typeof import('./src/components/CardBox/index.vue')['default']
+    FormFormBuilder: typeof import('./src/components/Form/FormBuilder.vue')['default']
     GeoComponent: typeof import('./src/components/GeoComponent/index.vue')['default']
     MonacoEditor: typeof import('./src/components/MonacoEditor/index.vue')['default']
+    PermissionButton: typeof import('./src/components/PermissionButton/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
+    Table: typeof import('./src/components/Table/index.vue')['default']
+    TitleComponent: typeof import('./src/components/TitleComponent/index.vue')['default']
     ValueItem: typeof import('./src/components/ValueItem/index.vue')['default']
   }
 }
diff --git a/src/api/bind.ts b/src/api/bind.ts
index 88d88594..16766b81 100644
--- a/src/api/bind.ts
+++ b/src/api/bind.ts
@@ -1,4 +1,6 @@
-import { get } from '@/utils/request'
+import { get, post } from '@/utils/request'
 
 // 三方应用账户信息
-export const applicationInfo = (code: string) => get(`/application/sso/bind-code/${code}`)
\ No newline at end of file
+export const applicationInfo = (code: string): any => get(`/application/sso/bind-code/${code}`)
+// 立即绑定
+export const bindAccount = (code: string): any => post(`/application/sso/me/bind/${code}`)
\ No newline at end of file
diff --git a/src/views/account/Center/bind/index.vue b/src/views/account/Center/bind/index.vue
index 2f134ab1..2344c4a0 100644
--- a/src/views/account/Center/bind/index.vue
+++ b/src/views/account/Center/bind/index.vue
@@ -120,7 +120,9 @@ interface formData {
 
 // 三方应用信息
 const getAppInfo = async () => {
-    const code: string = '73ab60c88979a1475963a5dde31e374b';
+    // const code: string = '73ab60c88979a1475963a5dde31e374b';
+    const url = new URLSearchParams(window.location.href);
+    const code = url.get('code') as string;
     const res = await applicationInfo(code);
     console.log('getAppInfo: ', res);
 };

From 0f7cc7d9ec18e490376ac18441f32ccaf2dfd1aa Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Wed, 11 Jan 2023 18:07:10 +0800
Subject: [PATCH 10/13] =?UTF-8?q?fix:=20=E5=8D=95=E7=82=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                         |   5 +-
 src/views/account/Center/bind/index.vue | 108 ++++++++++++++++++------
 2 files changed, 84 insertions(+), 29 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index e30d186c..3832179f 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -16,13 +16,12 @@ declare module '@vue/runtime-core' {
     ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
     ADivider: typeof import('ant-design-vue/es')['Divider']
     AEmpty: typeof import('ant-design-vue/es')['Empty']
-    ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
-    ADivider: typeof import('ant-design-vue/es')['Divider']
-    AEmpty: typeof import('ant-design-vue/es')['Empty']
     AForm: typeof import('ant-design-vue/es')['Form']
     AFormItem: typeof import('ant-design-vue/es')['FormItem']
     AInput: typeof import('ant-design-vue/es')['Input']
+    AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
     AInputPassword: typeof import('ant-design-vue/es')['InputPassword']
+    AModal: typeof import('ant-design-vue/es')['Modal']
     APagination: typeof import('ant-design-vue/es')['Pagination']
     APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
     ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
diff --git a/src/views/account/Center/bind/index.vue b/src/views/account/Center/bind/index.vue
index 2344c4a0..a564e14a 100644
--- a/src/views/account/Center/bind/index.vue
+++ b/src/views/account/Center/bind/index.vue
@@ -4,7 +4,7 @@
         <div class="content">
             <div class="title">第三方账户绑定</div>
             <!-- 已登录-绑定三方账号 -->
-            <template v-if="false">
+            <template v-if="!token">
                 <div class="info">
                     <a-card style="width: 280px">
                         <template #title>
@@ -28,14 +28,21 @@
                             </div>
                         </template>
                         <div class="info-body">
-                            <img :src="getImage('/bind/wechat-webapp.png')" />
+                            <img
+                                :src="
+                                    accountInfo?.avatar ||
+                                    getImage('/bind/wechat-webapp.png')
+                                "
+                            />
                             <p>用户名：-</p>
-                            <p>名称：微信昵称</p>
+                            <p>名称：{{ accountInfo?.name || '-' }}</p>
                         </div>
                     </a-card>
                 </div>
                 <div class="btn">
-                    <a-button type="primary">立即绑定</a-button>
+                    <a-button type="primary" @click="handleBind"
+                        >立即绑定</a-button
+                    >
                 </div>
             </template>
             <!-- 未登录-绑定三方账号 -->
@@ -74,23 +81,25 @@
                             </a-form-item>
                             <a-form-item
                                 label="验证码"
-                                v-bind="validateInfos.captcha"
+                                v-bind="validateInfos.verifyCode"
                             >
                                 <a-input
-                                    v-model:value="formData.captcha"
+                                    v-model:value="formData.verifyCode"
                                     placeholder="请输入验证码"
                                 >
                                     <template #addonAfter>
-                                        <span style="cursor: pointer">
-                                            图形验证码
-                                        </span>
+                                        <img
+                                            :src="captcha.base64"
+                                            @click="getCode"
+                                            style="cursor: pointer"
+                                        />
                                     </template>
                                 </a-input>
                             </a-form-item>
                             <a-form-item>
                                 <a-button
                                     type="primary"
-                                    @click="handleSubmit"
+                                    @click="handleLoginBind"
                                     style="width: 100%"
                                 >
                                     登录并绑定账户
@@ -105,34 +114,58 @@
 </template>
 
 <script setup lang="ts">
-import { getImage } from '@/utils/comm';
+import { getImage, LocalStore } from '@/utils/comm';
+import { TOKEN_KEY } from '@/utils/variable';
 import { Form } from 'ant-design-vue';
+import { message } from 'ant-design-vue';
 
-import { applicationInfo } from '@/api/bind';
+import { applicationInfo, bindAccount } from '@/api/bind';
+import { code, authLogin } from '@/api/login';
 
 const useForm = Form.useForm;
 
 interface formData {
     username: string;
     password: string;
-    captcha: string;
+    verifyCode: string;
 }
 
-// 三方应用信息
-const getAppInfo = async () => {
-    // const code: string = '73ab60c88979a1475963a5dde31e374b';
+const token = computed(() => LocalStore.get(TOKEN_KEY));
+
+// 已登录直接绑定
+const getUrlCode = () => {
     const url = new URLSearchParams(window.location.href);
-    const code = url.get('code') as string;
+    return url.get('code') as string;
+};
+// 三方应用信息
+const accountInfo = ref({
+    avatar: '',
+    name: '',
+});
+const getAppInfo = async () => {
+    const code = getUrlCode();
     const res = await applicationInfo(code);
-    console.log('getAppInfo: ', res);
+    accountInfo.value = res?.result?.result;
 };
 getAppInfo();
 
-// 登录表单
+/**
+ * 立即绑定
+ */
+const handleBind = async () => {
+    const code = getUrlCode();
+    const res = await bindAccount(code);
+    console.log('bindAccount: ', res);
+    message.success('绑定成功');
+    goRedirect();
+    setTimeout(() => window.close(), 1000);
+};
+
+// 未登录-先登录再绑定
 const formData = ref<formData>({
     username: '',
     password: '',
-    captcha: '',
+    verifyCode: '',
 });
 const formRules = ref({
     username: [
@@ -147,7 +180,7 @@ const formRules = ref({
             message: '请输入密码',
         },
     ],
-    captcha: [
+    verifyCode: [
         {
             required: true,
             message: '请输入验证码',
@@ -160,17 +193,40 @@ const { resetFields, validate, validateInfos } = useForm(
     formRules.value,
 );
 
+/**
+ * 获取图形验证码
+ */
+const captcha = ref({
+    base64: '',
+    key: '',
+});
+const getCode = async () => {
+    const res: any = await code();
+    captcha.value = res.result;
+};
+getCode();
+
 /**
  * 登录并绑定账户
  */
-const handleSubmit = () => {
+const handleLoginBind = () => {
     validate()
-        .then(() => {
-            console.log('toRaw:', toRaw(formData.value));
-            console.log('formData.value:', formData.value);
+        .then(async () => {
+            const code = getUrlCode();
+            const params = {
+                ...formData.value,
+                verifyKey: captcha.value.key,
+                bindCode: code,
+                expires: 3600000,
+            };
+            const res = await authLogin(params);
+            console.log('res: ', res);
+            message.success('登录成功');
+            goRedirect();
+            setTimeout(() => window.close(), 1000);
         })
         .catch((err) => {
-            console.log('error', err);
+            getCode();
         });
 };
 

From ffc55b91e034184572e73009c7ce3556aa010444 Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Wed, 11 Jan 2023 18:11:56 +0800
Subject: [PATCH 11/13] =?UTF-8?q?update:=20api=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |   2 +
 .../components/dialogs/FuncTestDialog.vue     |  28 ++--
 .../system/apiPage/components/ApiDoes.vue     | 139 ++++++++++++++++++
 .../system/apiPage/components/ApiTest.vue     |  42 ++++++
 .../system/apiPage/components/ChooseApi.vue   |  65 ++++++++
 .../system/apiPage/components/InputCard.vue   |  35 +++++
 .../system/apiPage/components/LeftTree.vue    |   3 +
 src/views/system/apiPage/index.d.ts           |  10 +-
 src/views/system/apiPage/index.vue            |  49 +++++-
 9 files changed, 349 insertions(+), 24 deletions(-)
 create mode 100644 src/views/system/apiPage/components/ApiDoes.vue
 create mode 100644 src/views/system/apiPage/components/ApiTest.vue
 create mode 100644 src/views/system/apiPage/components/ChooseApi.vue
 create mode 100644 src/views/system/apiPage/components/InputCard.vue

diff --git a/components.d.ts b/components.d.ts
index 99521201..cd75d7f2 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -28,6 +28,8 @@ declare module '@vue/runtime-core' {
     ASpace: typeof import('ant-design-vue/es')['Space']
     ASpin: typeof import('ant-design-vue/es')['Spin']
     ATable: typeof import('ant-design-vue/es')['Table']
+    ATabPane: typeof import('ant-design-vue/es')['TabPane']
+    ATabs: typeof import('ant-design-vue/es')['Tabs']
     ATooltip: typeof import('ant-design-vue/es')['Tooltip']
     ATree: typeof import('ant-design-vue/es')['Tree']
     AUpload: typeof import('ant-design-vue/es')['Upload']
diff --git a/src/views/home/components/dialogs/FuncTestDialog.vue b/src/views/home/components/dialogs/FuncTestDialog.vue
index 3866a107..dc7f1b62 100644
--- a/src/views/home/components/dialogs/FuncTestDialog.vue
+++ b/src/views/home/components/dialogs/FuncTestDialog.vue
@@ -30,18 +30,10 @@
                 重置
             </a-button>
         </div>
-        <a-table
-            :columns="columns"
-            :data-source="tableData"
-            :row-selection="{
-                onChange: (selectedRowKeys, selectedRows) =>
-                    (selectItem = selectedRows),
-                type: 'radio',
-            }"
-        >
-        </a-table>
+        <JTable :columns="columns"> 
+            
+        </JTable>
 
-        
         <template #footer>
             <a-button key="back" @click="visible = false">取消</a-button>
             <a-button key="submit" type="primary" @click="handleOk"
@@ -90,9 +82,7 @@ const productList = ref<[productItem] | []>([]);
 const getOptions = () => {
     productList.value = [];
 };
-const clickSearch = ()=>{
-
-}
+const clickSearch = () => {};
 const clickReset = () => {
     Object.entries(form.value).forEach(([prop]) => {
         form.value[prop] = '';
@@ -102,27 +92,27 @@ const clickReset = () => {
 // 表格部分
 const columns = [
     {
-        name: 'deviceId',
+        title: '设备Id',
         dataIndex: 'deviceId',
         key: 'deviceId',
     },
     {
-        name: 'deviceName',
+        title: '设备名称',
         dataIndex: 'deviceName',
         key: 'deviceName',
     },
     {
-        name: 'productName',
+        title: '产品名称',
         dataIndex: 'productName',
         key: 'productName',
     },
     {
-        name: 'createTime',
+        title: '注册时间',
         dataIndex: 'createTime',
         key: 'createTime',
     },
     {
-        name: 'status',
+        title: '状态',
         dataIndex: 'status',
         key: 'status',
     },
diff --git a/src/views/system/apiPage/components/ApiDoes.vue b/src/views/system/apiPage/components/ApiDoes.vue
new file mode 100644
index 00000000..a894042d
--- /dev/null
+++ b/src/views/system/apiPage/components/ApiDoes.vue
@@ -0,0 +1,139 @@
+<template>
+    <div class="api-does-container">
+        <div class="top">
+            <h5>{{ selectApi.summary }}</h5>
+            <div class="input">
+                <InputCard :value="selectApi.method" />
+                <a-input :value="selectApi?.url" disabled />
+            </div>
+        </div>
+
+        <p style="display: flex; justify-content: space-between">
+            <span class="label">请求数据类型</span>
+            <span class="value">{{
+                getContent(selectApi.requestBody) ||
+                'application/x-www-form-urlencoded'
+            }}</span>
+            <span class="label">响应数据类型</span>
+            <span class="value">{{ `["/"]` }}</span>
+        </p>
+
+        <div class="api-card">
+            <h5>请求参数</h5>
+            <div class="content">
+                <JTable
+                    :columns="columns.request"
+                    :dataSource="selectApi.parameters"
+                    noPagination
+                    model="TABLE"
+                >
+                    <template #required="slotProps">
+                        <span>{{ slotProps.row.required + '' }}</span>
+                    </template>
+                    <template #type="slotProps">
+                        <span>{{ slotProps.row.schema.type }}</span>
+                    </template>
+                </JTable>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { apiDetailsType } from '../index';
+import InputCard from './InputCard.vue';
+import { PropType } from 'vue';
+
+const props = defineProps({
+    selectApi: {
+        type: Object as PropType<apiDetailsType>,
+        required: true,
+    },
+});
+const { selectApi } = toRefs(props);
+
+const columns = {
+    request: [
+        {
+            title: '参数名',
+            dataIndex: 'name',
+            key: 'name',
+        },
+        {
+            title: '参数说明',
+            dataIndex: 'description',
+            key: 'description',
+        },
+        {
+            title: '请求类型',
+            dataIndex: 'in',
+            key: 'in',
+        },
+        {
+            title: '是否必须',
+            dataIndex: 'required',
+            key: 'required',
+            scopedSlots: true,
+        },
+        {
+            title: '参数类型',
+            dataIndex: 'type',
+            key: 'type',
+            scopedSlots: true,
+        },
+    ],
+};
+
+console.log(selectApi.value);
+const getContent = (data: any) => {
+    if (!data) return '';
+    return Object.keys(data.content)[0];
+};
+</script>
+
+<style lang="less" scoped>
+.api-does-container {
+    .top {
+        width: 100%;
+
+        h5 {
+            font-weight: bold;
+            font-size: 16px;
+        }
+
+        .input {
+            display: flex;
+        }
+    }
+
+    .api-card {
+        h5 {
+            position: relative;
+            padding-left: 10px;
+
+            &::before {
+                position: absolute;
+                top: 0;
+                left: 0;
+                width: 4px;
+                height: 100%;
+                background-color: #1d39c4;
+                border-radius: 0 3px 3px 0;
+                content: ' ';
+            }
+        }
+        .content {
+            padding-left: 10px;
+
+
+            :deep(.jtable-body) {
+                padding: 0;
+
+                .jtable-body-header {
+                    display: none;
+                }
+            }
+        }
+    }
+}
+</style>
diff --git a/src/views/system/apiPage/components/ApiTest.vue b/src/views/system/apiPage/components/ApiTest.vue
new file mode 100644
index 00000000..b0bb47d0
--- /dev/null
+++ b/src/views/system/apiPage/components/ApiTest.vue
@@ -0,0 +1,42 @@
+<template>
+    <div class="api-test-container">
+        <div class="top">
+            <h5>{{ selectApi.summary }}</h5>
+            <div class="input">
+                <InputCard :value="selectApi.method" />
+                <a-input :value="selectApi?.url" disabled />
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { apiDetailsType } from '../index';
+import InputCard from './InputCard.vue';
+import { PropType } from 'vue';
+
+const props = defineProps({
+    selectApi: {
+        type: Object as PropType<apiDetailsType>,
+        required: true,
+    },
+});
+const { selectApi } = toRefs(props);
+</script>
+
+<style lang="less" scoped>
+.api-test-container {
+    .top {
+        width: 100%;
+
+        h5 {
+            font-weight: bold;
+            font-size: 16px;
+        }
+
+        .input {
+            display: flex;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/apiPage/components/ChooseApi.vue b/src/views/system/apiPage/components/ChooseApi.vue
new file mode 100644
index 00000000..24362336
--- /dev/null
+++ b/src/views/system/apiPage/components/ChooseApi.vue
@@ -0,0 +1,65 @@
+<template>
+    <div class="choose-api-container">
+        <JTable
+            :columns="columns"
+            :dataSource="props.tableData"
+            :rowSelection="rowSelection"
+            noPagination
+            model="TABLE"
+        >
+            <template #url="slotProps">
+                <span
+                    style="color: #1d39c4; cursor: pointer"
+                    @click="jump(slotProps.row)"
+                    >{{ slotProps.row.url }}</span
+                >
+            </template>
+        </JTable>
+
+        <a-button type="primary">保存</a-button>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { TableProps } from 'ant-design-vue';
+
+const emits = defineEmits(['update:clickApi'])
+const props = defineProps({
+    tableData: Array,
+    clickApi: Object
+});
+
+const columns = [
+    {
+        title: 'API',
+        dataIndex: 'url',
+        key: 'url',
+        scopedSlots: true,
+    },
+    {
+        title: '说明',
+        dataIndex: 'summary',
+        key: 'summary',
+    },
+];
+const rowSelection: TableProps['rowSelection'] = {
+    // onChange: (selectedRowKeys, selectedRows) => {
+    //     console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+    // },
+};
+
+const jump = (row:object) => {
+    emits('update:clickApi',row)
+};
+</script>
+
+<style lang="less" scoped>
+.choose-api-container {
+    height: 100%;
+    
+    :deep(.jtable-body-header) {
+        display: none !important;
+    }
+}
+
+</style>
diff --git a/src/views/system/apiPage/components/InputCard.vue b/src/views/system/apiPage/components/InputCard.vue
new file mode 100644
index 00000000..c1742737
--- /dev/null
+++ b/src/views/system/apiPage/components/InputCard.vue
@@ -0,0 +1,35 @@
+<template>
+    <span class="input-card-container" :class="props.value">
+        {{ props.value?.toLocaleUpperCase() }}
+    </span>
+</template>
+
+<script setup lang="ts">
+const props = defineProps({
+    value: String,
+});
+</script>
+
+<style lang="less" scoped>
+.input-card-container {
+    padding: 4px 15px;
+    font-size: 14px;
+    color: #fff;
+
+    &.get {
+        background-color: #1890ff;
+    }
+    &.put {
+        background-color: #fa8c16;
+    }
+    &.post {
+        background-color: #52c41a;
+    }
+    &.delete {
+        background-color: #f5222d;
+    }
+    &.patch {
+        background-color: #a0d911;
+    }
+}
+</style>
diff --git a/src/views/system/apiPage/components/LeftTree.vue b/src/views/system/apiPage/components/LeftTree.vue
index 91f414d4..cbae4bea 100644
--- a/src/views/system/apiPage/components/LeftTree.vue
+++ b/src/views/system/apiPage/components/LeftTree.vue
@@ -81,6 +81,9 @@ const combData = (dataSource: object) => {
 
 <style lang="less">
 .left-tree-container {
+    border-right: 1px solid #e9e9e9;
+    height: calc(100vh - 150px);
+    overflow-y: auto;
     .ant-tree-list {
         .ant-tree-list-holder-inner {
             .ant-tree-switcher-noop {
diff --git a/src/views/system/apiPage/index.d.ts b/src/views/system/apiPage/index.d.ts
index e0155dde..e206edd0 100644
--- a/src/views/system/apiPage/index.d.ts
+++ b/src/views/system/apiPage/index.d.ts
@@ -6,9 +6,17 @@ export type treeNodeTpye = {
     children?: treeNodeTpye[];
 };
 export type methodType = {
-    [key:string]: object
+    [key: string]: object
 }
 export type apiObjType = {
     url: string,
     method: methodType
+}
+
+export type apiDetailsType = {
+    url: string;
+    method: string;
+    summary: string;
+    parameters: [];
+    requestBody?: any;
 }
\ No newline at end of file
diff --git a/src/views/system/apiPage/index.vue b/src/views/system/apiPage/index.vue
index 6cc516ba..cb82abca 100644
--- a/src/views/system/apiPage/index.vue
+++ b/src/views/system/apiPage/index.vue
@@ -1,17 +1,47 @@
 <template>
     <a-card class="api-page-container">
-        <LeftTree @select="treeSelect" />
+        <a-row :gutter="24">
+            <a-col :span="5">
+                <LeftTree @select="treeSelect" />
+            </a-col>
+            <a-col :span="19">
+                <ChooseApi
+                    v-show="!selectedApi.url"
+                    v-model:click-api="selectedApi"
+                    :table-data="tableData"
+                />
 
-        
+                <div
+                    class="api-details"
+                    v-show="selectedApi.url && tableData.length > 0"
+                >
+                    <a-button @click="selectedApi = initSelectedApi"
+                        >返回</a-button
+                    >
+                    <a-tabs v-model:activeKey="activeKey" type="card">
+                        <a-tab-pane key="does" tab="文档">
+                            <ApiDoes :select-api="selectedApi" />
+                        </a-tab-pane>
+                        <a-tab-pane key="test" tab="调试">
+                            <ApiTest :select-api="selectedApi" />
+                        </a-tab-pane>
+                    </a-tabs>
+                </div>
+            </a-col>
+        </a-row>
     </a-card>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" name="apiPage">
+import { treeNodeTpye, apiObjType, apiDetailsType } from './index';
 import LeftTree from './components/LeftTree.vue';
-import { treeNodeTpye, apiObjType } from './index';
+import ChooseApi from './components/ChooseApi.vue';
+import ApiDoes from './components/ApiDoes.vue';
+import ApiTest from './components/ApiTest.vue';
 
 const tableData = ref([]);
 const treeSelect = (node: treeNodeTpye) => {
+    if (!node.apiList) return;
     const apiList: apiObjType[] = node.apiList as apiObjType[];
     const table: any = [];
     // 将对象形式的数据转换为表格需要的形式
@@ -22,12 +52,23 @@ const treeSelect = (node: treeNodeTpye) => {
                 table.push({
                     ...method[key],
                     url,
+                    method: key,
                 });
             }
         }
     });
     tableData.value = table;
 };
+
+const activeKey = ref('does');
+const initSelectedApi = {
+    url: '',
+    method: '',
+    summary: '',
+};
+const selectedApi = ref<apiDetailsType>(initSelectedApi);
+
+watch(tableData, () => (selectedApi.value = initSelectedApi));
 </script>
 
 <style scoped>

From 8ac810bfb53196a40ddad06b5c6c679465b77bbc Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 11 Jan 2023 18:12:41 +0800
Subject: [PATCH 12/13] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E6=8E=A5?=
 =?UTF-8?q?=E5=85=A5=E7=BD=91=E5=85=B3=20=20=E6=8E=A5=E5=85=A5=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E6=AD=A5=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/link/accessConfig.js                  |  33 +
 src/router/menu.ts                            |   4 +
 src/views/link/AccessConfig/Detail/data.ts    |  45 +-
 src/views/link/AccessConfig/Detail/index.vue  | 129 +--
 .../components/AccessCard/index.vue           |  86 ++
 .../link/AccessConfig/components/Network.vue  | 733 ++++++++++++++++++
 .../components/Provider/index.vue             | 145 ++++
 src/views/link/AccessConfig/index.vue         |  17 +-
 8 files changed, 1120 insertions(+), 72 deletions(-)
 create mode 100644 src/api/link/accessConfig.js
 create mode 100644 src/views/link/AccessConfig/components/AccessCard/index.vue
 create mode 100644 src/views/link/AccessConfig/components/Network.vue
 create mode 100644 src/views/link/AccessConfig/components/Provider/index.vue

diff --git a/src/api/link/accessConfig.js b/src/api/link/accessConfig.js
new file mode 100644
index 00000000..0b972bb5
--- /dev/null
+++ b/src/api/link/accessConfig.js
@@ -0,0 +1,33 @@
+import server from '@/utils/request';
+
+export const getProviders = () => server.get(`/gateway/device/providers`);
+
+export const detail = (id) => server.get(`/gateway/device/${id}`);
+
+export const getNetworkList = (networkType, data, params) =>
+    server.get(
+        `/network/config/${networkType}/_alive?include=${params.include}`,
+        data,
+    );
+
+export const getProtocolList = (transport, params) =>
+    server.get(`/protocol/supports/${transport ? transport : ''}`, params);
+
+export const getConfigView = (id, transport) =>
+    server.get(`/protocol/${id}/transport/${transport}`);
+
+export const getChildConfigView = (id) =>
+    server.get(`/protocol/${id}/transports`);
+
+export const save = (data) => server.post(`/gateway/device`, data);
+
+export const update = (data) => server.patch(`/gateway/device`, data);
+
+export const list = (data) =>
+    server.post(`/gateway/device/detail/_query`, data);
+
+export const undeploy = (id) => server.post(`/gateway/device/${id}/_shutdown`);
+
+export const deploy = (id) => server.post(`/gateway/device/${id}/_startup`);
+
+export const del = (id) => server.remove(`/gateway/device/${id}`);
diff --git a/src/router/menu.ts b/src/router/menu.ts
index 525ac2e8..fd37bff5 100644
--- a/src/router/menu.ts
+++ b/src/router/menu.ts
@@ -59,6 +59,10 @@ export default [
         path: '/link/certificate/detail/add',
         component: () => import('@/views/link/Certificate/Detail/index.vue')
     },
+    {
+        path: '/link/accessConfig',
+        component: () => import('@/views/link/AccessConfig/index.vue')
+    },
     {
         path: '/link/accessConfig/detail/add',
         component: () => import('@/views/link/AccessConfig/Detail/index.vue')
diff --git a/src/views/link/AccessConfig/Detail/data.ts b/src/views/link/AccessConfig/Detail/data.ts
index 7dc2fe8a..6a29f551 100644
--- a/src/views/link/AccessConfig/Detail/data.ts
+++ b/src/views/link/AccessConfig/Detail/data.ts
@@ -1,21 +1,30 @@
-const MetworkTypeMapping = new Map();
-MetworkTypeMapping.set('websocket-server', 'WEB_SOCKET_SERVER');
-MetworkTypeMapping.set('http-server-gateway', 'HTTP_SERVER');
-MetworkTypeMapping.set('udp-device-gateway', 'UDP');
-MetworkTypeMapping.set('coap-server-gateway', 'COAP_SERVER');
-MetworkTypeMapping.set('mqtt-client-gateway', 'MQTT_CLIENT');
-MetworkTypeMapping.set('mqtt-server-gateway', 'MQTT_SERVER');
-MetworkTypeMapping.set('tcp-server-gateway', 'TCP_SERVER');
 
-const ProcotoleMapping = new Map();
-ProcotoleMapping.set('websocket-server', 'WebSocket');
-ProcotoleMapping.set('http-server-gateway', 'HTTP');
-ProcotoleMapping.set('udp-device-gateway', 'UDP');
-ProcotoleMapping.set('coap-server-gateway', 'CoAP');
-ProcotoleMapping.set('mqtt-client-gateway', 'MQTT');
-ProcotoleMapping.set('mqtt-server-gateway', 'MQTT');
-ProcotoleMapping.set('tcp-server-gateway', 'TCP');
-ProcotoleMapping.set('child-device', '');
+const ProtocolMapping = new Map();
+ProtocolMapping.set('websocket-server', 'WebSocket');
+ProtocolMapping.set('http-server-gateway', 'HTTP');
+ProtocolMapping.set('udp-device-gateway', 'UDP');
+ProtocolMapping.set('coap-server-gateway', 'CoAP');
+ProtocolMapping.set('mqtt-client-gateway', 'MQTT');
+ProtocolMapping.set('mqtt-server-gateway', 'MQTT');
+ProtocolMapping.set('tcp-server-gateway', 'TCP');
+ProtocolMapping.set('child-device', '');
+ProtocolMapping.set('OneNet', 'HTTP');
+ProtocolMapping.set('Ctwing', 'HTTP');
+ProtocolMapping.set('modbus-tcp', 'MODBUS_TCP');
+ProtocolMapping.set('opc-ua', 'OPC_UA');
+ProtocolMapping.set('edge-child-device', 'EdgeGateway');
+ProtocolMapping.set('official-edge-gateway', 'MQTT');
+
+const NetworkTypeMapping = new Map();
+NetworkTypeMapping.set('websocket-server', 'WEB_SOCKET_SERVER');
+NetworkTypeMapping.set('http-server-gateway', 'HTTP_SERVER');
+NetworkTypeMapping.set('udp-device-gateway', 'UDP');
+NetworkTypeMapping.set('coap-server-gateway', 'COAP_SERVER');
+NetworkTypeMapping.set('mqtt-client-gateway', 'MQTT_CLIENT');
+NetworkTypeMapping.set('mqtt-server-gateway', 'MQTT_SERVER');
+NetworkTypeMapping.set('tcp-server-gateway', 'TCP_SERVER');
+NetworkTypeMapping.set('official-edge-gateway', 'MQTT_SERVER');
+
 
 const descriptionList = {
     'udp-device-gateway':
@@ -96,4 +105,4 @@ const columnsHTTP = [
       },
 ]
 
-export { MetworkTypeMapping, ProcotoleMapping, descriptionList, columnsMQTT, columnsHTTP };
+export { NetworkTypeMapping, ProtocolMapping, descriptionList, columnsMQTT, columnsHTTP };
diff --git a/src/views/link/AccessConfig/Detail/index.vue b/src/views/link/AccessConfig/Detail/index.vue
index 57a64f6b..97c13e2e 100644
--- a/src/views/link/AccessConfig/Detail/index.vue
+++ b/src/views/link/AccessConfig/Detail/index.vue
@@ -1,62 +1,93 @@
 <template>
-    <a-card :bordered="false">
-        <TitleComponent data="自定义设备接入"></TitleComponent>
-        <div>
-            <a-row :gutter="[24, 24]">
-                <a-col :span="12" v-for="item in items" :key="item.id">
-                    <div class="provider">
-                        <div class="box">
-                            <div class="left">
-                                <div class="images">
-                                    <img :src="backMap.get(item.id)" />
-                                </div>
-                                <div class="context">
-                                    <div class="title">{{ item.name }}</div>
-                                    <div class="desc">
-                                        <a-tooltip :title="item.description">
-                                            {{ item.description || '' }}
-                                        </a-tooltip>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="right">
-                                <a-button
-                                    type="primary"
-                                    @click="goProviders(item)"
-                                    >接入</a-button
-                                >
-                            </div>
-                        </div>
-                    </div>
-                </a-col>
-            </a-row>
-        </div>
-    </a-card>
+    <a-spin :spinning="loading">
+        <a-card :bordered="false">
+            <div v-if="type">
+                <Provider
+                    @onClick="goProviders"
+                    :dataSource="dataSource"
+                ></Provider>
+            </div>
+            <div v-else>
+                <div v-if="!id"><a @click="goBack">返回</a></div>
+                <AccessNetwork :provider="provider" :data="data" />
+            </div>
+        </a-card>
+    </a-spin>
 </template>
 
 <script lang="ts" setup name="AccessConfigDetail">
 import { getImage } from '@/utils/comm';
 import TitleComponent from '@/components/TitleComponent/index.vue';
+import AccessNetwork from '../components/Network.vue';
+import Provider from '../components/Provider/index.vue';
+import { getProviders, detail } from '@/api/link/accessConfig';
 
-const items = [
-    { id: 'mqtt-server-gateway', name: '测试1', description: '测试1' },
-    { id: 'websocket-server', name: '测试2', description: '测试' },
-    { id: 'coap-server-gateway', name: '测试3', description: '测试' },
-];
+// const router = useRouter();
+const route = useRoute();
 
-const backMap = new Map();
-backMap.set('mqtt-server-gateway', getImage('/access/mqtt.png'));
-backMap.set('websocket-server', getImage('/access/websocket.png'));
-backMap.set('coap-server-gateway', getImage('/access/coap.png'));
-backMap.set('tcp-server-gateway', getImage('/access/tcp.png'));
-backMap.set('child-device', getImage('/access/child-device.png'));
-backMap.set('http-server-gateway', getImage('/access/http.png'));
-backMap.set('udp-device-gateway', getImage('/access/udp.png'));
-backMap.set('mqtt-client-gateway', getImage('/access/mqtt-broke.png'));
+const id = route.query.id;
 
-const goProviders = (value: object) => {
-    console.log(111, value);
+const dataSource = ref([]);
+const type = ref(false);
+const loading = ref(true);
+const provider = ref({});
+const data = ref({});
+
+const goProviders = (param: object) => {
+    provider.value = param;
+    type.value = false;
 };
+
+const goBack = () => {
+    provider.value = {};
+    type.value = true;
+};
+
+const queryProviders = async () => {
+    const resp = await getProviders();
+    if (resp.status === 200) {
+        dataSource.value = resp.result.filter(
+            (item) =>
+                item.channel === 'network' || item.channel === 'child-device',
+        );
+    }
+};
+
+const getProvidersData = async () => {
+    if (id) {
+        getProviders().then((response) => {
+            if (response.status === 200) {
+                dataSource.value = response.result.filter(
+                    (item) =>
+                        item.channel === 'network' ||
+                        item.channel === 'child-device',
+                );
+                detail(id).then((resp) => {
+                    if (resp.status === 200) {
+                        const dt = response.result.find(
+                            (item) => item?.id === resp.result.provider,
+                        );
+                        provider.value = dt;
+                        data.value = resp.result;
+                        type.value = false;
+                    }
+                });
+                loading.value = false;
+            } else {
+                loading.value = false;
+            }
+        });
+    } else {
+        type.value = true;
+        queryProviders();
+        loading.value = false;
+    }
+};
+
+onMounted(() => {
+    loading.value = true;
+    getProvidersData();
+});
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/link/AccessConfig/components/AccessCard/index.vue b/src/views/link/AccessConfig/components/AccessCard/index.vue
new file mode 100644
index 00000000..a21d5585
--- /dev/null
+++ b/src/views/link/AccessConfig/components/AccessCard/index.vue
@@ -0,0 +1,86 @@
+<template>
+  <a-card hoverable :class="['card-render', checked === data.id ? 'checked' : '']" @click="checkedChange(data.id)">
+    <div class="title">
+      <a-tooltip placement="topLeft" :title="data.name">{{ data.name }}</a-tooltip>
+    </div>
+    <slot name="other"></slot>
+    <div class="desc">
+      <a-tooltip placement="topLeft" :title="data.description">{{ data.description }}</a-tooltip>
+    </div>
+    <div class="checked-icon">
+      <div><a-icon type="check" /></div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+export default {
+  name: "AccessCard",
+  props: ['data', 'checked'],
+  methods: {
+    checkedChange(id){
+      this.$emit('checkedChange', id)
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.card-render {
+  width: 100%;
+  overflow: hidden;
+  background: url("/public/images/access/access.png") no-repeat;
+  background-size: 100% 100%;
+  min-height: 105px;
+
+  .title {
+    width: calc(100% - 88px);
+    overflow: hidden;
+    font-weight: 800;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+
+  .desc {
+    width: 100%;
+    margin-top: 10px;
+    color: rgba(0, 0, 0, 0.55);
+    font-weight: 400;
+    font-size: 13px;
+    overflow: hidden;
+     white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+
+  .checked-icon {
+    position: absolute;
+    right: -22px;
+    bottom: -22px;
+    z-index: 2;
+    display: none;
+    width: 44px;
+    height: 44px;
+    color: #fff;
+    background-color: red;
+    background-color: #2f54eb;
+    transform: rotate(-45deg);
+
+    > div {
+      position: relative;
+      height: 100%;
+      transform: rotate(45deg);
+      font-size: 12px;
+      padding: 4px 0 0 6px;
+    }
+  }
+  &.checked {
+    position: relative;
+    color: #2f54eb;
+    border-color: #2f54eb;
+
+    .checked-icon {
+      display: block;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/link/AccessConfig/components/Network.vue b/src/views/link/AccessConfig/components/Network.vue
new file mode 100644
index 00000000..8bb9b232
--- /dev/null
+++ b/src/views/link/AccessConfig/components/Network.vue
@@ -0,0 +1,733 @@
+<template>
+    <div style="margin-top: 10px">
+        <a-steps :current="stepCurrent">
+            <a-step v-for="item in steps" :key="item" :title="item" />
+        </a-steps>
+        <div class="steps-content">
+            <div class="steps-box" v-if="current === 0">
+                <div class="alert">
+                    <a-icon type="info-circle" style="margin-right: 10px" />
+                    选择与设备通信的网络组件
+                </div>
+                <div class="search">
+                    <a-input-search
+                        allowClear
+                        placeholder="请输入"
+                        style="width: 300px"
+                        @search="networkSearch"
+                    />
+                    <a-button type="primary" @click="addNetwork">新增</a-button>
+                </div>
+                <div class="card-item">
+                    <a-row :gutter="[24, 24]" v-if="networkList.length > 0">
+                        <a-col
+                            :span="8"
+                            v-for="item in networkList"
+                            :key="item.id"
+                        >
+                            <access-card
+                                @checkedChange="checkedChange"
+                                :checked="networkCurrent"
+                                :data="{
+                                    ...item,
+                                    description: item.description
+                                        ? item.description
+                                        : descriptionList[provider.id],
+                                }"
+                            >
+                                <div slot="other" class="other">
+                                    <a-tooltip placement="topLeft">
+                                        <div
+                                            slot="title"
+                                            v-if="
+                                                (item.addresses || []).length >
+                                                1
+                                            "
+                                        >
+                                            <div
+                                                v-for="i in item.addresses ||
+                                                []"
+                                                :key="i.address"
+                                                class="item"
+                                            >
+                                                <a-badge
+                                                    :color="
+                                                        i.health === -1
+                                                            ? 'red'
+                                                            : 'green'
+                                                    "
+                                                />{{ i.address }}
+                                            </div>
+                                        </div>
+                                        <div
+                                            v-for="i in (
+                                                item.addresses || []
+                                            ).slice(0, 1)"
+                                            :key="i.address"
+                                            class="item"
+                                        >
+                                            <a-badge
+                                                :color="
+                                                    i.health === -1
+                                                        ? 'red'
+                                                        : 'green'
+                                                "
+                                                :text="i.address"
+                                            />
+                                            <span
+                                                v-if="
+                                                    (item.addresses || [])
+                                                        .length > 1
+                                                "
+                                                >...</span
+                                            >
+                                        </div>
+                                    </a-tooltip>
+                                </div>
+                            </access-card>
+                        </a-col>
+                    </a-row>
+                    <a-empty v-else description="暂无数据" />
+                </div>
+            </div>
+            <div class="steps-box" v-else-if="current === 1">
+                <div class="alert">
+                    <a-icon type="info-circle" style="margin-right: 10px" />
+                    使用选择的消息协议，对网络组件通信数据进行编解码、认证等操作
+                </div>
+                <div class="search">
+                    <a-input-search
+                        allowClear
+                        placeholder="请输入"
+                        style="width: 300px"
+                        @search="procotolSearch"
+                    />
+                    <a-button type="primary" @click="addProcotol"
+                        >新增</a-button
+                    >
+                </div>
+                <div class="card-item">
+                    <a-row :gutter="[24, 24]" v-if="procotolList.length > 0">
+                        <a-col
+                            :span="8"
+                            v-for="item in procotolList"
+                            :key="item.id"
+                        >
+                            <access-card
+                                @checkedChange="procotolChange"
+                                :checked="procotolCurrent"
+                                :data="item"
+                            >
+                            </access-card>
+                        </a-col>
+                    </a-row>
+                    <a-empty v-else description="暂无数据" />
+                </div>
+            </div>
+            <div class="steps-box" v-else>
+                <div class="card-last">
+                    <a-row :gutter="[24, 24]">
+                        <a-col :span="12">
+                            <title-component data="基本信息" />
+                            <div>
+                                <a-form :form="form" layout="vertical">
+                                    <a-form-item label="名称">
+                                        <a-input
+                                            allowClear
+                                            placeholder="请输入名称"
+                                            v-decorator="[
+                                                'name',
+                                                {
+                                                    initialValue: data.name,
+                                                    rules: [
+                                                        {
+                                                            required: true,
+                                                            message:
+                                                                '请输入名称!',
+                                                        },
+                                                    ],
+                                                },
+                                            ]"
+                                        />
+                                    </a-form-item>
+                                    <a-form-item label="说明">
+                                        <a-textarea
+                                            placeholder="请输入说明"
+                                            :rows="4"
+                                            v-decorator="[
+                                                'description',
+                                                {
+                                                    initialValue:
+                                                        data.description,
+                                                },
+                                            ]"
+                                        />
+                                    </a-form-item>
+                                </a-form>
+                            </div>
+                        </a-col>
+                        <a-col :span="12">
+                            <div class="config-right">
+                                <div class="config-right-item">
+                                    <div class="config-right-item-title">
+                                        接入方式
+                                    </div>
+                                    <div class="config-right-item-context">
+                                        {{ provider.name }}
+                                    </div>
+                                    <div class="config-right-item-context">
+                                        {{ provider.description }}
+                                    </div>
+                                </div>
+                                <div class="config-right-item">
+                                    <div class="config-right-item-title">
+                                        消息协议
+                                    </div>
+                                    <div class="config-right-item-context">
+                                        {{
+                                            procotolList.find(
+                                                (i) => i.id === procotolCurrent,
+                                            ).name
+                                        }}
+                                    </div>
+                                    <div
+                                        class="config-right-item-context"
+                                        v-if="config.document"
+                                    >
+                                        {{ config.document }}
+                                    </div>
+                                </div>
+                                <div
+                                    class="config-right-item"
+                                    v-if="
+                                        networkList.find(
+                                            (i) => i.id === networkCurrent,
+                                        ) &&
+                                        (
+                                            networkList.find(
+                                                (i) => i.id === networkCurrent,
+                                            ).addresses || []
+                                        ).length > 0
+                                    "
+                                >
+                                    <div class="config-right-item-title">
+                                        网络组件
+                                    </div>
+                                    <div
+                                        v-for="i in (networkList.find(
+                                            (i) => i.id === networkCurrent,
+                                        ) &&
+                                            networkList.find(
+                                                (i) => i.id === networkCurrent,
+                                            ).addresses) ||
+                                        []"
+                                        :key="i.address"
+                                    >
+                                        <a-badge
+                                            :color="
+                                                i.health === -1
+                                                    ? 'red'
+                                                    : 'green'
+                                            "
+                                            :text="i.address"
+                                        />
+                                    </div>
+                                </div>
+                                <div
+                                    class="config-right-item"
+                                    v-if="
+                                        config.routes &&
+                                        config.routes.length > 0
+                                    "
+                                >
+                                    <div class="config-right-item-title">
+                                        {{
+                                            data.provider ===
+                                                'mqtt-server-gateway' ||
+                                            data.provider ===
+                                                'mqtt-client-gateway'
+                                                ? 'topic'
+                                                : 'URL信息'
+                                        }}
+                                    </div>
+                                    <a-table
+                                        :pagination="false"
+                                        :rowKey="generateUUID()"
+                                        :data-source="config.routes || []"
+                                        bordered
+                                        :columns="columnsMQTT"
+                                        :scroll="{ y: 300 }"
+                                    >
+                                        <template
+                                            slot="stream"
+                                            slot-scope="text, record"
+                                        >
+                                            <span
+                                                v-if="
+                                                    record.upstream &&
+                                                    record.downstream
+                                                "
+                                                >上行、下行</span
+                                            >
+                                            <span v-else-if="record.upstream"
+                                                >上行</span
+                                            >
+                                            <span v-else-if="record.downstream"
+                                                >下行</span
+                                            >
+                                        </template>
+                                    </a-table>
+                                </div>
+                            </div>
+                        </a-col>
+                    </a-row>
+                </div>
+            </div>
+        </div>
+        <div class="steps-action">
+            <a-button
+                v-if="[0, 1].includes(current)"
+                type="primary"
+                @click="next"
+            >
+                下一步
+            </a-button>
+            <a-button v-if="current === 2" type="primary" @click="save">
+                保存
+            </a-button>
+            <a-button v-if="current > 0" style="margin-left: 8px" @click="prev">
+                上一步
+            </a-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup name="AccessNetwork">
+import {
+    getNetworkList,
+    getProtocolList,
+    getConfigView,
+    save,
+    update,
+    getChildConfigView,
+} from '@/api/link/accessConfig';
+import {
+    descriptionList,
+    NetworkTypeMapping,
+    ProtocolMapping,
+} from '../Detail/data';
+import AccessCard from './AccessCard/index.vue';
+import TitleComponent from '@/components/TitleComponent/index.vue';
+import { message, Form } from 'ant-design-vue';
+
+function generateUUID() {
+    var d = new Date().getTime();
+    if (
+        typeof performance !== 'undefined' &&
+        typeof performance.now === 'function'
+    ) {
+        d += performance.now(); //use high-precision timer if available
+    }
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(
+        /[xy]/g,
+        function (c) {
+            var r = (d + Math.random() * 16) % 16 | 0;
+            d = Math.floor(d / 16);
+            return (c === 'x' ? r : (r & 0x3) | 0x8).toString(16);
+        },
+    );
+}
+
+const props = defineProps({
+    provider: {
+        type: Object,
+        default: () => {},
+    },
+    data: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+
+
+const current = ref(0);
+const stepCurrent = ref(0);
+const steps = ref(['网络组件', '消息协议', '完成']);
+const networkList = ref([]);
+const procotolList = ref([]);
+const allProcotolList = ref([]);
+const networkCurrent = ref('');
+const procotolCurrent = ref('');
+let config = ref({});
+let columnsMQTT = ref([]);
+const form = reactive({
+    name: 'access',
+    description: '',
+});
+
+const queryNetworkList = async (id: string, params: object, data = {}) => {
+  console.log('queryNetworkList',NetworkTypeMapping.get(id), data, params);
+  
+    const resp = await getNetworkList(NetworkTypeMapping.get(id), data, params);
+    if (resp.status === 200) {
+        networkList.value = resp.result;
+    }
+};
+
+// const  queryProcotolList=async(id:string, params:object) =>{
+const queryProcotolList = async (id: string, params = {}) => {
+    const resp = await getProtocolList(ProtocolMapping.get(id), {
+        ...params,
+        'sorts[0].name': 'createTime',
+        'sorts[0].order': 'desc',
+    });
+    if (resp.status === 200) {
+        procotolList.value = resp.result;
+        allProcotolList.value = resp.result;
+    }
+};
+
+const addNetwork = () => {
+    // const url = this.$store.state.permission.routes['Link/Type/Detail']
+    const url = '/demo';
+    const tab = window.open(
+        `${window.location.origin + window.location.pathname}#${url}?type=${
+            NetworkTypeMapping.get(props.provider?.id) || ''
+        }`,
+    );
+    tab.onTabSaveSuccess = (value) => {
+        if (value.success) {
+            networkCurrent.value = value.result.id;
+            queryNetworkList(props.provider?.id, {
+                include: networkCurrent.value || '',
+            });
+        }
+    };
+};
+const addProcotol = () => {
+    // const url = this.$store.state.permission.routes['Link/Protocol']
+    const url = '/demo';
+    const tab = window.open(
+        `${window.location.origin + window.location.pathname}#${url}?save=true`,
+    );
+    tab.onTabSaveSuccess = (value) => {
+        if (value.success) {
+            procotolCurrent.value = value.result?.id;
+            queryProcotolList(props.provider?.id);
+        }
+    };
+};
+
+const checkedChange = (id: string) => {
+    networkCurrent.value = id;
+};
+
+const networkSearch = (value: string) => {
+  console.log('networkSearch',
+        props.provider.id,
+        {
+            include: networkCurrent.value || '',
+        },
+        {
+            terms: [
+                {
+                    column: 'name$LIKE',
+                    value: `%${value}%`,
+                },
+            ],
+        },
+    );
+  
+    queryNetworkList(
+        props.provider.id,
+        {
+            include: networkCurrent.value || '',
+        },
+        {
+            terms: [
+                {
+                    column: 'name$LIKE',
+                    value: `%${value}%`,
+                },
+            ],
+        },
+    );
+};
+const procotolChange = (id: string) => {
+    if (!props.data.id) {
+        procotolCurrent.value = id;
+    }
+};
+
+const procotolSearch = (value: string) => {
+    if (value) {
+        const list = allProcotolList.value.filter((i) => {
+            return (
+                i.name &&
+                i.name.toLocaleLowerCase().includes(value.toLocaleLowerCase())
+            );
+        });
+        procotolList.value = list;
+    } else {
+        procotolList.value = allProcotolList.value;
+    }
+};
+
+const saveData = () => {
+    form.validateFields(async (err, values) => {
+        if (!err) {
+            let resp = undefined;
+            if (props.data && props.data.id) {
+                resp = await update({
+                    ...props.data,
+                    name: values.name,
+                    description: values.description,
+                    protocol: procotolCurrent.value,
+                    channel: 'network', // 网络组件
+                    channelId: networkCurrent.value,
+                });
+            } else {
+                resp = await save({
+                    name: values.name,
+                    description: values.description,
+                    provider: props.provider.id,
+                    protocol: procotolCurrent.value,
+                    transport:
+                        props.provider?.id === 'child-device'
+                            ? 'Gateway'
+                            : ProtocolMapping.get(props.provider.id),
+                    channel: 'network', // 网络组件
+                    channelId: networkCurrent.value,
+                });
+            }
+            if (resp.status === 200) {
+                message.success('操作成功！');
+                // 回到列表页面
+                if (window.onTabSaveSuccess) {
+                    window.onTabSaveSuccess(resp);
+                    setTimeout(() => window.close(), 300);
+                } else {
+                    // this.$store.dispatch('jumpPathByKey', { key: MenuKeys['Link/AccessConfig'] })
+                }
+            }
+        }
+    });
+};
+const next = async () => {
+    if (current.value === 0) {
+        if (!networkCurrent.value) {
+            message.error('请选择网络组件！');
+        } else {
+            queryProcotolList(props.provider.id);
+            current.value -= current.value;
+        }
+    } else if (current.value === 1) {
+        if (!procotolCurrent.value) {
+            message.error('请选择消息协议！');
+        } else {
+            const resp =
+                props.provider.channel !== 'child-device'
+                    ? await getConfigView(
+                          procotolCurrent.value,
+                          ProtocolMapping.get(props.provider.id),
+                      )
+                    : await getChildConfigView(procotolCurrent.value);
+            if (resp.status === 200) {
+                config.value = resp.result;
+                current.value += current.value;
+                columnsMQTT = [
+                    {
+                        title: '分组',
+                        dataIndex: 'group',
+                        key: 'group',
+                        ellipsis: true,
+                        align: 'center',
+                        width: 100,
+                        customRender: (value, row, index) => {
+                            const obj = {
+                                children: value,
+                                attrs: {},
+                            };
+                            const list = (config && config.routes) || [];
+                            const arr = list.filter((res) => {
+                                return res.group == row.group;
+                            });
+                            if (
+                                index == 0 ||
+                                list[index - 1].group !== row.group
+                            ) {
+                                obj.attrs.rowSpan = arr.length;
+                            } else {
+                                obj.attrs.rowSpan = 0;
+                            }
+                            return obj;
+                        },
+                    },
+                    {
+                        title: 'topic',
+                        dataIndex: 'topic',
+                        key: 'topic',
+                        ellipsis: true,
+                    },
+                    {
+                        title: '上下行',
+                        dataIndex: 'stream',
+                        key: 'stream',
+                        ellipsis: true,
+                        align: 'center',
+                        width: 100,
+                        scopedSlots: { customRender: 'stream' },
+                    },
+                    {
+                        title: '说明',
+                        dataIndex: 'description',
+                        key: 'description',
+                        ellipsis: true,
+                    },
+                ];
+            }
+        }
+    }
+};
+const prev = () => {
+    const currentValue = current.value;
+    current.value -= currentValue;
+};
+
+onMounted(() => {
+    if (props.data && props.data.id) {
+        if (props.data.provider !== 'child-device') {
+            procotolCurrent.value = props.data.protocol;
+            current.value = 0;
+            networkCurrent.value = props.data.channelId;
+            console.log(11111111,props.provider.id, {
+                include: networkCurrent.value,
+            });
+            
+            queryNetworkList(props.provider.id, {
+                include: networkCurrent.value,
+            });
+            procotolCurrent.value = props.data.protocol;
+            steps.value = ['网络组件', '消息协议', '完成'];
+        } else {
+            steps.value = ['消息协议', '完成'];
+            current.value = 1;
+            queryProcotolList(props.provider.id);
+        }
+    } else {
+        if (props.provider?.id) {
+            if (props.provider.channel !== 'child-device') {
+                console.log(3333333, props.provider.id, {
+                    include: '',
+                });
+
+                queryNetworkList(props.provider.id, {
+                    include: '',
+                });
+                steps.value = ['网络组件', '消息协议', '完成'];
+                current.value = 0;
+            } else {
+                console.log(444444,props.provider.id);
+
+                steps.value = ['消息协议', '完成'];
+                current.value = 1;
+                queryProcotolList(props.provider.id);
+            }
+        }
+    }
+});
+
+// watch(
+//     () => props.modelValue,
+//     (v) => {
+//         keystoreBase64.value = v;
+//     },
+//     {
+//         deep: true,
+//         immediate: true,
+//     },
+// );
+// watch: {
+//     current(val) {
+//       if (this.provider.channel !== 'child-device') {
+//         this.stepCurrent = val
+//       } else {
+//         this.stepCurrent = val - 1
+//       }
+//     },
+//   },
+</script>
+
+<style lang="less" scoped>
+.steps-content {
+    margin: 20px;
+}
+.steps-box {
+    min-height: 400px;
+    .card-item {
+        padding-right: 5px;
+        max-height: 480px;
+        overflow-y: auto;
+        overflow-x: hidden;
+    }
+    .card-last {
+        padding-right: 5px;
+        max-height: 580px;
+        overflow-y: auto;
+        overflow-x: hidden;
+    }
+}
+.steps-action {
+    width: 100%;
+    margin-top: 24px;
+    margin-left: 20px;
+}
+.alert {
+    height: 40px;
+    padding-left: 10px;
+    color: rgba(0, 0, 0, 0.55);
+    line-height: 40px;
+    background-color: #f6f6f6;
+}
+.search {
+    display: flex;
+    margin: 15px 0;
+    justify-content: space-between;
+}
+
+.other {
+    width: 100%;
+    height: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .item {
+        width: 100%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
+}
+
+.config-right {
+    padding: 20px;
+    color: rgba(0, 0, 0, 0.8);
+    background: rgba(0, 0, 0, 0.04);
+
+    .config-right-item {
+        margin-bottom: 10px;
+
+        .config-right-item-title {
+            width: 100%;
+            margin-bottom: 10px;
+            font-weight: 600;
+        }
+
+        .config-right-item-context {
+            margin: 5px 0;
+            color: rgba(0, 0, 0, 0.8);
+        }
+    }
+}
+</style>
diff --git a/src/views/link/AccessConfig/components/Provider/index.vue b/src/views/link/AccessConfig/components/Provider/index.vue
new file mode 100644
index 00000000..d73dad78
--- /dev/null
+++ b/src/views/link/AccessConfig/components/Provider/index.vue
@@ -0,0 +1,145 @@
+<template>
+    <TitleComponent data="自定义设备接入"></TitleComponent>
+    <div>
+        <a-row :gutter="[24, 24]">
+            <a-col :span="12" v-for="item in dataSource" :key="item.id">
+                <div class="provider">
+                    <div class="box">
+                        <div class="left">
+                            <div class="images">
+                                <img :src="backMap.get(item.id)" />
+                            </div>
+                            <div class="context">
+                                <div class="title">
+                                    {{ item.name }}
+                                </div>
+                                <div class="desc">
+                                    <a-tooltip :title="item.description">
+                                        {{ item.description || '' }}
+                                    </a-tooltip>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="right">
+                            <a-button type="primary" @click="click(item)"
+                                >接入</a-button
+                            >
+                        </div>
+                    </div>
+                </div>
+            </a-col>
+        </a-row>
+    </div>
+</template>
+
+<script lang="ts" setup name="AccessConfigProvider">
+import TitleComponent from '@/components/TitleComponent/index.vue';
+import { getImage } from '@/utils/comm';
+
+const props = defineProps({
+    dataSource: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const emit = defineEmits(['onClick']);
+
+const backMap = new Map();
+backMap.set('mqtt-server-gateway', getImage('/access/mqtt.png'));
+backMap.set('websocket-server', getImage('/access/websocket.png'));
+backMap.set('modbus-tcp', getImage('/access/modbus.png'));
+backMap.set('coap-server-gateway', getImage('/access/coap.png'));
+backMap.set('tcp-server-gateway', getImage('/access/tcp.png'));
+backMap.set('Ctwing', getImage('/access/ctwing.png'));
+backMap.set('child-device', getImage('/access/child-device.png'));
+backMap.set('opc-ua', getImage('/access/opc-ua.png'));
+backMap.set('http-server-gateway', getImage('/access/http.png'));
+backMap.set('fixed-media', getImage('/access/video-device.png'));
+backMap.set('udp-device-gateway', getImage('/access/udp.png'));
+backMap.set('OneNet', getImage('/access/onenet.png'));
+backMap.set('gb28181-2016', getImage('/access/gb28181.png'));
+backMap.set('mqtt-client-gateway', getImage('/access/mqtt-broke.png'));
+backMap.set('edge-child-device', getImage('/access/child-device.png'));
+backMap.set('official-edge-gateway', getImage('/access/edge.png'));
+
+const click = (value: object) => {
+    emit('onClick', value);
+};
+
+</script>
+
+<style lang="less" scoped>
+.provider {
+    position: relative;
+    width: 100%;
+    padding: 20px;
+    background: url('/public/images/access/background.png') no-repeat;
+    background-size: 100% 100%;
+    border: 1px solid #e6e6e6;
+
+    &::before {
+        position: absolute;
+        top: 0;
+        left: 40px;
+        display: block;
+        width: 15%;
+        min-width: 64px;
+        height: 2px;
+        background-image: url('/public/images/access/rectangle.png');
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
+        // border: 1px #8da1f4 solid;
+        // border-bottom-left-radius: 10%;
+        // border-bottom-right-radius: 10%;
+        content: ' ';
+    }
+
+    &:hover {
+        box-shadow: 0 0 24px rgba(#000, 0.1);
+    }
+}
+
+.box {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+
+    .left {
+        display: flex;
+        width: calc(100% - 70px);
+        .images {
+            width: 64px;
+            height: 64px;
+
+            img {
+                width: 100%;
+            }
+        }
+
+        .context {
+            width: calc(100% - 84px);
+            margin: 10px;
+
+            .title {
+                font-weight: 600;
+            }
+
+            .desc {
+                width: 100%;
+                margin-top: 10px;
+                overflow: hidden;
+                color: rgba(0, 0, 0, 0.55);
+                font-weight: 400;
+                font-size: 13px;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+        }
+    }
+    .right {
+        width: 70px;
+    }
+}
+</style>
diff --git a/src/views/link/AccessConfig/index.vue b/src/views/link/AccessConfig/index.vue
index 5ce2ef66..e1509f3b 100644
--- a/src/views/link/AccessConfig/index.vue
+++ b/src/views/link/AccessConfig/index.vue
@@ -1,11 +1,18 @@
 <template>
-  <a-button type="primary" @click="handlAdd">新增</a-button>
+    <a-button type="primary" @click="handlAdd">新增</a-button>
 </template>
 <script lang="ts" setup name="AccessConfigPage">
+const router = useRouter();
 
-const handlAdd = (e: any) => {
-  console.log(111,e);
-  
+// const handlAdd = () => {
+//     router.push({
+//         path: '/link/accessConfig/detail/add',
+//         query: {
+//             id: '1610475400026861568',
+//         },
+//     });
+// };
+const handlAdd = () => {
+  router.push('/link/accessConfig/detail/add');
 }
-
 </script>

From 2d49f87ceaa6e8c41acef4f6fdec1c9a78140775 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Wed, 11 Jan 2023 18:24:07 +0800
Subject: [PATCH 13/13] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                            |   6 +-
 src/components/CardBox/index.vue           |  93 ++++++------
 src/components/Table/index.vue             | 102 +++++++------
 src/components/Table/old/index.module.less |  45 ------
 src/components/Table/old/index.tsx         | 168 ---------------------
 src/views/demo/index.vue                   |   6 +-
 src/views/demo/table/index.vue             | 111 ++++++++++----
 7 files changed, 193 insertions(+), 338 deletions(-)
 delete mode 100644 src/components/Table/old/index.module.less
 delete mode 100644 src/components/Table/old/index.tsx

diff --git a/components.d.ts b/components.d.ts
index e30d186c..2ef70390 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -7,6 +7,7 @@ export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
+    AAlert: typeof import('ant-design-vue/es')['Alert']
     ABadge: typeof import('ant-design-vue/es')['Badge']
     AButton: typeof import('ant-design-vue/es')['Button']
     ACard: typeof import('ant-design-vue/es')['Card']
@@ -16,13 +17,12 @@ declare module '@vue/runtime-core' {
     ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
     ADivider: typeof import('ant-design-vue/es')['Divider']
     AEmpty: typeof import('ant-design-vue/es')['Empty']
-    ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
-    ADivider: typeof import('ant-design-vue/es')['Divider']
-    AEmpty: typeof import('ant-design-vue/es')['Empty']
     AForm: typeof import('ant-design-vue/es')['Form']
     AFormItem: typeof import('ant-design-vue/es')['FormItem']
     AInput: typeof import('ant-design-vue/es')['Input']
+    AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
     AInputPassword: typeof import('ant-design-vue/es')['InputPassword']
+    AModal: typeof import('ant-design-vue/es')['Modal']
     APagination: typeof import('ant-design-vue/es')['Pagination']
     APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
     ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
diff --git a/src/components/CardBox/index.vue b/src/components/CardBox/index.vue
index fc942f65..1cc26f6e 100644
--- a/src/components/CardBox/index.vue
+++ b/src/components/CardBox/index.vue
@@ -2,17 +2,10 @@
     <div class="card">
         <div
             class="card-warp"
-            :class="{
-                hover: maskShow ? 'hover' : '',
-                active: actived ? 'active' : '',
-            }"
+            :class="{ active: active ? 'active' : ''}"
             @click="handleClick"
         >
-            <div
-                class="card-content"
-                @mouseenter="setMaskShow(true)"
-                @mouseleave="setMaskShow(false)"
-            >
+            <div class="card-content">
                 <a-row>
                     <a-col :span="6">
                         <!-- 图片 -->
@@ -27,7 +20,7 @@
                 </a-row>
 
                 <!-- 勾选 -->
-                <div v-if="actived" class="checked-icon">
+                <div v-if="active" class="checked-icon">
                     <div>
                         <CheckOutlined />
                     </div>
@@ -47,21 +40,12 @@
                         ></BadgeStatus>
                     </div>
                 </div>
-
-                <!-- 遮罩层 -->
-                <div
-                    v-if="showMask"
-                    class="card-mask"
-                    :class="maskShow ? 'show' : ''"
-                >
-                    <slot name="mask"></slot>
-                </div>
             </div>
         </div>
 
         <!-- 按钮 -->
         <slot name="bottom-tool">
-            <div v-if="showTool" class="card-tools">
+            <div v-if="showTool && actions && actions.length" class="card-tools">
                 <div
                     v-for="item in actions"
                     :key="item.key"
@@ -70,18 +54,32 @@
                         delete: item.key === 'delete',
                     }"
                 >
-                    <a-tooltip v-if="item.disabled === true">
-                        <template #title>{{ item.message }}</template>
+                <a-popconfirm  v-if="item.popConfirm" v-bind="item.popConfirm">
+                    <template v-if="item.key === 'delete'">
                         <a-button :disabled="item.disabled">
-                            <template #icon><SearchOutlined /></template>
-                            <span>{{ item.label }}</span>
+                            <DeleteOutlined />
                         </a-button>
-                    </a-tooltip>
-
-                    <a-button v-else :disabled="item.disabled">
-                        <template #icon><SearchOutlined /></template>
-                        <span>{{ item.label }}</span>
-                    </a-button>
+                    </template>
+                    <template v-else>
+                        <a-button :disabled="item.disabled">
+                            <AIcon :type="item.icon" />
+                            <span>{{ item.text }}</span>
+                        </a-button>
+                    </template>
+                </a-popconfirm>
+                <template v-else>
+                    <template v-if="item.key === 'delete'">
+                        <a-button :disabled="item.disabled">
+                            <DeleteOutlined />
+                        </a-button>
+                    </template>
+                    <template v-else>
+                        <a-button :disabled="item.disabled">
+                            <AIcon :type="item.icon" />
+                            <span>{{ item.text }}</span>
+                        </a-button>
+                    </template>
+                </template>
                 </div>
             </div>
         </slot>
@@ -89,18 +87,26 @@
 </template>
 
 <script setup lang="ts">
-import { SearchOutlined, CheckOutlined } from '@ant-design/icons-vue';
+import { SearchOutlined, CheckOutlined, DeleteOutlined } from '@ant-design/icons-vue';
 import BadgeStatus from '@/components/BadgeStatus/index.vue';
 import { StatusColorEnum } from '@/utils/consts.ts';
+import type { ActionsType } from '@/components/Table/index.vue'
+import { PropType } from 'vue';
 
 type EmitProps = {
-    (e: 'update:modelvalue', data: string | number): void;
-    (e: 'actived', data: boolean): void;
+    // (e: 'update:modelValue', data: Record<string, any>): void;
+    (e: 'click', data: Record<string, any>): void;
 };
 
+type TableActionsType  = Partial<ActionsType>
+
 const emit = defineEmits<EmitProps>();
 
 const props = defineProps({
+    value: {
+        type: Object as PropType<Record<string, any>>,
+        default: () => {}
+    },
     showStatus: {
         type: Boolean,
         default: true,
@@ -109,10 +115,7 @@ const props = defineProps({
         type: Boolean,
         default: true,
     },
-    showMask: {
-        type: Boolean,
-        default: true,
-    },
+
     statusText: {
         type: String,
         default: '正常',
@@ -125,21 +128,17 @@ const props = defineProps({
         type: Object,
     },
     actions: {
-        type: Array as any,
+        type: Array as PropType<TableActionsType[]>,
         default: () => [],
     },
+    active: {
+        type: Boolean,
+        default: false
+    }
 });
 
-const maskShow = ref(false);
-const actived = ref(false);
-
-const setMaskShow = (val: boolean) => {
-    maskShow.value = val;
-};
-
 const handleClick = () => {
-    actived.value = !actived.value;
-    emit('actived', actived.value);
+    emit('click', props.value);
 };
 </script>
 
diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue
index 9a623d59..d352dcc4 100644
--- a/src/components/Table/index.vue
+++ b/src/components/Table/index.vue
@@ -15,9 +15,13 @@
                 </div>
             </div>
             <div class="jtable-content">
-                <!-- <div class="jtable-alert">
-                    <a-alert message="Info Text" type="info" />
-                </div> -->
+                <div class="jtable-alert" v-if="rowSelection.selectedRowKeys && rowSelection.selectedRowKeys.length">
+                    <a-alert :message="'已选择' + rowSelection.selectedRowKeys.length + '项'" type="info" :afterClose="handleAlertClose">
+                        <template #closeText>
+                            <a>取消选择</a>
+                        </template>
+                    </a-alert>
+                </div>
                 <div v-if="_model === ModelEnum.CARD" class="jtable-card">
                     <div 
                         v-if="_dataSource.length"
@@ -29,16 +33,7 @@
                             v-for="(item, index) in _dataSource" 
                             :key="index"
                         >
-                            <CardBox :actions="actions" v-bind="cardProps">
-                                <template #img>
-                                    <slot name="img">
-                                        <img :src="getImage('/device-product.png')" />
-                                    </slot>
-                                </template>
-                                <template #content>
-                                    <slot name="cardContent" :item="item" :index="index"></slot>
-                                </template>
-                            </CardBox>
+                            <slot name="card" v-bind="item" :index="index"></slot>
                         </div>
                     </div>
                     <div v-else>
@@ -46,23 +41,21 @@
                     </div>
                 </div>
                 <div v-else>
-                    <a-table :rowSelection="rowSelection" :columns="[..._columns]" :dataSource="_dataSource" :pagination="false" :scroll="{ x: 1366 }">
+                    <a-table rowKey="id" :rowSelection="rowSelection" :columns="[..._columns]" :dataSource="_dataSource" :pagination="false" :scroll="{ x: 1366 }">
                         <template #bodyCell="{ column, record }">
-                            <template v-if="column.key === 'action'">
+                            <!-- <template v-if="column.key === 'action'">
                                 <a-space>
                                     <a-tooltip v-for="i in actions" :key="i.key" v-bind="i.tooltip">
                                         <a-popconfirm v-if="i.popConfirm" v-bind="i.popConfirm">
-                                            <a>
-                                                {{i.text}}
-                                            </a>
+                                            <a><AIcon :type="i.icon" /></a>
                                         </a-popconfirm>
                                         <a v-else @click="i.onClick && i.onClick(record)">
-                                            {{i.text}}
+                                            <AIcon :type="i.icon" />
                                         </a>
                                     </a-tooltip>
                                 </a-space>
-                            </template>
-                            <template v-else-if="column.scopedSlots">
+                            </template> -->
+                            <template v-if="column.scopedSlots">
                                <slot :name="column.key" :row="record"></slot>
                             </template>
                         </template>
@@ -88,12 +81,11 @@
 
 <script setup lang="ts">
 import { UnorderedListOutlined, AppstoreOutlined } from '@ant-design/icons-vue'
-import type { TableProps } from 'ant-design-vue/es/table'
+import type { TableProps, ColumnsType } from 'ant-design-vue/es/table'
 import type { TooltipProps } from 'ant-design-vue/es/tooltip'
 import type { PopconfirmProps } from 'ant-design-vue/es/popconfirm'
 import { Empty } from 'ant-design-vue'
 import { CSSProperties } from 'vue';
-import { getImage } from '@/utils/comm';
 
 enum ModelEnum {
     TABLE = 'TABLE',
@@ -123,13 +115,17 @@ export interface ActionsType {
     icon?: string;
 }
 
-interface JTableProps extends TableProps{
+export interface JColumnsProps extends ColumnsType{
+    scopedSlots?: boolean; // 是否为插槽 true: 是 false: 否
+}
+
+export interface JTableProps extends TableProps{
     request?: (params: Record<string, any> & {
         pageSize: number;
         pageIndex: number;
     }) => Promise<Partial<RequestData>>;
     cardBodyClass?: string;
-    columns: Record<string, any>[];
+    columns: JColumnsProps;
     params?: Record<string, any> & {
         pageSize: number;
         pageIndex: number;
@@ -147,6 +143,11 @@ const props = withDefaults(defineProps<JTableProps>(), {
     request: undefined,
 })
 
+// emit 
+const emit = defineEmits<{
+  (e: 'cancelSelect'): void
+}>()
+
 const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE
 
 const _model = ref<keyof typeof ModelEnum>(props.model ? props.model : ModelEnum.CARD); // 模式切换
@@ -155,16 +156,17 @@ const _dataSource = ref<Record<string, any>[]>([])
 const pageIndex = ref<number>(0)
 const pageSize = ref<number>(6)
 const total = ref<number>(0)
-const _columns = ref<Record<string, any>[]>([])
+const _columns = ref<Record<string, any>[]>([...props.columns])
 const loading = ref<boolean>(true)
-// 
-// const slotColumns = computed(() => props.columns.filter((item) => item.scopedSlots))
+
 // 方法
 // 切换卡片和表格
 const modelChange = (type: keyof typeof ModelEnum) => {
     _model.value = type
 }
-// 请求数据
+/**
+ * 请求数据
+ */
 const handleSearch = async (_params?: Record<string, any>) => {
     loading.value = true
     if(props.request) {
@@ -194,7 +196,9 @@ const handleSearch = async (_params?: Record<string, any>) => {
     
     loading.value = false
 }
-
+/**
+ * 页码变化
+ */
 const pageChange = (page: number, size: number) => {
     handleSearch({
         ...props.params,
@@ -203,22 +207,30 @@ const pageChange = (page: number, size: number) => {
     })
 }
 
+// alert关闭，取消选择
+const handleAlertClose = () => {
+    emit('cancelSelect')
+}
+
+// watchEffect(() => {
+//     if(Array.isArray(props.actions) && props.actions.length) {
+//          _columns.value = [...props.columns,
+//             {
+//                 title: '操作',
+//                 key: 'action',
+//                 fixed: 'right',
+//                 width: 250
+//             }   
+//         ]
+//     } else {
+//          _columns.value = [...props.columns]
+//     }
+// })
+
 watchEffect(() => {
-    if(Array.isArray(props.actions) && props.actions.length) {
-         _columns.value = [...props.columns,
-            {
-                title: '操作',
-                key: 'action',
-                fixed: 'right',
-                width: 250
-            }   
-        ]
-    } else {
-         _columns.value = [...props.columns]
-    }
     handleSearch(props.params)
 })
-
+// TODO 选择的双向绑定和图标的渲染
 </script>
 
 <style lang="less" scoped> 
@@ -250,11 +262,13 @@ watchEffect(() => {
         }
     }
     .jtable-content {
+        .jtable-alert {
+            margin-bottom: 16px;
+        }
         .jtable-card {
             .jtable-card-items {
                 display: grid;
                 grid-gap: 26px;
-                // grid-template-columns: repeat(4, 1fr);
                 .jtable-card-item {
                     display: flex;
                 }
diff --git a/src/components/Table/old/index.module.less b/src/components/Table/old/index.module.less
deleted file mode 100644
index 6c4c60cf..00000000
--- a/src/components/Table/old/index.module.less
+++ /dev/null
@@ -1,45 +0,0 @@
-.jtable-body {
-    width: 100%;
-    padding: 0 24px 24px;
-    background-color: white;
-    .jtable-body-header {
-        padding: 16px 0;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        .jtable-body-header-right {
-            display: flex;
-            gap: 8px;
-            .jtable-setting-item {
-                color: rgba(0, 0, 0, 0.75);
-                font-size: 16px;
-                cursor: pointer;
-
-                &:hover {
-                    color: @primary-color-hover;
-                }
-
-                &.active {
-                    color: @primary-color-active;
-                }
-            }
-        }
-    }
-    .jtable-content {
-        .jtable-card {
-            .jtable-card-items {
-                display: grid;
-                grid-gap: 26px;
-                // grid-template-columns: repeat(4, 1fr);
-                .jtable-card-item {
-                    display: flex;
-                }
-            }
-        }
-    }
-    .jtable-pagination {
-        position: absolute;
-        right: 24px;
-        bottom: 24px;
-    }
-}   
\ No newline at end of file
diff --git a/src/components/Table/old/index.tsx b/src/components/Table/old/index.tsx
deleted file mode 100644
index 39ac9e9c..00000000
--- a/src/components/Table/old/index.tsx
+++ /dev/null
@@ -1,168 +0,0 @@
-import { UnorderedListOutlined, AppstoreOutlined } from '@ant-design/icons-vue'
-import styles from './index.module.less'
-import { Pagination, Table, Empty } from 'ant-design-vue'
-import type { TableProps } from 'ant-design-vue/es/table'
-
-enum ModelEnum {
-    TABLE = 'TABLE',
-    CARD = 'CARD',
-}
-
-export declare type RequestData = {
-    code: string;
-    result: {
-        data: any[] | undefined;
-        pageIndex: number;
-        pageSize: number;
-        total: number;
-    };
-    status: number;
-} & Record<string, any>;
-
-interface JTableProps extends TableProps{
-    request: (params: Record<string, any> & {
-        pageSize: number;
-        pageIndex: number;
-    }) => Promise<Partial<RequestData>>;
-    cardBodyClass: string;
-}
-
-const JTable = defineComponent<JTableProps>({
-    name: 'JTable',
-    slots: [
-        'headerTitle', // 顶部左边插槽
-        'cardRender', // 卡片内容
-    ],
-    emits: [
-        'modelChange', // 切换卡片和表格
-    ],
-    props: {
-        cardBodyClass: '',
-        request: undefined,
-        columns: []
-    } as any,
-    setup(props ,{ slots, emit }){
-        const model = ref<keyof typeof ModelEnum>(ModelEnum.CARD); // 模式切换
-        const column = ref<number>(3);
-        console.log(props.columns, props.request)
-        const dataSource = ref<any[]>([
-            {
-              key: '1',
-              name: '胡彦斌',
-              age: 32,
-              address: '西湖区湖底公园1号',
-            },
-            {
-              key: '2',
-              name: '胡彦祖1',
-              age: 42,
-              address: '西湖区湖底公园1号',
-            },
-            {
-                key: '3',
-                name: '胡彦斌',
-                age: 32,
-                address: '西湖区湖底公园1号',
-              },
-              {
-                key: '4',
-                name: '胡彦祖1',
-                age: 42,
-                address: '西湖区湖底公园1号',
-              },
-              {
-                key: '5',
-                name: '胡彦斌',
-                age: 32,
-                address: '西湖区湖底公园1号',
-              },
-              {
-                key: '6',
-                name: '胡彦祖1',
-                age: 42,
-                address: '西湖区湖底公园1号',
-              },
-        ])
-
-        // 请求数据
-
-        onMounted(() => {
-
-        })
-        
-        return () => <div class={styles["jtable-body"]}>
-            <div class={styles["jtable-body-header"]}>
-                <div class={styles["jtable-body-header-left"]}>
-                    {/* 顶部左边插槽 */}
-                    {slots.headerTitle && slots.headerTitle()}
-                </div>
-                <div class={styles["jtable-body-header-right"]}>
-                    {/* <Space> */}
-                        <div class={[styles["jtable-setting-item"], ModelEnum.CARD === model.value ? styles['active'] : '']} onClick={() => {
-                            model.value = ModelEnum.CARD
-                        }}>
-                            <AppstoreOutlined />
-                        </div>
-                        <div class={[styles["jtable-setting-item"], ModelEnum.TABLE === model.value ? styles['active'] : '']} onClick={() => {
-                            model.value = ModelEnum.TABLE
-                        }}>
-                            <UnorderedListOutlined  />
-                        </div>
-                    {/* </Space> */}
-                </div>
-            </div>
-            {/* content */}
-            <div class={styles['jtable-content']}>
-            {
-                model.value === ModelEnum.CARD ?
-                <div class={styles['jtable-card']}>
-                    {
-                        dataSource.value.length ? 
-                        <div 
-                            class={styles['jtable-card-items']}
-                            style={{gridTemplateColumns: `repeat(${column.value}, 1fr)`}}
-                        >
-                            {
-                                dataSource.value.map(item => slots.cardRender ? 
-                                    <div class={[styles['jtable-card-item'], props.cardBodyClass]}>{slots.cardRender(item)}</div>
-                                    : null)
-                            }
-                        </div> : 
-                        <div><Empty image={Empty.PRESENTED_IMAGE_SIMPLE} /></div>
-                    }
-                </div> :
-                <div>
-                    <Table
-                        dataSource={dataSource.value}
-                        columns={props.columns}
-                        pagination={false}
-                    />
-                </div>
-            }
-            </div>
-            {/* 分页 */}
-            {
-                dataSource.value.length && 
-                <div class={styles['jtable-pagination']}>
-                    <Pagination 
-                        size="small" 
-                        total={50}
-                        showTotal={(total) => {
-                            const min  = 1
-                            const max = 1
-                            return `第 ${min} - ${max} 条/总共 ${total} 条`
-                        }}
-                        onChange={() => {
-
-                        }}
-                        onShowSizeChange={() => {
-
-                        }}
-                    />
-                </div>
-            }
-        </div>
-    }
-})
-
-export default JTable
diff --git a/src/views/demo/index.vue b/src/views/demo/index.vue
index ed888967..3d4d8f98 100644
--- a/src/views/demo/index.vue
+++ b/src/views/demo/index.vue
@@ -11,8 +11,8 @@
                     status="disable"
                     :statusNames="{ disable: StatusColorEnum.error }"
                     statusText="正常"
-                    :showMask="false"
                     :actions="actions"
+                    v-model="data"
                 >
                     <template #img>
                         <img :src="getImage('/device-product.png')" />
@@ -63,6 +63,10 @@ const actions = ref([
         label: '删除',
     },
 ]);
+const data = ref({
+    id: 123
+})
+
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/demo/table/index.vue b/src/views/demo/table/index.vue
index c2986eb6..3c311295 100644
--- a/src/views/demo/table/index.vue
+++ b/src/views/demo/table/index.vue
@@ -18,34 +18,66 @@
                     dataIndex: 'classifiedName',
                     key: 'classifiedName',
                 },
+                {
+                    title: '操作',
+                    key: 'action',
+                    fixed: 'right',
+                    width: 250,
+                    scopedSlots: true
+                }   
             ]"
             :actions="actions"
             :request="request"
-            :rowSelection="rowSelection"
+            :rowSelection="{
+                selectedRowKeys: _selectedRowKeys,
+                onChange: onSelectChange
+            }"
+            @cancelSelect="cancelSelect"
         >
             <template #headerTitle>
                 <a-button type="primary">新增</a-button>
             </template>
-            <template #cardContent="slotProps">
-                <h3>{{slotProps.item.name}}</h3>
-                <a-row>
-                    <a-col :span="12">
-                        <div class="card-item-content-text">
-                            设备类型
-                        </div>
-                        <div>直连设备</div>
-                    </a-col>
-                    <a-col :span="12">
-                        <div class="card-item-content-text">
-                            产品名称
-                        </div>
-                        <div>测试固定地址</div>
-                    </a-col>
-                </a-row>
+            <template #card="slotProps">
+                <CardBox :value="slotProps" @click="handleClick" :actions="actions" v-bind="slotProps" :active="_selectedRowKeys.includes(slotProps.id)">
+                    <template #img>
+                        <slot name="img">
+                            <img :src="getImage('/device-product.png')" />
+                        </slot>
+                    </template>
+                    <template #content>
+                         <h3>{{slotProps.name}}</h3>
+                         <a-row>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">
+                                    设备类型
+                                </div>
+                                <div>直连设备</div>
+                            </a-col>
+                            <a-col :span="12">
+                                <div class="card-item-content-text">
+                                    产品名称
+                                </div>
+                                <div>测试固定地址</div>
+                            </a-col>
+                        </a-row>
+                    </template>
+                </CardBox>
             </template>
             <template #id="slotProps">
                 <a>{{slotProps.row.id}}</a>
             </template>
+            <template #action="slotProps">
+                <a-space :size="16">
+                    <a-tooltip v-for="i in actions" :key="i.key" v-bind="i.tooltip">
+                        <a-popconfirm v-if="i.popConfirm" v-bind="i.popConfirm">
+                            <a-button style="padding: 0" type="link"><AIcon :type="i.icon" /></a-button>
+                        </a-popconfirm>
+                        <a-button style="padding: 0" type="link" v-else @click="i.onClick && i.onClick(slotProps)">
+                            <AIcon :type="i.icon" />
+                        </a-button>
+                    </a-tooltip>
+                </a-space>
+            </template>
         </JTable>
     </div>
 </template>
@@ -54,7 +86,6 @@
 import server from "@/utils/request";
 import type { ActionsType } from '@/components/Table/index.vue'
 import { getImage } from '@/utils/comm';
-import type { TableProps, TableColumnType } from 'ant-design-vue';
 
 const request = (data: any) => server.post(`/device-product/_query`, data)
 const actions: ActionsType[] = [
@@ -65,30 +96,50 @@ const actions: ActionsType[] = [
         tooltip: {
             title: '编辑'
         },
-        // component: <UnorderedListOutlined />
+        icon: 'icon-rizhifuwu'
+    },
+    {
+        key: 'import',
+        // disabled: true,
+        text: "导入",
+        tooltip: {
+            title: '导入'
+        },
+        icon: 'icon-xiazai'
     },
     {
         key: 'delete',
-        disabled: true,
+        // disabled: true,
         text: "删除",
         tooltip: {
             title: '删除'
         },
         popConfirm: {
             title: '确认删除?'
-        }
+        },
     }
 ]
 
-const rowSelection: TableProps['rowSelection'] = {
-    onChange: (selectedRowKeys: string[], selectedRows: any[]) => {
-        console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
-    },
-    getCheckboxProps: (record: any) => ({
-        disabled: record.name === 'Disabled User',
-        name: record.name,
-    }),
-};
+const _selectedRowKeys = ref<string[]>([])
+
+const onSelectChange = (keys: string[]) => {
+    _selectedRowKeys.value = [...keys]
+}
+
+const cancelSelect = () => {
+    _selectedRowKeys.value = []
+}
+
+const handleClick = (dt: any) => {
+    // _selectedRowKeys.value = [dt.id] // 单选
+    // _selectedRowKeys.value = [..._selectedRowKeys.value, dt.id] // 多选
+    if(_selectedRowKeys.value.includes(dt.id)) {
+        const _index = _selectedRowKeys.value.findIndex(i => i === dt.id)
+        _selectedRowKeys.value.splice(_index, 1)
+    } else {
+        _selectedRowKeys.value = [..._selectedRowKeys.value, dt.id]
+    }
+}
 
 </script>