test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): 插件拼写和插件styles样式修改

This commit is contained in:
xinxin.wu 2023-08-14 13:06:03 +08:00 committed by fit2-zhao
parent d5da8dd591
commit 5b2831bb64
6 changed files with 155 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/views/setting/system/authorizedManagement/index.vue
View File

@ -149,6 +149,7 @@
await addLicense(authorizedForm.licenseCode);
authDrawer.value = false;
Message.success(t('system.authorized.licenseSuccessTip'));
getLicenseDetail();
} catch (error) {
console.log(error);
} finally {

2
frontend/src/views/setting/system/authorizedManagement/locale/en-US.ts
View File

@ -6,7 +6,7 @@ export default {
'system.authorized.authorizedVersion': 'The authorized version',
'system.authorized.authorizationsCount': 'Number of authorizations',
'system.authorized.authorizationStatus': 'Authorization status',
'system.authorized.authorityChecking': 'Authority Checking',
'system.authorized.authorityChecking': 'Valid License',
'system.authorized.valid': 'valid',
'system.authorized.invalid': 'invalid',
'system.authorized.failure': 'failure',

51
frontend/src/views/setting/system/pluginManager/components/pluginTable.vue
View File

@ -20,12 +20,11 @@
></a-input-search>
</a-col>
</a-row>
<div class="ms-table-wrapper flex flex-col justify-between">
<div>
<div class="pr-2">
<a-table
:data="filterData"
:pagination="false"
:scroll="{ y: 480, x: 2400 }"
:scroll="{ y: 360, x: 2400, maxHeight: 200 }"
:expandable="expandable"
:loading="loading"
row-key="id"
@ -33,13 +32,13 @@
@expand="handleExpand"
>
<template #columns>
<a-table-column :width="300" fixed="left" :title="t('system.plugin.tableColunmName')" :ellipsis="true">
<a-table-column :width="300" fixed="left" :title="t('system.plugin.tableColumnsName')" :ellipsis="true">
<template #cell="{ record }">
{{ record.name }} <span class="text-[--color-text-4]">({{ (record.pluginForms || []).length }})</span>
</template>
</a-table-column>
<a-table-column :title="t('system.plugin.tableColunmDescription')" data-index="description" />
<a-table-column :title="t('system.plugin.tableColunmStatus')">
<a-table-column :title="t('system.plugin.tableColumnsDescription')" data-index="description" />
<a-table-column :title="t('system.plugin.tableColumnsStatus')">
<template #cell="{ record }">
<div v-if="record.enable" class="flex items-center">
<icon-check-circle-fill class="mr-[2px] text-[rgb(var(--success-6))]" />
@ -51,12 +50,12 @@
</div>
</template>
</a-table-column>
<a-table-column :title="t('system.plugin.tableColunmApplicationScene')" data-index="scenario">
<a-table-column :title="t('system.plugin.tableColumnsApplicationScene')" data-index="scenario">
<template #cell="{ record }">{{
record.scenario === 'API' ? t('system.plugin.sceneApi') : t('system.plugin.sceneManagement')
record.scenario === 'API' ? t('system.plugin.interfaceTest') : t('system.plugin.projectManagement')
}}</template>
</a-table-column>
<a-table-column :title="t('system.user.tableColunmOrg')" :width="300">
<a-table-column :title="t('system.plugin.tableColumnsOrg')" :width="300">
<template #cell="{ record }">
<a-tooltip :content="(record.organizations||[]).map((e: any) => e.name).join(',')">
<span>
@ -80,33 +79,33 @@
</template>
</a-table-column>
<a-table-column
:title="t('system.plugin.tableColunmDescription')"
:title="t('system.plugin.tableColumnsDescription')"
data-index="fileName"
:width="300"
:ellipsis="true"
/>
<a-table-column
:title="t('system.plugin.tableColunmVersion')"
:title="t('system.plugin.tableColumnsVersion')"
data-index="pluginId"
:width="300"
:ellipsis="true"
/>
<a-table-column :title="t('system.plugin.tableColunmAuthorization')">
<a-table-column :title="t('system.plugin.tableColumnsAuthorization')">
<template #cell="{ record }">
<span>{{
record.xpack ? t('system.plugin.uploadOpenSource') : t('system.plugin.uploadCompSource')
}}</span>
</template>
</a-table-column>
<a-table-column :title="t('system.plugin.tableColunmCreatedBy')" data-index="createUser" />
<a-table-column :title="t('system.plugin.tableColunmUpdateTime')" :width="200">
<a-table-column :title="t('system.plugin.tableColumnsCreatedBy')" data-index="createUser" />
<a-table-column :title="t('system.plugin.tableColumnsUpdateTime')" :width="200">
<template #cell="{ record }">
<span>{{ getTime(record.updateTime) }}</span>
</template>
</a-table-column>
<a-table-column :width="200" fixed="right" align="center" :bordered="false">
<template #title>
{{ t('system.plugin.tableColunmActions') }}
{{ t('system.plugin.tableColumnsActions') }}
</template>
<template #cell="{ record }">
<MsButton @click="update(record)">{{ t('system.plugin.edit') }}</MsButton>
@ -132,7 +131,6 @@
>{{ t('system.plugin.totalNum') }}<span class="mx-2">{{ totalNum }}</span
>{{ t('system.plugin.dataList') }}</div
>
</div>
<UploadModel
v-model:visible="uploadVisible"
:originize-list="originizeList"
@ -211,7 +209,7 @@
value: '',
},
{
label: 'system.plugin.apiTest',
label: 'system.plugin.interfaceTest',
value: 'API',
},
{
@ -248,7 +246,7 @@
openModal({
type: 'warning',
title: t('system.plugin.deletePluginTip', { name: characterLimit(record.name) }),
content: '',
content: t('system.plugin.deleteContentTip'),
okText: t('system.plugin.deletePluginConfirm'),
cancelText: t('system.plugin.pluginCancel'),
okButtonProps: {
@ -389,11 +387,6 @@
:deep(.arco-table-tr-expand .arco-table-cell) {
padding: 0 !important;
}
:deep(.arco-table) {
margin-right: -10px;
padding-right: 10px;
max-width: 100%;
}
:deep(.collapsebtn) {
padding: 0 1px;
border: 1px solid var(--color-text-4);
@ -414,13 +407,8 @@
@apply bg-white;
}
.ms-footerNum {
height: 22px;
line-height: 22px;
@apply mt-4 text-sm text-slate-500;
}
.ms-table-wrapper {
height: calc(100vh - 236px);
min-height: 400px;
width: 100%;
@apply absolute bottom-0 z-20 mt-4 bg-white pt-4 text-sm text-slate-500;
}
:deep(.arco-table-tr .arco-table-td) {
height: 54px !important;
@ -428,4 +416,7 @@
.ms-table-expand :deep(.arco-scrollbar-container + .arco-scrollbar-track-direction-vertical) {
left: 0 !important;
}
:deep(.arco-table-content + .arco-scrollbar-track-direction-vertical .arco-scrollbar-thumb-direction-vertical) {
height: 0 !important;
}
</style>

5
frontend/src/views/setting/system/pluginManager/index.vue
View File

@ -1,7 +1,7 @@
/* stylelint-disable order/properties-order */
<template>
<MsCard simple>
<div class="wrapper flex flex-col justify-between">
<div class="wrapper">
<a-alert :closable="true" class="mb-4">
<div>
{{ t('system.plugin.alertDescribe') }}
@ -28,6 +28,9 @@
color: rgb(var(--primary-5));
}
.wrapper {
/* position: relative; */
width: 100%;
height: calc(100vh - 138px);
min-height: 500px;
}
</style>

34
frontend/src/views/setting/system/pluginManager/locale/en-US.ts
View File

@ -5,20 +5,20 @@ export default {
'system.plugin.tableEnable': 'Enable',
'system.plugin.tableDisable': 'Disable',
'system.plugin.edit': 'Edit',
'system.plugin.tableColunmName': 'Name',
'system.plugin.tableColunmJarPackage': 'Jar Package',
'system.plugin.tableColunmDescription': 'Description',
'system.plugin.tableColunmVersion': 'Type',
'system.plugin.tableColunmCreateTime': 'CreateTime',
'system.plugin.tableColunmUpdateTime': 'UpdateTime',
'system.plugin.tableColunmApplicationScene': 'ApplicationScene',
'system.plugin.tableColumnsName': 'Name',
'system.plugin.tableColumnsJarPackage': 'Jar Package',
'system.plugin.tableColumnsDescription': 'Description',
'system.plugin.tableColumnsVersion': 'Type',
'system.plugin.tableColumnsCreateTime': 'CreateTime',
'system.plugin.tableColumnsUpdateTime': 'UpdateTime',
'system.plugin.tableColumnsApplicationScene': 'ApplicationScene',
'system.plugin.ChangeSceneName': 'Change Scene({name})',
'system.plugin.tableColunmOrg': 'Application Organization',
'system.plugin.tableColunmAuthorization': 'Authorization Type',
'system.plugin.tableColunmCreatedBy': 'Created By',
'system.plugin.tableColunmExpirationDate': 'Expiration Date',
'system.plugin.tableColunmActions': 'Actions',
'system.plugin.tableColunmStatus': 'Status',
'system.plugin.tableColumnsOrg': 'Application Organization',
'system.plugin.tableColumnsAuthorization': 'AuthorizationType',
'system.plugin.tableColumnsCreatedBy': 'CreatedBy',
'system.plugin.tableColumnsExpirationDate': 'Expiration Date',
'system.plugin.tableColumnsActions': 'Actions',
'system.plugin.tableColumnsStatus': 'Status',
'system.plugin.ChangeScene': 'Change Scene',
'system.plugin.SelectApplicationScene': 'Select Application Scene',
'system.plugin.interfaceTest': 'Interface Test',
@ -42,8 +42,8 @@ export default {
'system.plugin.viewTable': 'View the form',
'system.plugin.downAddress': 'More open source plug-ins can be downloaded here',
'system.plugin.goDownload': 'downloads',
'system.plugin.deletePluginTip': 'Are you sure to delete the `{name}` plugin?',
'system.plugin.disablePluginTip': 'Are you sure to disable the `{name}` plugin?',
'system.plugin.deletePluginTip': 'Are you sure to delete the {name} plugin?',
'system.plugin.disablePluginTip': 'Are you sure to disable the {name} plugin?',
'system.resourcePool.deletePoolContentUsed':
'This resource pool has been used, and related tests will stop immediately after deletion, please operate with caution!',
'system.resourcePool.deletePoolContentUnuse': 'This resource pool is not in use. Are you sure to delete it?',
@ -83,7 +83,6 @@ export default {
'system.plugin.uploadFileTip': 'Please upload the file and submit it!',
'system.plugin.uploadOpenSource': 'Open Source',
'system.plugin.uploadCompSource': 'Enterprise Edition',
'system.plugin.sceneApi': 'Interface Testing',
'system.plugin.sceneManagement': 'Project Management',
'system.resourcePool.deletePoolSuccess': 'Deleted successfully',
'system.plugin.sizeExceedTip': 'The file size exceeds the limit！',
@ -100,6 +99,7 @@ export default {
'system.resourcePool.useAPI': 'API test',
'system.resourcePool.useUI': ' UI test',
'system.plugin.all': 'All',
'system.plugin.apiTest': 'API Test',
'system.plugin.projectManagement': 'Project Management',
'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!',
};

34
frontend/src/views/setting/system/pluginManager/locale/zh-CN.ts
View File

@ -5,19 +5,19 @@ export default {
'system.plugin.tableEnable': '启用',
'system.plugin.tableDisable': '禁用',
'system.plugin.edit': '编辑',
'system.plugin.tableColunmName': '名称',
'system.plugin.tableColunmJarPackage': 'jar包',
'system.plugin.tableColunmDescription': '描述',
'system.plugin.tableColunmVersion': '版本',
'system.plugin.tableColunmCreateTime': '创建时间',
'system.plugin.tableColunmUpdateTime': '更新时间',
'system.plugin.tableColunmApplicationScene': '应用场景',
'system.plugin.tableColunmOrg': '应用组织',
'system.plugin.tableColunmAuthorization': '授权类型',
'system.plugin.tableColunmCreatedBy': '创建人',
'system.plugin.tableColunmExpirationDate': '到期时间',
'system.plugin.tableColunmActions': '操作',
'system.plugin.tableColunmStatus': '状态',
'system.plugin.tableColumnsName': '名称',
'system.plugin.tableColumnsJarPackage': 'jar包',
'system.plugin.tableColumnsDescription': '描述',
'system.plugin.tableColumnsVersion': '版本',
'system.plugin.tableColumnsCreateTime': '创建时间',
'system.plugin.tableColumnsUpdateTime': '更新时间',
'system.plugin.tableColumnsApplicationScene': '应用场景',
'system.plugin.tableColumnsOrg': '应用组织',
'system.plugin.tableColumnsAuthorization': '授权类型',
'system.plugin.tableColumnsCreatedBy': '创建人',
'system.plugin.tableColumnsExpirationDate': '到期时间',
'system.plugin.tableColumnsActions': '操作',
'system.plugin.tableColumnsStatus': '状态',
'system.plugin.ChangeScene': '场景变更',
'system.plugin.ChangeSceneName': '场景变更({name})',
'system.plugin.SelectApplicationScene': '选择应用场景',
@ -31,8 +31,8 @@ export default {
'system.plugin.supportFormat': '只支持JAR格式文件，文件大小不超过50M',
'system.plugin.interfaceTestDescribe': '协议类的插件建议选择接口测试',
'system.plugin.projectMangerDescribe': '项目管理平台类建议选择项目管理',
'system.plugin.deletePluginTip': '确认删除 `{name}` 这个插件吗？',
'system.plugin.disablePluginTip': '确认禁用 `{name}` 这个插件吗？',
'system.plugin.deletePluginTip': '确认删除 {name} 这个插件吗？',
'system.plugin.disablePluginTip': '确认禁用 {name} 这个插件吗？',
'system.resourcePool.deletePoolContentUsed': '该资源池已被使用，删除后相关测试会立即停止，请谨慎操作！',
'system.resourcePool.deletePoolContentUnuse': '该资源池未被使用，是否确认删除？',
'system.plugin.deletePluginConfirm': '确认删除',
@ -76,11 +76,9 @@ export default {
'system.plugin.uploadFileTip': '请上传文件再提交！',
'system.plugin.uploadOpenSource': '开源版',
'system.plugin.uploadCompSource': '企业版',
'system.plugin.sceneApi': '接口测试',
'system.plugin.sceneManagement': '项目管理',
'system.plugin.sizeExceedTip': '文件大小超出限制！',
'system.plugin.showScriptTitle': '查看脚本({name})',
'system.plugin.all': '全部',
'system.plugin.apiTest': '接口测试',
'system.plugin.projectManagement': '项目管理',
'system.plugin.deleteContentTip': '删除后，将无法同步该平台的缺陷/需求，历史数据自动切换为其它模板展示，请谨慎操作！',
};