From 58106e9fe469358a51e795ad90903d7507c91b8d Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Wed, 8 Mar 2023 19:43:36 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=BA=94=E7=94=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9B=BF=E6=8D=A2=E3=80=81=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/Apply/Save/components/Does.vue     |  10 +-
 .../system/Apply/Save/components/EditForm.vue | 422 +++++++++---------
 .../Apply/Save/components/FormLabel.vue       |   4 +-
 .../Apply/Save/components/RequestTable.vue    |  29 +-
 src/views/system/Apply/Save/index.vue         |  21 +-
 .../system/Apply/componenets/MenuDialog.vue   | 113 +++--
 src/views/system/Apply/index.vue              |  67 +--
 7 files changed, 338 insertions(+), 328 deletions(-)

diff --git a/src/views/system/Apply/Save/components/Does.vue b/src/views/system/Apply/Save/components/Does.vue
index e6653501..8f792a25 100644
--- a/src/views/system/Apply/Save/components/Does.vue
+++ b/src/views/system/Apply/Save/components/Does.vue
@@ -12,7 +12,7 @@
                 内部独立应用的<span>后端服务</span>相互<span>独立运行</span>，互不影响。
             </div>
             <div class="image">
-                <a-image width="100%" :src="img1" />
+                <j-image width="100%" :src="img1" />
             </div>
 
             <h1>2.接入方式说明</h1>
@@ -58,7 +58,7 @@
             </div>
             <div>内部独立应用的<span>后端服务在同一个环境运行</span>。</div>
             <div class="image">
-                <a-image width="100%" :src="img2" />
+                <j-image width="100%" :src="img2" />
             </div>
             <h1>2.接入方式说明</h1>
             <div>1、页面集成</div>
@@ -86,7 +86,7 @@
             <h1>1.概述</h1>
             <div>钉钉企业内部应用适用于通过钉钉登录<span>物联网平台</span></div>
             <div class="image">
-                <a-image width="100%" :src="img4" />
+                <j-image width="100%" :src="img4" />
             </div>
             <h1>2.接入方式说明</h1>
             <div>1、单点登录</div>
@@ -106,7 +106,7 @@
             <h1>1.概述</h1>
             <div>微信网站应用适用于通过微信授权登录<span>物联网平台</span></div>
             <div class="image">
-                <a-image width="100%" :src="img3" />
+                <j-image width="100%" :src="img3" />
             </div>
             <h1>2.接入方式说明</h1>
             <div>1、单点登录</div>
@@ -121,7 +121,7 @@
                 。例如将公司业务管理系统集成至物联网平台，或者将物联网平台集成至业务管理系统。以实现多处访问、集中管控的业务场景。
             </div>
             <div class="image">
-                <a-image width="100%" :src="img5" />
+                <j-image width="100%" :src="img5" />
             </div>
             <h1>2.接入方式说明</h1>
             <div>1、页面集成</div>
diff --git a/src/views/system/Apply/Save/components/EditForm.vue b/src/views/system/Apply/Save/components/EditForm.vue
index 1146df17..f7219994 100644
--- a/src/views/system/Apply/Save/components/EditForm.vue
+++ b/src/views/system/Apply/Save/components/EditForm.vue
@@ -1,13 +1,13 @@
 <template>
     <div class="edit-form-container">
-        <a-form
+        <j-form
             ref="formRef"
             :model="form.data"
             layout="vertical"
             class="form"
             @validate="getErrorNum"
         >
-            <a-form-item
+            <j-form-item
                 label="名称"
                 name="name"
                 :rules="[
@@ -21,12 +21,12 @@
                     },
                 ]"
             >
-                <a-input
+                <j-input
                     v-model:value="form.data.name"
                     placeholder="请输入名称"
                 />
-            </a-form-item>
-            <a-form-item
+            </j-form-item>
+            <j-form-item
                 label="应用"
                 name="provider"
                 :rules="[
@@ -36,14 +36,14 @@
                     },
                 ]"
             >
-                <a-radio-group
+                <j-radio-group
                     v-model:value="form.data.provider"
                     class="radio-container"
                     :disabled="!!routeQuery.id"
                 >
-                    <a-radio-button value="internal-standalone">
+                    <j-radio-button value="internal-standalone">
                         <div>
-                            <a-image
+                            <j-image
                                 :preview="false"
                                 :src="getImage('/apply/provider1.png')"
                                 width="64px"
@@ -51,46 +51,46 @@
                             />
                             <p>内部独立应用</p>
                         </div>
-                    </a-radio-button>
-                    <a-radio-button value="internal-integrated">
+                    </j-radio-button>
+                    <j-radio-button value="internal-integrated">
                         <div>
-                            <a-image
+                            <j-image
                                 :preview="false"
                                 :src="getImage('/apply/provider2.png')"
                             />
                             <p>内部集成应用</p>
                         </div>
-                    </a-radio-button>
-                    <a-radio-button value="wechat-webapp">
+                    </j-radio-button>
+                    <j-radio-button value="wechat-webapp">
                         <div>
-                            <a-image
+                            <j-image
                                 :preview="false"
                                 :src="getImage('/apply/provider3.png')"
                             />
                             <p>微信网站应用</p>
                         </div>
-                    </a-radio-button>
-                    <a-radio-button value="dingtalk-ent-app">
+                    </j-radio-button>
+                    <j-radio-button value="dingtalk-ent-app">
                         <div>
-                            <a-image
+                            <j-image
                                 :preview="false"
                                 :src="getImage('/apply/provider4.png')"
                             />
                             <p>钉钉企业内部应用</p>
                         </div>
-                    </a-radio-button>
-                    <a-radio-button value="third-party">
+                    </j-radio-button>
+                    <j-radio-button value="third-party">
                         <div>
-                            <a-image
+                            <j-image
                                 :preview="false"
                                 :src="getImage('/apply/provider5.png')"
                             />
                             <p>第三方应用</p>
                         </div>
-                    </a-radio-button>
-                </a-radio-group>
-            </a-form-item>
-            <a-form-item
+                    </j-radio-button>
+                </j-radio-group>
+            </j-form-item>
+            <j-form-item
                 label="接入方式"
                 name="integrationModes"
                 :rules="[
