feat(日志): 日志范围调整

frontend/src/assets/icon-font/iconfont.css

@@ -1,7 +1,7 @@
 @font-face {
   font-family: iconfont; /* Project id 3462279 */
-  src: url('iconfont.woff2?t=1692250847167') format('woff2'), url('iconfont.woff?t=1692250847167') format('woff'),
+  src: url('iconfont.woff2?t=1693190889145') format('woff2'), url('iconfont.woff?t=1693190889145') format('woff'),
-    url('iconfont.ttf?t=1692250847167') format('truetype'), url('iconfont.svg?t=1692250847167#iconfont') format('svg');
+    url('iconfont.ttf?t=1693190889145') format('truetype'), url('iconfont.svg?t=1693190889145#iconfont') format('svg');
 }
 .iconfont {
   font-size: 16px;
@@ -10,6 +10,12 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+.icon-a-icon_file-jar_colorful_ash::before {
+  content: '\e753';
+}
+.icon-icon_git::before {
+  content: '\e752';
+}
 .icon-icon_time_axis::before {
   content: '\e751';
 }

frontend/src/assets/icon-font/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "DE、MS项目icon管理",
   "glyphs": [
+    {
+      "icon_id": "37085019",
+      "name": "icon_file- jar_colorful_ash",
+      "font_class": "a-icon_file-jar_colorful_ash",
+      "unicode": "e753",
+      "unicode_decimal": 59219
+    },
+    {
+      "icon_id": "37062850",
+      "name": "icon_git",
+      "font_class": "icon_git",
+      "unicode": "e752",
+      "unicode_decimal": 59218
+    },
     {
       "icon_id": "36956895",
       "name": "icon_time_axis",

frontend/src/assets/icon-font/iconfont.svg

@@ -14,6 +14,10 @@
     />
       <missing-glyph />
       
+      <glyph glyph-name="a-icon_file-jar_colorful_ash" unicode="&#59219;" d="M648.533333 853.333333a42.666667 42.666667 0 0 0 33.322667-16l170.666667-213.333333 2.730666-3.925333 1.152-1.877334a40.021333 40.021333 0 0 0 4.053334-9.941333 41.258667 41.258667 0 0 0 1.109333-5.973333L861.866667 597.333333v-85.333333h42.666666a85.333333 85.333333 0 0 0 85.333334-85.333333v-298.666667a85.333333 85.333333 0 0 0-85.333334-85.333333h-42.666666v-85.333334a42.666667 42.666667 0 0 0-42.666667-42.666666h-597.333333a42.666667 42.666667 0 0 0-42.666667 42.666666v85.333334h-42.666667a85.333333 85.333333 0 0 0-85.333333 85.333333v298.666667a85.333333 85.333333 0 0 0 85.333333 85.333333h42.666667V810.666667a42.666667 42.666667 0 0 0 42.666667 42.666666h426.666666z m128-810.666666h-512v-42.666667h512v42.666667z m128 384h-768v-298.666667h768v298.666667z m-556.8-42.24v-116.181334c0-24.405333-2.176-43.008-6.528-55.722666-4.309333-12.757333-13.013333-23.509333-26.112-32.384-13.056-8.832-29.781333-13.226667-50.218666-13.226667-21.589333 0-38.314667 2.858667-50.176 8.704a63.104 63.104 0 0 0-27.477334 25.6c-6.485333 11.221333-10.282667 25.130667-11.434666 41.642667l63.146666 8.618666c0.085333-9.429333 0.896-16.469333 2.474667-21.034666a22.869333 22.869333 0 0 1 7.850667-11.093334c2.56-1.834667 6.144-2.730667 10.794666-2.730666 7.381333 0 12.8 2.730667 16.256 8.234666 3.456 5.504 5.205333 14.762667 5.205334 27.733334v131.84h66.176z m174.848 0L602.88 170.666667h-69.12l-10.496 35.285333H448l-10.368-35.285333H370.176l80.341333 213.76h72.064z m212.48 0c20.394667 0 36.010667-1.706667 46.805334-5.205334 10.794667-3.498667 19.498667-9.984 26.112-19.498666 6.570667-9.472 9.898667-20.992 9.898666-34.602667 0-11.861333-2.56-22.101333-7.594666-30.72a59.306667 59.306667 0 0 0-20.864-20.906667c-5.632-3.413333-13.354667-6.229333-23.168-8.490666 7.893333-2.602667 13.610667-5.248 17.194666-7.850667 2.432-1.749333 5.973333-5.504 10.581334-11.221333 4.608-5.76 7.68-10.154667 9.258666-13.269334L835.242667 170.666667h-74.666667l-35.285333 65.322666c-4.48 8.448-8.490667 13.952-11.946667 16.469334a27.733333 27.733333 0 0 1-16.213333 4.992h-5.845334V170.666667h-66.346666v213.76h110.08z m-249.258666-55.381334l-23.466667-76.842666h47.104l-23.637333 76.8z m234.496 12.245334h-29.013334v-43.477334h27.861334c2.986667 0 8.832 0.981333 17.493333 2.944a17.493333 17.493333 0 0 1 10.709333 6.698667 19.754667 19.754667 0 0 1 4.181334 12.373333c0 6.912-2.218667 12.245333-6.570667 15.914667-4.394667 3.712-12.586667 5.546667-24.661333 5.546667zM563.2 768h-298.666667v-256h512V554.666667h-170.666666a42.666667 42.666667 0 0 0-42.666667 42.666666V768z m85.333333-25.6V640h81.92L648.533333 742.4z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="icon_git" unicode="&#59218;" d="M974.506667 398.592L526.805333 847.829333c-7.338667 7.338667-20.565333 7.338667-29.354666 0l-123.306667-123.306666 114.474667-114.517334a65.706667 65.706667 0 0 0 29.397333 5.845334 74.24 74.24 0 0 0 74.837333-74.837334c0-10.282667-1.450667-20.565333-5.845333-29.354666l91.008-91.050667a65.706667 65.706667 0 0 0 29.354667 5.888 74.24 74.24 0 0 0 74.88-74.88 74.24 74.24 0 0 0-74.88-74.88 74.24 74.24 0 0 0-74.88 74.88c0 10.24 1.493333 20.565333 5.888 29.354667l-91.008 91.008h-1.493334v-173.226667a75.52 75.52 0 0 0 46.976-70.442667 74.24 74.24 0 0 0-74.837333-74.88 74.24 74.24 0 0 0-74.88 74.88 75.52 75.52 0 0 0 46.933333 70.442667v170.325333a75.52 75.52 0 0 0-46.933333 70.442667c0 10.282667 1.450667 20.565333 5.845333 29.354667L334.506667 684.885333l-286.293334-286.293333c-7.338667-7.338667-7.338667-20.565333 0-29.354667l449.237334-449.237333c7.338667-7.338667 20.565333-7.338667 29.354666 0l449.237334 449.237333a20.906667 20.906667 0 0 1-1.450667 29.354667z"  horiz-adv-x="1024" />
+      
       <glyph glyph-name="icon_time_axis" unicode="&#59217;" d="M213.333333 853.333333a42.666667 42.666667 0 0 0 42.666667-42.666666v-261.376a170.752 170.752 0 0 0 0-330.581334V-42.666667a42.666667 42.666667 0 0 0-85.333333 0v261.376a170.752 170.752 0 0 0 0 330.581334V810.666667a42.666667 42.666667 0 0 0 42.666666 42.666666z m0-384a85.333333 85.333333 0 1 1 0-170.666666 85.333333 85.333333 0 0 1 0 170.666666z m725.333334 384a42.666667 42.666667 0 0 0 42.666666-42.666666v-256a42.666667 42.666667 0 0 0-42.666666-42.666667H512a42.666667 42.666667 0 0 0-42.666667 42.666667V810.666667a42.666667 42.666667 0 0 0 42.666667 42.666666h426.666667z m-42.666667-85.333333h-341.333333v-170.666667h341.333333V768z m42.666667-469.333333a42.666667 42.666667 0 0 0 0-85.333334H512a42.666667 42.666667 0 0 0 0 85.333334h426.666667z m0-298.666667a42.666667 42.666667 0 0 0 0-85.333333H512a42.666667 42.666667 0 0 0 0 85.333333h426.666667z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="icon_maybe_filled" unicode="&#59216;" d="M42.666667 384c0-259.2 210.133333-469.333333 469.333333-469.333333s469.333333 210.133333 469.333333 469.333333S771.2 853.333333 512 853.333333 42.666667 643.2 42.666667 384z m490.666666-170.666667a21.290667 21.290667 0 0 0 21.333334-21.333333v-42.666667a21.333333 21.333333 0 0 0-21.333334-21.333333h-42.666666a21.248 21.248 0 0 0-21.333334 21.333333v42.666667a21.248 21.248 0 0 0 21.333334 21.333333h42.666666zM345.130667 511.872c8.32 46.336 29.397333 80.384 63.189333 102.186667 26.453333 17.28 59.008 25.941333 97.621333 25.941333 50.688 0 92.842667-12.288 126.378667-36.864 33.578667-24.576 50.346667-60.928 50.346667-109.141333 0-29.610667-7.296-54.485333-21.888-74.752-8.533333-12.245333-24.917333-27.946667-49.152-47.061334l-23.893334-18.773333c-13.013333-10.24-21.674667-22.186667-25.898666-35.84-1.152-3.669333-2.176-10.624-3.072-20.736a21.333333 21.333333 0 0 0-21.248-19.498667h-47.786667a21.376 21.376 0 0 0-21.248 23.296c2.773333 29.696 5.717333 48.469333 8.832 56.362667 5.845333 14.677333 20.906667 31.573333 45.141333 50.688l24.533334 19.456 1.92 1.408c11.221333 8.362667 47.786667 35.626667 47.786666 59.946667 0 25.984-4.48 35.498667-17.536 49.792-13.013333 14.250667-42.368 18.816-68.864 18.816-26.026667 0-48.256-6.912-59.136-24.405334a123.306667 123.306667 0 0 1-12.117333-25.6 89.6 89.6 0 0 1-3.114667-13.098666 21.333333 21.333333 0 0 0-21.034666-17.749334H364.672a21.333333 21.333333 0 0 0-21.205333 23.722667 177.92 177.92 0 0 0 1.664 11.904z"  horiz-adv-x="1024" />

frontend/src/config/pathMap.ts

@@ -18,7 +18,7 @@ export const pathMap = [
     locale: 'menu.settings',
     route: RouteEnum.SETTING,
     permission: [],
-    level: MENU_LEVEL[0],
+    level: MENU_LEVEL[1], // 系统设置里有系统级别也有组织级别，按最低权限级别配置
     children: [
       {
         key: 'SETTING_SYSTEM', // 系统设置-系统

frontend/src/locale/en-US/index.ts

@@ -27,7 +27,7 @@ export default {
     'menu.uiTest': 'UI test',
     'menu.performanceTest': 'Performance test',
     'menu.projectManagement': 'Project management',
-    'menu.projectManagement.log': 'Project Log',
+    'menu.projectManagement.log': 'Log',
     'menu.settings': 'Settings',
     'menu.settings.system': 'System',
     'menu.settings.system.usergroup': 'User Group',
@@ -39,13 +39,13 @@ export default {
     'menu.settings.system.resourcePoolDetail': 'Add resource pool',
     'menu.settings.system.resourcePoolEdit': 'Edit resource pool',
     'menu.settings.system.parameter': 'System parameter',
-    'menu.settings.system.log': 'System Log',
+    'menu.settings.system.log': 'Log',
     'menu.settings.organization': 'Organization',
     'menu.settings.organization.member': 'Member',
     'menu.settings.organization.userGroup': 'User Group',
     'menu.settings.organization.project': 'Project',
     'menu.settings.organization.serviceIntegration': 'Service Integration',
-    'menu.settings.organization.log': 'Org Log',
+    'menu.settings.organization.log': 'Log',
     'navbar.action.locale': 'Switch to English',
     ...sys,
     ...localeSettings,

frontend/src/locale/zh-CN/index.ts

@@ -26,7 +26,7 @@ export default {
     'menu.uiTest': 'UI测试',
     'menu.performanceTest': '性能测试',
     'menu.projectManagement': '项目管理',
-    'menu.projectManagement.log': '项目日志',
+    'menu.projectManagement.log': '日志',
     'menu.settings': '系统设置',
     'menu.settings.system': '系统',
     'menu.settings.system.user': '用户',
@@ -38,13 +38,13 @@ export default {
     'menu.settings.system.resourcePoolDetail': '添加资源池',
     'menu.settings.system.resourcePoolEdit': '编辑资源池',
     'menu.settings.system.parameter': '系统参数',
-    'menu.settings.system.log': '系统日志',
+    'menu.settings.system.log': '日志',
     'menu.settings.organization': '组织',
     'menu.settings.organization.member': '成员',
     'menu.settings.organization.userGroup': '用户组',
     'menu.settings.organization.project': '项目',
     'menu.settings.organization.serviceIntegration': '服务集成',
-    'menu.settings.organization.log': '组织日志',
+    'menu.settings.organization.log': '日志',
     'navbar.action.locale': '切换为中文',
     ...sys,
     ...localeSettings,

frontend/src/views/setting/system/log/components/logCards.vue

@@ -89,7 +89,8 @@
         {{ t(typeOptions.find((e) => e.value === record.type)?.label || '') }}
       </template>
       <template #content="{ record }">
-        <MsButton @click="handleNameClick(record)">{{ record.content }}</MsButton>
+        <div v-if="record.module === 'SYSTEM'">{{ record.content }}</div>
+        <MsButton v-else @click="handleNameClick(record)">{{ record.content }}</MsButton>
       </template>
     </ms-base-table>
   </div>
@@ -130,6 +131,7 @@
   const { t } = useI18n();
   const appStore = useAppStore();
 
+  // 系统/组织/项目 三种级别的接口映射
   const requestFuncMap: Record<
     (typeof MENU_LEVEL)[number],
     {
@@ -158,6 +160,9 @@
   const operUser = ref(''); // 操作人
   const userList = ref<SelectOptionData[]>([]); // 操作人列表
 
+  /**
+   * 初始化用户选项列表
+   */
   async function initUserList() {
     try {
       const res = await requestFuncMap[props.mode].usersFunc(appStore.currentOrgId);

frontend/src/views/setting/system/user/index.vue

@@ -284,7 +284,7 @@
       title: 'system.user.tableColumnActions',
       slotName: 'action',
       fixed: 'right',
-      width: 80,
+      width: 90,
       showInTable: true,
     },
   ];