From a0d65b3e927b4e50cba7ed74095e874c7810c3a7 Mon Sep 17 00:00:00 2001 From: "xinxin.wu" Date: Wed, 23 Aug 2023 18:25:32 +0800 Subject: [PATCH] =?UTF-8?q?style(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9=E5=BC=B9=E7=AA=97=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E5=92=8C=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=E9=97=B4?= =?UTF-8?q?=E8=B7=9D&=E6=8F=92=E4=BB=B6=E6=8C=89=E9=92=AE=E6=8D=A2?= =?UTF-8?q?=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/pure/ms-dialog/index.vue | 10 +-- .../member/components/addMemberModal.vue | 10 ++- .../setting/organization/member/index.vue | 2 + .../components/conifgModal.vue | 8 +-- .../pluginManager/components/pluginTable.vue | 68 +++++++++++++------ .../components/updatePluginModal.vue | 10 +-- .../pluginManager/components/uploadModel.vue | 29 ++++---- .../system/pluginManager/locale/en-US.ts | 3 +- .../system/pluginManager/locale/zh-CN.ts | 3 +- 9 files changed, 87 insertions(+), 56 deletions(-) diff --git a/frontend/src/components/pure/ms-dialog/index.vue b/frontend/src/components/pure/ms-dialog/index.vue index bf85467fa6..70178604a2 100644 --- a/frontend/src/components/pure/ms-dialog/index.vue +++ b/frontend/src/components/pure/ms-dialog/index.vue @@ -4,7 +4,7 @@ title-align="start" :class="['ms-modal-form', `ms-modal-${props.dialogSize}`]" v-bind="attrs" - :footer="props.showfooter" + :footer="props.footer" :mask-closable="false" @close="handleCancel" > @@ -54,7 +54,6 @@ const { t } = useI18n(); - export type buttontype = 'text' | 'dashed' | 'outline' | 'primary' | 'secondary'; export type SizeType = 'medium' | 'large' | 'small'; export interface SwitchProps { switchTooltip?: string; // 展示开关提示信息描述 @@ -64,7 +63,7 @@ } export type DialogType = Partial<{ - showfooter: boolean; // 是否展示footer + footer: boolean; // 是否展示footer showCancel: boolean; // 是否显示取消按钮 okText: string; // 确定按钮的文本 cancelText: string; // 取消按钮的文本 @@ -73,18 +72,19 @@ }> & { dialogSize: SizeType; // 弹窗的宽度尺寸 medium large small title: string; - confirm: (enable: boolean | undefined) => void; // 确定 + confirm?: (enable: boolean | undefined) => void; // 确定 visible: boolean; loading: boolean; close: () => void; }; const props = withDefaults(defineProps(), { - showfooter: true, + footer: true, showCancel: true, title: '', disabledOk: false, close: Function, + confirm: undefined, }); const emits = defineEmits<{ (event: 'close'): void; diff --git a/frontend/src/views/setting/organization/member/components/addMemberModal.vue b/frontend/src/views/setting/organization/member/components/addMemberModal.vue index 89dee9e01b..4cd82b2c1f 100644 --- a/frontend/src/views/setting/organization/member/components/addMemberModal.vue +++ b/frontend/src/views/setting/organization/member/components/addMemberModal.vue @@ -55,12 +55,10 @@ diff --git a/frontend/src/views/setting/organization/member/index.vue b/frontend/src/views/setting/organization/member/index.vue index 51a1aefdab..2e2a2f90c9 100644 --- a/frontend/src/views/setting/organization/member/index.vue +++ b/frontend/src/views/setting/organization/member/index.vue @@ -229,7 +229,9 @@ const { propsRes, propsEvent, loadList, setLoadListParams } = useTable(getMemberList, { tableKey: TableKeyEnum.ORGANNATIONMEMBER, scroll: { x: 1600 }, + size: 'default', selectable: true, + showSetting: true, }); const keyword = ref(''); const tableSelected = ref<(string | number)[]>([]); diff --git a/frontend/src/views/setting/organization/serviceIntegration/components/conifgModal.vue b/frontend/src/views/setting/organization/serviceIntegration/components/conifgModal.vue index da2f150853..4755d772d7 100644 --- a/frontend/src/views/setting/organization/serviceIntegration/components/conifgModal.vue +++ b/frontend/src/views/setting/organization/serviceIntegration/components/conifgModal.vue @@ -22,15 +22,15 @@ - +
{{ t('organization.service.Cancel') }} - {{ + {{ t('organization.service.testLink') }} - {{ + {{ t('organization.service.Confirm') }} - +
diff --git a/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue b/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue index d03a851159..9e47815975 100644 --- a/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue +++ b/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue @@ -24,7 +24,7 @@ - + @@ -143,14 +151,14 @@ > @@ -226,6 +234,10 @@ label: 'system.plugin.projectManagement', value: 'PLATFORM', }, + { + label: 'system.plugin.databaseDriver', + value: 'JDBC_DRIVER', + }, ]); const uploadVisible = ref(false); const updateVisible = ref(false); @@ -283,6 +295,20 @@ break; } } + + function getScenarioType(scenario: string) { + switch (scenario) { + case 'API': + return t('system.plugin.interfaceTest'); + case 'JDBC_DRIVER': + return t('system.plugin.databaseDriver'); + case 'PLATFORM': + return t('system.plugin.projectManagement'); + default: + break; + } + } + function uploadPlugin() { uploadVisible.value = true; } @@ -382,10 +408,10 @@ Object.assign(expandedRowKeys, [rowKey]); }; - const originizeList = ref([]); + const organizeList = ref([]); onBeforeMount(async () => { loadData(); - originizeList.value = await getSystemOrgOption(); + organizeList.value = await getSystemOrgOption(); }); diff --git a/frontend/src/views/setting/system/pluginManager/components/updatePluginModal.vue b/frontend/src/views/setting/system/pluginManager/components/updatePluginModal.vue index 2611b603d1..fd11bd8c64 100644 --- a/frontend/src/views/setting/system/pluginManager/components/updatePluginModal.vue +++ b/frontend/src/views/setting/system/pluginManager/components/updatePluginModal.vue @@ -22,15 +22,15 @@ field="organizationIds" :label="t('system.plugin.selectOrganization')" asterisk-position="end" - :rules="[{ required: true, message: t('system.plugin.selectOriginize') }]" + :rules="[{ required: true, message: t('system.plugin.selectOrganizeTip') }]" > - {{ item.name }} + {{ item.name }} @@ -40,7 +40,7 @@ @@ -57,7 +57,7 @@ const { t } = useI18n(); const props = defineProps<{ visible: boolean; - originizeList: SelectOptionData; + organizeList: SelectOptionData; }>(); const emits = defineEmits<{ (e: 'success'): void; diff --git a/frontend/src/views/setting/system/pluginManager/components/uploadModel.vue b/frontend/src/views/setting/system/pluginManager/components/uploadModel.vue index 7970aaa620..48717a31de 100644 --- a/frontend/src/views/setting/system/pluginManager/components/uploadModel.vue +++ b/frontend/src/views/setting/system/pluginManager/components/uploadModel.vue @@ -39,15 +39,15 @@ field="organizationIds" :label="t('system.plugin.selectOrganization')" asterisk-position="end" - :rules="[{ required: true, message: t('system.plugin.selectOriginize') }]" + :rules="[{ required: true, message: t('system.plugin.selectOrganizeTip') }]" > - {{ item.name }} + {{ item.name }} @@ -90,15 +90,18 @@
- - {{ t('system.plugin.pluginCancel') }} - {{ - t('system.plugin.saveAndAdd') - }} - {{ - t('system.plugin.pluginConfirm') - }} - + {{ t('system.plugin.pluginCancel') }} + {{ t('system.plugin.saveAndAdd') }} + {{ + t('system.plugin.pluginConfirm') + }}
@@ -122,7 +125,7 @@ }>(); const props = defineProps<{ visible: boolean; - originizeList: SelectOptionData; + organizeList: SelectOptionData; }>(); const pluginVisible = ref(false); const fileName = ref(''); diff --git a/frontend/src/views/setting/system/pluginManager/locale/en-US.ts b/frontend/src/views/setting/system/pluginManager/locale/en-US.ts index 43ef86fc5f..08feaa94d8 100644 --- a/frontend/src/views/setting/system/pluginManager/locale/en-US.ts +++ b/frontend/src/views/setting/system/pluginManager/locale/en-US.ts @@ -54,7 +54,7 @@ export default { 'system.plugin.pluginPreStep': 'Previous Step', 'system.plugin.saveAndAdd': 'Save & Continue', 'system.plugin.updateTitle': 'Update Plugin（{name}）', - 'system.plugin.selectOriginize': 'Please Choose Organization', + 'system.plugin.selectOrganizeTip': 'Please Choose Organization', 'system.plugin.selectOrganization': 'Choose Organization', 'system.plugin.infoTip': 'Jump to the Github download plug-in', 'system.plugin.getPlugin': 'Gets the open source plug-in', @@ -101,6 +101,7 @@ export default { 'system.plugin.all': 'All', 'system.plugin.projectManagement': 'Project Management', 'system.plugin.pluginStatus': 'Status', + 'system.plugin.databaseDriver': 'Database Driver', 'system.plugin.deleteContentTip': 'After deletion, the defects/requirements of the platform cannot be synchronized, and the historical data is automatically switched to other templates. Please exercise caution!', }; diff --git a/frontend/src/views/setting/system/pluginManager/locale/zh-CN.ts b/frontend/src/views/setting/system/pluginManager/locale/zh-CN.ts index d6b7b2c203..a3afb6bfc6 100644 --- a/frontend/src/views/setting/system/pluginManager/locale/zh-CN.ts +++ b/frontend/src/views/setting/system/pluginManager/locale/zh-CN.ts @@ -42,7 +42,7 @@ export default { 'system.plugin.pluginPreStep': '上一步', 'system.plugin.saveAndAdd': '保存并继续添加', 'system.plugin.updateTitle': '更新插件（{name}）', - 'system.plugin.selectOriginize': '请选择组织', + 'system.plugin.selectOrganizeTip': '请选择组织', 'system.plugin.selectOrganization': '选择组织', 'system.plugin.infoTip': '跳转至Github下载插件', 'system.plugin.getPlugin': '获取开源插件', @@ -81,5 +81,6 @@ export default { 'system.plugin.all': '全部', 'system.plugin.projectManagement': '项目管理', 'system.plugin.pluginStatus': '插件状态', + 'system.plugin.databaseDriver': '数据库驱动', 'system.plugin.deleteContentTip': '删除后，将无法同步该平台的缺陷/需求，历史数据自动切换为其它模板展示，请谨慎操作！', };