@@ -100,7 +100,7 @@
                     },
                 ]"
             >
-                <a-checkbox-group
+                <j-checkbox-group
                     v-model:value="form.data.integrationModes"
                     :options="joinOptions"
                     @change="
@@ -109,11 +109,11 @@
                         ]
                     "
                 />
-            </a-form-item>
+            </j-form-item>
 
-            <a-collapse v-model:activeKey="form.integrationModesISO">
+            <j-collapse v-model:activeKey="form.integrationModesISO">
                 <!-- 页面集成 -->
-                <a-collapse-panel
+                <j-collapse-panel
                     key="page"
                     v-if="form.data.integrationModes.includes('page')"
                 >
@@ -128,7 +128,7 @@
                             </span>
                         </span>
                     </template>
-                    <a-form-item
+                    <j-form-item
                         :name="['page', 'baseUrl']"
                         class="resetLabel"
                         :rules="[
@@ -145,12 +145,12 @@
                                 tooltip="填写访问其它平台的地址"
                             />
                         </template>
-                        <a-input
+                        <j-input
                             v-model:value="form.data.page.baseUrl"
                             placeholder="请输入接入地址"
                         />
-                    </a-form-item>
-                    <a-form-item
+                    </j-form-item>
+                    <j-form-item
                         label="路由方式"
                         :name="['page', 'routeType']"
                         :rules="[
@@ -160,15 +160,15 @@
                             },
                         ]"
                     >
-                        <a-select v-model:value="form.data.page.routeType">
-                            <a-select-option value="hash">hash</a-select-option>
-                            <a-select-option value="history"
-                                >history</a-select-option
+                        <j-select v-model:value="form.data.page.routeType">
+                            <j-select-option value="hash">hash</j-select-option>
+                            <j-select-option value="history"
+                                >history</j-select-option
                             >
-                        </a-select>
-                    </a-form-item>
+                        </j-select>
+                    </j-form-item>
 
-                    <a-form-item v-if="form.data.provider === 'third-party'">
+                    <j-form-item v-if="form.data.provider === 'third-party'">
                         <template #label>
                             <FormLabel
                                 text="参数"
@@ -185,10 +185,10 @@
                                 { label: 'token', value: 'token' },
                             ]"
                         />
-                    </a-form-item>
-                </a-collapse-panel>
+                    </j-form-item>
+                </j-collapse-panel>
                 <!-- API客户端 -->
-                <a-collapse-panel
+                <j-collapse-panel
                     key="apiClient"
                     v-if="form.data.integrationModes.includes('apiClient')"
                 >
@@ -203,7 +203,7 @@
                             </span>
                         </span>
                     </template>
-                    <a-form-item
+                    <j-form-item
                         class="resetLabel"
                         :name="['apiClient', 'baseUrl']"
                         :rules="[
@@ -220,13 +220,13 @@
                                 tooltip="访问Api服务的地址"
                             />
                         </template>
-                        <a-input
+                        <j-input
                             v-model:value="form.data.apiClient.baseUrl"
                             placeholder="请输入接口地址"
                         />
-                    </a-form-item>
+                    </j-form-item>
                     <div v-if="form.data.provider === 'internal-standalone'">
-                        <a-form-item
+                        <j-form-item
                             class="resetLabel"
                             :name="[
                                 'apiClient',
@@ -248,15 +248,15 @@
                                     tooltip="认证授权地址"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.apiClient.authConfig.oauth2
                                         .authorizationUrl
                                 "
                                 placeholder="请输入授权地址"
                             />
-                        </a-form-item>
-                        <a-form-item
+                        </j-form-item>
+                        <j-form-item
                             class="resetLabel"
                             :name="[
                                 'apiClient',
@@ -278,30 +278,30 @@
                                     tooltip="设置token令牌的地址"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.apiClient.authConfig.oauth2
                                         .tokenUrl
                                 "
                                 placeholder="请输入token地址"
                             />
-                        </a-form-item>
-                        <a-form-item>
+                        </j-form-item>
+                        <j-form-item>
                             <template #label>
                                 <FormLabel
                                     text="回调地址"
                                     tooltip="授权完成后跳转到具体页面的回调地址"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.apiClient.authConfig.oauth2
                                         .redirectUri
                                 "
                                 placeholder="请输入回调地址"
                             />
-                        </a-form-item>
-                        <a-form-item
+                        </j-form-item>
+                        <j-form-item
                             class="resetLabel"
                             :name="[
                                 'apiClient',
@@ -327,15 +327,15 @@
                                     tooltip="第三方应用唯一标识"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.apiClient.authConfig.oauth2
                                         .clientId
                                 "
                                 placeholder="请输入appId"
                             />
-                        </a-form-item>
-                        <a-form-item
+                        </j-form-item>
+                        <j-form-item
                             class="resetLabel"
                             :name="[
                                 'apiClient',
@@ -361,43 +361,43 @@
                                     tooltip="第三方应用唯一标识的密钥"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.apiClient.authConfig.oauth2
                                         .clientSecret
                                 "
                                 placeholder="请输入appKey"
                             />
-                        </a-form-item>
+                        </j-form-item>
                     </div>
                     <div v-else-if="form.data.provider === 'third-party'">
-                        <a-form-item
+                        <j-form-item
                             label="认证方式"
                             :name="['apiClient', 'authConfig', 'type']"
                             :rules="[{ required: true }]"
                         >
-                            <a-select
+                            <j-select
                                 v-model:value="
                                     form.data.apiClient.authConfig.type
                                 "
                             >
-                                <a-select-option value="oauth2">
+                                <j-select-option value="oauth2">
                                     OAuth2
-                                </a-select-option>
-                                <a-select-option value="basic">
+                                </j-select-option>
+                                <j-select-option value="basic">
                                     基本认证
