From a4830e4c30ece00523cd296824271802c4b163b0 Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Wed, 11 Jan 2023 10:50:31 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E8=A1=A8=E5=8D=95=E5=A4=9A=E5=B1=82?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C=E3=80=81=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=95=B0=E6=8D=AE=E5=8F=8C=E5=90=91=E7=BB=91?= =?UTF-8?q?=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" > - + - + - + - + @@ -61,6 +63,8 @@ class="form-submit" html-type="submit" type="primary" + @click.prevent="onSubmit" + :loading="loading" >保存 @@ -89,7 +93,7 @@ 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 @@ - + 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 @@ \ No newline at end of file + 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 3/8] =?UTF-8?q?fix:=20=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=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 4/8] =?UTF-8?q?fix:=20=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=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 @@
第三方账户绑定
- + + 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 @@ + + + + + \ 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 @@ + + + + + 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 @@ + + + + + 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) => { \ 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 @@ + + + + + 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 @@ + + + + + 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 @@ 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 7/8] =?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 @@
-
+
@@ -27,7 +20,7 @@ -
+
@@ -47,21 +40,12 @@ >
- - -
- -
-
+
- - + + + + +
@@ -89,18 +87,26 @@ 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 @@
- +
+ + + +
- - - - +
@@ -46,23 +41,21 @@
- +