-                                </a-select-option>
-                                <a-select-option value="bearer">
+                                </j-select-option>
+                                <j-select-option value="bearer">
                                     bearer认证
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
+                                </j-select-option>
+                            </j-select>
+                        </j-form-item>
                         <div
                             v-if="
                                 form.data.apiClient.authConfig.type === 'oauth2'
                             "
                         >
-                            <a-form-item
+                            <j-form-item
                                 class="resetLabel"
                                 :name="[
                                     'apiClient',
@@ -419,16 +419,16 @@
                                         tooltip="认证授权地址"
                                     />
                                 </template>
-                                <a-input
+                                <j-input
                                     v-model:value="
                                         form.data.apiClient.authConfig.oauth2
                                             .authorizationUrl
                                     "
                                     placeholder="请输入授权地址"
                                 />
-                            </a-form-item>
+                            </j-form-item>
 
-                            <a-form-item
+                            <j-form-item
                                 label="请求方式"
                                 :name="[
                                     'apiClient',
@@ -443,22 +443,22 @@
                                     },
                                 ]"
                             >
-                                <a-select
+                                <j-select
                                     v-model:value="
                                         form.data.apiClient.authConfig.oauth2
                                             .tokenRequestType
                                     "
                                 >
-                                    <a-select-option value="POST_BODY">
+                                    <j-select-option value="POST_BODY">
                                         请求体
-                                    </a-select-option>
-                                    <a-select-option value="POST_URI">
+                                    </j-select-option>
+                                    <j-select-option value="POST_URI">
                                         请求头
-                                    </a-select-option>
-                                </a-select>
-                            </a-form-item>
+                                    </j-select-option>
+                                </j-select>
+                            </j-form-item>
 
-                            <a-form-item
+                            <j-form-item
                                 class="resetLabel"
                                 :name="[
                                     'apiClient',
@@ -480,15 +480,15 @@
                                         tooltip="应用唯一标识"
                                     />
                                 </template>
-                                <a-input
+                                <j-input
                                     v-model:value="
                                         form.data.apiClient.authConfig.oauth2
                                             .clientId
                                     "
                                     placeholder="请输入client_id"
                                 />
-                            </a-form-item>
-                            <a-form-item
+                            </j-form-item>
+                            <j-form-item
                                 class="resetLabel"
                                 :name="[
                                     'apiClient',
@@ -510,21 +510,21 @@
                                         tooltip="应用唯一标识的秘钥"
                                     />
                                 </template>
-                                <a-input
+                                <j-input
                                     v-model:value="
                                         form.data.apiClient.authConfig.oauth2
                                             .clientSecret
                                     "
                                     placeholder="请输入client_secret"
                                 />
-                            </a-form-item>
+                            </j-form-item>
                         </div>
                         <div
                             v-else-if="
                                 form.data.apiClient.authConfig.type === 'basic'
                             "
                         >
-                            <a-form-item
+                            <j-form-item
                                 label="用户名"
                                 :name="[
                                     'apiClient',
@@ -539,15 +539,15 @@
                                     },
                                 ]"
                             >
-                                <a-input
+                                <j-input
                                     v-model:value="
                                         form.data.apiClient.authConfig.basic
                                             .username
                                     "
                                     placeholder="请输入用户名"
                                 />
-                            </a-form-item>
-                            <a-form-item
+                            </j-form-item>
+                            <j-form-item
                                 label="密码"
                                 :name="[
                                     'apiClient',
@@ -562,16 +562,16 @@
                                     },
                                 ]"
                             >
-                                <a-input
+                                <j-input
                                     v-model:value="
                                         form.data.apiClient.authConfig.basic
                                             .password
                                     "
                                     placeholder="请输入密码"
                                 />
-                            </a-form-item>
+                            </j-form-item>
                         </div>
-                        <a-form-item
+                        <j-form-item
                             v-else-if="
                                 form.data.apiClient.authConfig.type === 'bearer'
                             "
@@ -584,17 +584,17 @@
                                 },
                             ]"
                         >
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.apiClient.authConfig.token
                                 "
                                 placeholder="请输入token"
                             />
-                        </a-form-item>
+                        </j-form-item>
                     </div>
 
                     <div v-if="form.data.provider !== 'internal-integrated'">
-                        <a-form-item>
+                        <j-form-item>
                             <template #label>
                                 <FormLabel
                                     text="请求头"
@@ -605,16 +605,16 @@
                             <RequestTable
                                 v-model:value="form.data.apiClient.headers"
                             />
-                        </a-form-item>
-                        <a-form-item label="参数">
+                        </j-form-item>
+                        <j-form-item label="参数">
                             <RequestTable
                                 v-model:value="form.data.apiClient.parameters"
                             />
-                        </a-form-item>
+                        </j-form-item>
                     </div>
-                </a-collapse-panel>
+                </j-collapse-panel>
                 <!-- API服务 -->
-                <a-collapse-panel
+                <j-collapse-panel
                     key="apiServer"
                     v-if="form.data.integrationModes.includes('apiServer')"
                 >
@@ -629,7 +629,7 @@
                             </span>
                         </span>
                     </template>
-                    <a-form-item
+                    <j-form-item
                         class="resetLabel"
                         v-if="!form.data.integrationModes.includes('apiClient')"
                         :name="['apiServer', 'appId']"
@@ -642,14 +642,14 @@
                                 tooltip="第三方应用唯一标识"
                             />
                         </template>
-                        <a-input
+                        <j-input
                             v-model:value="form.data.apiServer.appId"
                             disabled
                             placeholder="请输入appId"
                         />
-                    </a-form-item>
+                    </j-form-item>
 
-                    <a-form-item
+                    <j-form-item
                         class="resetLabel"
                         :name="['apiServer', 'secureKey']"
                         :rules="[
@@ -670,12 +670,12 @@
                                 tooltip="第三方应用唯一标识匹配的秘钥"
                             />
                         </template>
-                        <a-input
+                        <j-input
                             v-model:value="form.data.apiServer.secureKey"
                             placeholder="请输入secureKey"
                         />
-                    </a-form-item>
-                    <a-form-item
+                    </j-form-item>
+                    <j-form-item
                         class="resetLabel"
                         v-show="form.data.provider === 'internal-standalone'"
                     >
@@ -685,12 +685,12 @@
                                 tooltip="授权完成后跳转到具体页面的回调地址"
                             />
                         </template>
-                        <a-input
+                        <j-input
                             v-model:value="form.data.apiServer.redirectUri"
                             placeholder="请输入redirectUri"
                         />
-                    </a-form-item>
-                    <a-form-item
+                    </j-form-item>
+                    <j-form-item
                         class="resetLabel"
                         :name="['apiServer', 'roleIdList']"
                         :rules="[
@@ -707,12 +707,12 @@
                                 tooltip="为应用用户分配角色，根据绑定的角色，进行系统菜单赋权"
                             />
                         </template>
-                        <a-select
+                        <j-select
                             v-model:value="form.data.apiServer.roleIdList"
                             :options="form.roleIdList"
                             mode="multiple"
                             placeholder="请选中角色"
-                        ></a-select>
+                        ></j-select>
                         <PermissionButton
                             :uhasPermission="`${rolePermission}:update`"
                             type="link"
@@ -726,15 +726,15 @@
                         >
                             <AIcon type="PlusOutlined" />
                         </PermissionButton>
-                    </a-form-item>
-                    <a-form-item>
+                    </j-form-item>
+                    <j-form-item>
                         <template #label>
                             <FormLabel
                                 text="组织"
                                 tooltip="为应用用户分配所属组织，根据绑定的组织，进行数据隔离"
                             />
                         </template>
-                        <a-tree-select
+                        <j-tree-select
                             v-model:value="form.data.apiServer.orgIdList"
                             show-search
                             style="width: 100%"
@@ -753,7 +753,7 @@
                             <template #title="{ name }">
                                 {{ name }}
                             </template>
-                        </a-tree-select>
+                        </j-tree-select>
                         <PermissionButton
                             :uhasPermission="`${deptPermission}:update`"
                             type="link"
@@ -767,33 +767,33 @@
                         >
                             <AIcon type="PlusOutlined" />
                         </PermissionButton>
-                    </a-form-item>
+                    </j-form-item>
 
                     <div v-if="form.data.provider === 'third-party'">
-                        <a-form-item>
+                        <j-form-item>
                             <template #label>
                                 <FormLabel
                                     text="redirectUrl"
                                     tooltip="授权后自动跳转的页面地址"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="form.data.apiServer.redirectUri"
                                 placeholder="请输入redirectUrl"
                             />
-                        </a-form-item>
-                        <a-form-item label="IP白名单">
-                            <a-textarea
+                        </j-form-item>
+                        <j-form-item label="IP白名单">
+                            <j-textarea
                                 v-model:value="form.data.apiServer.ipWhiteList"
                                 placeholder="请输入IP白名单，多个地址回车分隔，不填默认均可访问"
                                 :rows="3"
                                 style="width: 100%"
                             />
-                        </a-form-item>
+                        </j-form-item>
                     </div>
-                </a-collapse-panel>
+                </j-collapse-panel>
                 <!-- 单点登录 -->
-                <a-collapse-panel
+                <j-collapse-panel
                     key="ssoClient"
                     v-if="form.data.integrationModes.includes('ssoClient')"
                 >
@@ -815,7 +815,7 @@
                     </template>
                     <!-- 第三方应用 -->
                     <div v-if="form.data.provider === 'third-party'">
-                        <a-form-item
+                        <j-form-item
                             label="认证方式"
                             :name="['sso', 'configuration', 'oauth2', 'type']"
                             :rules="[
@@ -825,7 +825,7 @@
                                 },
                             ]"
                         >
-                            <a-select
+                            <j-select
                                 v-model:value="
                                     form.data.sso.configuration.oauth2.type
                                 "
@@ -834,9 +834,9 @@
                                     { label: 'oauth2', value: 'oauth2' },
                                 ]"
                             />
-                        </a-form-item>
+                        </j-form-item>
 
-                        <a-form-item
+                        <j-form-item
                             class="resetLabel"
                             :name="['sso', 'configuration', 'oauth2', 'scope']"
                             :rules="[
@@ -857,14 +857,14 @@
                                     tooltip="限制用户访问应用程序的权限"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.sso.configuration.oauth2.scope
                                 "
                                 placeholder="请输入scope"
                             />
-                        </a-form-item>
-                        <a-form-item
+                        </j-form-item>
+                        <j-form-item
                             class="resetLabel"
                             :name="[
                                 'sso',
@@ -890,14 +890,14 @@
                                     tooltip="应用唯一标识"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.sso.configuration.oauth2.clientId
                                 "
                                 placeholder="请输入client_id"
                             />
-                        </a-form-item>
-                        <a-form-item
+                        </j-form-item>
+                        <j-form-item
                             class="resetLabel"
                             :name="[
                                 'sso',
@@ -923,16 +923,16 @@
                                     tooltip="应用唯一标识的秘钥"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.sso.configuration.oauth2
                                         .clientSecret
                                 "
                                 placeholder="请输入client_secret"
                             />
-                        </a-form-item>
+                        </j-form-item>
                     </div>
-                    <a-form-item
+                    <j-form-item
                         v-if="
                             (form.data.provider === 'internal-standalone' ||
                                 form.data.provider === 'third-party') &&
@@ -959,18 +959,18 @@
                                 tooltip="认证授权地址"
                             />
                         </template>
-                        <a-input
+                        <j-input
                             v-model:value="
                                 form.data.sso.configuration.oauth2
                                     .authorizationUrl
                             "
                             placeholder="请输入授权地址"
                         />
-                    </a-form-item>
+                    </j-form-item>
 
                     <!-- 第三方应用 -->
                     <div v-if="form.data.provider === 'third-party'">
-                        <a-form-item
+                        <j-form-item
                             class="resetLabel"
                             :name="[
                                 'sso',
@@ -992,14 +992,14 @@
                                     tooltip="设置token令牌的地址"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.sso.configuration.oauth2.tokenUrl
                                 "
                                 placeholder="请输入token地址"
                             />
-                        </a-form-item>
-                        <a-form-item label="logo">
+                        </j-form-item>
+                        <j-form-item label="logo">
                             <a-upload
                                 v-model:file-list="form.fileList"
                                 accept=".jpg,.png,.jfif,.pjp,.pjpeg,.jpeg"
@@ -1022,9 +1022,9 @@
                                             .logoUrl
                                     "
                                     alt="avatar"
-                                    style="width: 150px;"
+                                    style="width: 150px"
                                 />
-                                <div v-else style="width: 150px;">  
+                                <div v-else style="width: 150px">
                                     <AIcon
                                         :type="
                                             form.uploadLoading
@@ -1032,18 +1032,14 @@
                                                 : 'PlusOutlined'
                                         "
                                     />
-                                    <!-- <loading-outlined
-                                        v-if="loading"
-                                    ></loading-outlined>
-                                    <plus-outlined v-else></plus-outlined> -->
                                     <div class="ant-upload-text">
                                         点击上传图片
                                     </div>
                                 </div>
                             </a-upload>
-                        </a-form-item>
+                        </j-form-item>
 
-                        <a-form-item
+                        <j-form-item
                             label="用户信息地址"
                             :name="[
                                 'sso',
@@ -1058,15 +1054,15 @@
                                 },
                             ]"
                         >
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.sso.configuration.oauth2
                                         .userInfoUrl
                                 "
                                 placeholder="请输入用户信息地址"
                             />
-                        </a-form-item>
-                        <a-form-item
+                        </j-form-item>
+                        <j-form-item
                             class="resetLabel"
                             :name="[
                                 'sso',
@@ -1089,15 +1085,15 @@
                                     tooltip="通过jsonpath表达式从授权结果中获取第三方平台用户的唯一标识"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.sso.configuration.oauth2
                                         .userProperty.userId
                                 "
                                 placeholder="输入从用户信息接口返回数据中的用户ID字段。示例:result.id"
                             />
-                        </a-form-item>
-                        <a-form-item
+                        </j-form-item>
+                        <j-form-item
                             label="用户名"
                             :name="[
                                 'sso',
@@ -1113,23 +1109,23 @@
                                 },
                             ]"
                         >
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.sso.configuration.oauth2
                                         .userProperty.username
                                 "
                                 placeholder="输入从用户信息接口返回数据中的用户名字段。示例:result.name"
                             />
-                        </a-form-item>
-                        <a-form-item label="头像">
-                            <a-input
+                        </j-form-item>
+                        <j-form-item label="头像">
+                            <j-input
                                 v-model:value="
                                     form.data.sso.configuration.oauth2
                                         .userProperty.avatar
                                 "
                                 placeholder="输入从用户信息接口返回数据中的用户头像字段。示例:result.avatar"
                             />
-                        </a-form-item>
+                        </j-form-item>
                     </div>
                     <!-- 非第三方应用 -->
                     <div
@@ -1137,7 +1133,7 @@
                             !form.data.integrationModes.includes('apiClient')
                         "
                     >
-                        <a-form-item
+                        <j-form-item
                             v-if="form.data.provider === 'internal-standalone'"
                         >
                             <template #label>
@@ -1146,16 +1142,16 @@
                                     tooltip="授权完成后跳转到具体页面的回调地址"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.sso.configuration.oauth2
                                         .redirectUri
                                 "
                                 placeholder="请输入回调地址"
                             />
-                        </a-form-item>
+                        </j-form-item>
                         <!-- 非钉钉 -->
-                        <a-form-item
+                        <j-form-item
                             v-if="form.data.provider !== 'dingtalk-ent-app'"
                             class="resetLabel"
                             :name="[
@@ -1178,15 +1174,15 @@
                                     tooltip="第三方应用唯一标识"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.sso.configuration.oauth2.clientId
                                 "
                                 placeholder="请输入appId"
                             />
-                        </a-form-item>
+                        </j-form-item>
                         <!-- 非微信 -->
-                        <a-form-item
+                        <j-form-item
                             v-if="form.data.provider !== 'wechat-webapp'"
                             class="resetLabel"
                             :name="[
@@ -1209,17 +1205,17 @@
                                     tooltip="第三方应用唯一标识的密钥"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.sso.configuration.oauth2
                                         .clientSecret
                                 "
                                 placeholder="请输入appKey"
                             />
-                        </a-form-item>
+                        </j-form-item>
 
                         <!-- 钉钉 + 微信 -->
-                        <a-form-item
+                        <j-form-item
                             v-if="
                                 form.data.provider === 'wechat-webapp' ||
                                 form.data.provider === 'dingtalk-ent-app'
@@ -1240,16 +1236,16 @@
                                     tooltip="应用的唯一标识的秘钥"
                                 />
                             </template>
-                            <a-input
+                            <j-input
                                 v-model:value="
                                     form.data.sso.configuration.appSecret
                                 "
                                 placeholder="请输入appSecret"
                             />
-                        </a-form-item>
+                        </j-form-item>
                     </div>
 
-                    <a-form-item class="resetLabel">
+                    <j-form-item class="resetLabel">
                         <template #label>
                             <FormLabel
                                 text="自动创建用户"
@@ -1257,12 +1253,12 @@
                                 tooltip="开启后，第三方用户第一次授权登录系统时，无需进入授权绑定页面。系统默认创建一个新用户与之绑定。"
                             />
                         </template>
-                        <a-switch
+                        <j-switch
                             v-model:checked="form.data.sso.autoCreateUser"
                         />
-                    </a-form-item>
+                    </j-form-item>
                     <div v-if="form.data.sso.autoCreateUser">
-                        <a-form-item
+                        <j-form-item
                             label="用户名前缀"
                             :name="['sso', 'usernamePrefix']"
                             :rules="[
@@ -1272,12 +1268,12 @@
                                 },
                             ]"
                         >
-                            <a-input
+                            <j-input
                                 v-model:value="form.data.sso.usernamePrefix"
                                 placeholder="请输入用户名前缀"
                             />
-                        </a-form-item>
-                        <a-form-item
+                        </j-form-item>
+                        <j-form-item
                             label="默认密码"
                             :name="['sso', 'defaultPasswd']"
                             :rules="[
@@ -1287,19 +1283,19 @@
                                 },
                             ]"
                         >
-                            <a-input
+                            <j-input
                                 v-model:value="form.data.sso.defaultPasswd"
                                 placeholder="请输入默认密码"
                             />
-                        </a-form-item>
+                        </j-form-item>
 
-                        <a-form-item label="角色">
-                            <a-select
+                        <j-form-item label="角色">
+                            <j-select
                                 v-model:value="form.data.sso.roleIdList"
                                 mode="multiple"
                                 :options="form.roleIdList"
                                 placeholder="请选中角色"
-                            ></a-select>
+                            ></j-select>
                             <PermissionButton
                                 :uhasPermission="`${rolePermission}:update`"
                                 type="link"
@@ -1313,9 +1309,9 @@
                             >
                                 <AIcon type="PlusOutlined" />
                             </PermissionButton>
-                        </a-form-item>
-                        <a-form-item label="组织">
-                            <a-tree-select
+                        </j-form-item>
+                        <j-form-item label="组织">
+                            <j-tree-select
                                 v-model:value="form.data.sso.orgIdList"
                                 show-search
                                 style="width: 100%"
@@ -1334,7 +1330,7 @@
                                 <template #title="{ name }">
                                     {{ name }}
                                 </template>
-                            </a-tree-select>
+                            </j-tree-select>
                             <PermissionButton
                                 :uhasPermission="`${deptPermission}:update`"
                                 type="link"
@@ -1348,13 +1344,13 @@
                             >
                                 <AIcon type="PlusOutlined" />
                             </PermissionButton>
-                        </a-form-item>
+                        </j-form-item>
                     </div>
-                </a-collapse-panel>
-            </a-collapse>
+                </j-collapse-panel>
+            </j-collapse>
 
-            <a-form-item label="说明" name="description">
-                <a-textarea
+            <j-form-item label="说明" name="description">
+                <j-textarea
                     v-model:value="form.data.description"
                     placeholder="请输入说明"
                     showCount
@@ -1362,20 +1358,23 @@
                     :rows="3"
                     style="width: 100%"
                 />
-            </a-form-item>
-        </a-form>
+            </j-form-item>
+        </j-form>
 
-        <a-button
+        <j-button
             v-if="routeQuery.view !== 'true'"
             @click="clickSave"
             type="primary"
         >
             保存
-        </a-button>
+        </j-button>
 
         <div class="dialog">
             <MenuDialog
-                ref="dialogRef"
+                v-if="dialog.visible"
+                v-model:visible="dialog.visible"
+                :id="dialog.selectId"
+                :provider="dialog.selectProvider"
                 :mode="routeQuery.id ? 'edit' : 'add'"
             />
         </div>
@@ -1415,7 +1414,6 @@ const menuStory = useMenuStore();
 const deptPermission = 'system/Department';
 const rolePermission = 'system/Role';
 
-const dialogRef = ref();
 // 初始化表单
 const initForm: formType = {
     name: '',
@@ -1584,6 +1582,12 @@ const joinOptions = computed(() => {
         ];
 });
 
+const dialog = reactive({
+    visible: false,
+    selectId: '',
+    selectProvider: '' as any,
+});
+
 init();
 
 function init() {
@@ -1703,11 +1707,9 @@ function clickSave() {
                 const isPage = params.integrationModes.includes('page');
                 if (isPage) {
                     form.data = params;
-                    dialogRef.value &&
-                        dialogRef.value.openDialog(
-                            routeQuery.id || resp.result.id,
-                            form.data.provider,
-                        );
+                    dialog.selectId = routeQuery.id || resp.result.id;
+                    dialog.selectProvider = form.data.provider;
+                    dialog.visible = true;
                 } else {
                     message.success('保存成功');
                     menuStory.jumpPage('system/Apply');
@@ -1783,7 +1785,7 @@ function clearNullProp(obj: object) {
                         max-width: 150px;
                         max-height: 150px;
 
-                        >.ant-upload {
+                        > .ant-upload {
                             height: 150px;
                         }
                     }
diff --git a/src/views/system/Apply/Save/components/FormLabel.vue b/src/views/system/Apply/Save/components/FormLabel.vue
index 4be698bd..e7842dcd 100644
--- a/src/views/system/Apply/Save/components/FormLabel.vue
+++ b/src/views/system/Apply/Save/components/FormLabel.vue
@@ -2,10 +2,10 @@
     <div class="form-label-container">
         <span class="text">{{ props.text }}</span>
         <span class="required" v-show="props.required">*</span>
-        <a-tooltip>
+        <j-tooltip>
             <template #title>{{ props.tooltip }}</template>
             <AIcon type="QuestionCircleOutlined" class="icon" />
-        </a-tooltip>
+        </j-tooltip>
     </div>
 </template>
 
diff --git a/src/views/system/Apply/Save/components/RequestTable.vue b/src/views/system/Apply/Save/components/RequestTable.vue
index 4c8ff9ee..7ebb7f31 100644
--- a/src/views/system/Apply/Save/components/RequestTable.vue
+++ b/src/views/system/Apply/Save/components/RequestTable.vue
@@ -1,52 +1,52 @@
 <template>
     <div class="request-table-container">
-        <a-table
+        <j-table
             :columns="columns"
-            :data-source="tableData"
+            :datj-source="tableData"
             :pagination="false"
             size="small"
             bordered
         >
             <template #bodyCell="{ column, record, index }">
                 <template v-if="column.dataIndex === 'key'">
-                    <a-input v-model:value="record.label" />
+                    <j-input v-model:value="record.label" />
                 </template>
                 <template v-else-if="column.dataIndex === 'value'">
-                    <a-input
+                    <j-input
                         v-model:value="record.value"
                         v-if="props.valueType === 'input'"
                     />
-                    <a-select
+                    <j-select
                         v-else-if="props.valueType === 'select'"
                         v-model:value="record.value"
                     >
-                        <a-select-option
+                        <j-select-option
                             v-for="item in props.valueOptions"
                             :value="item.value"
-                            >{{ item.label }}</a-select-option
+                            >{{ item.label }}</j-select-option
                         >
-                    </a-select>
+                    </j-select>
                 </template>
                 <template v-else-if="column.dataIndex === 'action'">
-                    <a-button
+                    <j-button
                         type="link"
                         @click="removeRow((current - 1) * 10 + index)"
                     >
                         <AIcon type="DeleteOutlined" />
-                    </a-button>
+                    </j-button>
                 </template>
             </template>
-        </a-table>
-        <a-pagination
+        </j-table>
+        <j-pagination
             v-show="props.value.length > 10"
             v-model:current="current"
             :page-size="10"
             :total="props.value.length"
             show-less-items
         />
-        <a-button type="dashed" @click="addRow" class="add-btn">
+        <j-button type="dashed" @click="addRow" class="add-btn">
             <AIcon type="PlusOutlined" />新增
-        </a-button>
+        </j-button>
     </div>
 </template>
 
@@ -120,7 +120,6 @@ function addRow() {
         label: '',
         value: '',
     };
-    console.log(111);
 
     emits('update:value', [...props.value, newRow]);
 }
diff --git a/src/views/system/Apply/Save/index.vue b/src/views/system/Apply/Save/index.vue
index b18dfb58..8797e473 100644
--- a/src/views/system/Apply/Save/index.vue
+++ b/src/views/system/Apply/Save/index.vue
@@ -1,13 +1,13 @@
 <template>
     <page-container>
-        <a-card class="save-container">
-            <a-row :gutter="24">
-                <a-col :span="14">
+        <div class="save-container">
+            <j-row :gutter="24">
+                <j-col :span="14">
                     <EditForm @change-apply-type="chengeType" />
-                </a-col>
-                <a-col :span="10"><Does :type="rightType" /></a-col>
-            </a-row>
-        </a-card>
+                </j-col>
+                <j-col :span="10"><Does :type="rightType" /></j-col>
+            </j-row>
+        </div>
     </page-container>
 </template>
 
@@ -21,3 +21,10 @@ const chengeType = (newType: applyType) => {
     rightType.value = newType;
 };
 </script>
+
+<style lang="less" scoped>
+.save-container {
+    background-color: #fff;
+    padding: 24px;
+}
+</style>
diff --git a/src/views/system/Apply/componenets/MenuDialog.vue b/src/views/system/Apply/componenets/MenuDialog.vue
index bc4a5d7a..a5c306b0 100644
--- a/src/views/system/Apply/componenets/MenuDialog.vue
+++ b/src/views/system/Apply/componenets/MenuDialog.vue
@@ -1,30 +1,30 @@
 <template>
-    <a-modal
-        v-model:visible="dialog.visible"
+    <j-modal
+        visible
         title="集成菜单"
         width="600px"
-        @ok="dialog.handleOk"
-        @cancel="dialog.cancel"
+        @ok="handleOk"
+        @cancel="cancel"
         class="edit-dialog-container"
-        :confirmLoading="dialog.loading"
-        cancelText="取消"
-        okText="确定"
+        :confirmLoading="loading"
     >
-        <a-select
+        <j-select
             v-model:value="form.checkedSystem"
-            @change="(value) => value && getTree(value as string)"
+            @change="(value:string) => value && getTree(value)"
             style="width: 200px"
             placeholder="请选择集成系统"
         >
-            <a-select-option
+            <j-select-option
                 v-for="item in form.systemList"
                 :value="item.value"
-                >{{ item.label }}</a-select-option
+                >{{ item.label }}</j-select-option
             >
-        </a-select>
+        </j-select>
 
-        <p style="margin: 20px 0 0 0" v-show="form.menuTree.length > 0">当前集成菜单</p>
-        <a-tree
+        <p style="margin: 20px 0 0 0" v-show="form.menuTree.length > 0">
+            当前集成菜单
+        </p>
+        <j-tree
             v-model:checkedKeys="form.checkedMenu"
             v-model:expandedKeys="form.expandedKeys"
             checkable
@@ -35,8 +35,8 @@
             <template #title="{ name }">
                 <span>{{ name }}</span>
             </template>
-        </a-tree>
-    </a-modal>
+        </j-tree>
+    </j-modal>
 </template>
 
 <script setup lang="ts">
@@ -55,69 +55,60 @@ import { message } from 'ant-design-vue';
 import { getMenuTree_api } from '@/api/system/menu';
 
 const menuStory = useMenuStore();
-
+const emits = defineEmits(['update:visible']);
 const props = defineProps<{
     mode: 'add' | 'edit';
+    visible: boolean;
+    id: string;
+    provider: applyType;
 }>();
 // 弹窗相关
-const dialog = reactive({
-    visible: false,
-    loading: false,
-
-    handleOk: () => {
-        const items = filterTree(form.menuTree, [
-            ...form.checkedMenu,
-            ...form.half,
-        ]);
-        if (form.checkedSystem) {
-            if (items && items.length !== 0) {
-                saveOwnerMenu_api('iot', form.id, items).then((resp) => {
+const loading = ref(false);
+const handleOk = () => {
+    const items = filterTree(form.menuTree, [
+        ...form.checkedMenu,
+        ...form.half,
+    ]);
+    if (form.checkedSystem) {
+        if (items && items.length !== 0) {
+            loading.value = true;
+            saveOwnerMenu_api('iot', form.id, items)
+                .then((resp) => {
                     if (resp.status === 200) {
                         message.success('操作成功');
-                        dialog.visible = false;
+                        emits('update:visible', false);
                     }
-                });
-            } else {
-                message.warning('请勾选配置菜单');
-            }
+                })
+                .finally(() => (loading.value = false));
         } else {
-            message.warning('请选择所属系统');
+            message.warning('请勾选配置菜单');
         }
-    },
-    cancel: () => {
-        if (props.mode === 'add')
-            menuStory.jumpPage('system/Apply/Save', {}, { id: form.id });
-        dialog.visible = false;
-    },
-    changeVisible: (id: string, provider: applyType) => {
-        form.id = id;
-        form.provider = provider;
-        form.checkedSystem = undefined;
-        form.checkedMenu = [];
-        dialog.visible = true;
-
-        if (id) {
-            getSystemList();
-            getMenus();
-        }
-    },
-});
-// 将打开弹窗的操作暴露给父组件
-defineExpose({
-    openDialog: dialog.changeVisible,
-});
+    } else {
+        message.warning('请选择所属系统');
+    }
+};
+const cancel = () => {
+    if (props.mode === 'add')
+        menuStory.jumpPage('system/Apply/Save', {}, { id: form.id });
+    emits('update:visible', false);
+};
 
 const form = reactive({
-    id: '',
-    checkedSystem: '' as undefined | string,
+    id: props.id,
+    checkedSystem: undefined as undefined | string,
     checkedMenu: [] as string[],
     expandedKeys: [] as string[],
     half: [] as string[],
 
-    provider: '' as applyType,
+    provider: props.provider,
     systemList: [] as optionItemType[],
     menuTree: [] as any[],
 });
+
+if (props.id) {
+    getSystemList();
+    getMenus();
+}
 /**
  * 与集成系统关联的菜单
  * @param params
diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue
index 60116290..ff16c765 100644
--- a/src/views/system/Apply/index.vue
+++ b/src/views/system/Apply/index.vue
@@ -1,7 +1,10 @@
 <template>
     <page-container>
         <div class="apply-container">
-            <Search :columns="columns" @search="search" />
+            <j-advanced-search
+                :columns="columns"
+                @search="(params:any)=>queryParams = {...params}"
+            />
 
             <j-pro-table
                 ref="tableRef"
@@ -10,7 +13,7 @@
                 :defaultParams="{
                     sorts: [{ name: 'createTime', order: 'desc' }],
                 }"
-                :params="params"
+                :params="queryParams"
                 :gridColumn="3"
             >
                 <template #headerTitle>
@@ -53,8 +56,8 @@
                             <h3 class="card-item-content-title">
                                 {{ slotProps.name }}
                             </h3>
-                            <a-row>
-                                <a-col :span="12">
+                            <j-row>
+                                <j-col :span="12">
                                     <div class="card-item-content-text">
                                         类型
                                     </div>
@@ -65,45 +68,45 @@
                                             )
                                         }}
                                     </div>
-                                </a-col>
-                                <a-col :span="12">
+                                </j-col>
+                                <j-col :span="12">
                                     <div class="card-item-content-text">
                                         说明
                                     </div>
                                     <div>{{ slotProps.description }}</div>
-                                </a-col>
-                            </a-row>
+                                </j-col>
+                            </j-row>
                         </template>
                         <template #actions="item">
-                            <a-tooltip
+                            <j-tooltip
                                 v-bind="item.tooltip"
                                 :title="item.disabled && item.tooltip.title"
                             >
-                                <a-dropdown
+                                <j-dropdown
                                     placement="bottomRight"
                                     v-if="item.key === 'others'"
                                 >
-                                    <a-button>
+                                    <j-button>
                                         <AIcon :type="item.icon" />
                                         <span>{{ item.text }}</span>
-                                    </a-button>
+                                    </j-button>
                                     <template #overlay>
-                                        <a-menu>
-                                            <a-menu-item
+                                        <j-menu>
+                                            <j-menu-item
                                                 v-for="(o, i) in item.children"
                                                 :key="i"
                                             >
-                                                <a-button
+                                                <j-button
                                                     type="link"
                                                     @click="o.onClick"
                                                 >
                                                     <AIcon :type="o.icon" />
                                                     <span>{{ o.text }}</span>
-                                                </a-button>
-                                            </a-menu-item>
-                                        </a-menu>
+                                                </j-button>
+                                            </j-menu-item>
+                                        </j-menu>
                                     </template>
-                                </a-dropdown>
+                                </j-dropdown>
                                 <PermissionButton
                                     v-else
                                     :uhasPermission="item.permission"
@@ -117,7 +120,7 @@
                                         item.text
                                     }}</span>
                                 </PermissionButton>
-                            </a-tooltip>
+                            </j-tooltip>
                         </template>
 
                         <template #mark>
@@ -144,7 +147,7 @@
                     ></BadgeStatus>
                 </template>
                 <template #action="slotProps">
-                    <a-space :size="16">
+                    <j-space :size="16">
                         <PermissionButton
                             v-for="i in table.getActions(slotProps, 'table')"
                             :uhasPermission="i.permission"
@@ -156,12 +159,18 @@
                         >
                             <AIcon :type="i.icon" />
                         </PermissionButton>
-                    </a-space>
+                    </j-space>
                 </template>
             </j-pro-table>
         </div>
         <div class="dialogs">
-            <MenuDialog ref="dialogRef" mode="edit" />
+            <MenuDialog
+                v-if="dialogVisible"
+                v-model:visible="dialogVisible"
+                :id="selectId"
+                :provider="selectProvider"
+                mode="edit"
+            />
         </div>
     </page-container>
 </template>
@@ -263,11 +272,9 @@ const columns = [
         scopedSlots: true,
     },
 ];
-const params = ref({});
-const search = (newParams: any) => (params.value = { ...newParams });
+const queryParams = ref({});
 
 const tableRef = ref();
-const dialogRef = ref();
 const table = {
     refresh: () => {
         tableRef.value.reload();
@@ -359,8 +366,9 @@ const table = {
                 },
                 icon: 'MenuUnfoldOutlined',
                 onClick: () => {
-                    dialogRef.value &&
-                        dialogRef.value.openDialog(data.id, data.provider);
+                    selectId.value = data.id;
+                    selectProvider.value = data.provider;
+                    dialogVisible.value = true;
                 },
             });
         // 有api操作权限
@@ -415,6 +423,9 @@ const table = {
         return typeOptions.find((item) => item.value === val)?.label;
     },
 };
+const dialogVisible = ref(false);
+const selectId = ref<string>('');
+const selectProvider = ref<any>('');
 </script>
 
 <style lang="less" scoped>