feat(frontend): 轮值支持排除业务、指定部分业务 TencentBlueKing#8922

jinquantianxia · Jan 8, 2025 · b08d33a · b08d33a
1 parent d1bb73a
commit b08d33a
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 4 deletions.
diff --git a/dbm-ui/frontend/src/components/render-table/columns/input/index.vue b/dbm-ui/frontend/src/components/render-table/columns/input/index.vue
@@ -22,6 +22,7 @@
       'is-clearable': clearable,
     }">
     <BkInput
+      ref="inputRef"
       class="input-box"
       :disabled="disabled"
       :max="max"
@@ -60,6 +61,7 @@
   import useValidtor, { type Rules } from '../../hooks/useValidtor';
 
   interface Props {
+    autoFocus?: boolean;
     placeholder?: string;
     rules?: Rules;
     disabled?: boolean;
@@ -90,6 +92,7 @@
   }
 
   const props = withDefaults(defineProps<Props>(), {
+    autoFocus: false,
     placeholder: '请输入',
     rules: undefined,
     disabled: false,
@@ -109,6 +112,7 @@
   });
 
   const rootRef = ref<HTMLElement>();
+  const inputRef = ref();
   const isBlur = ref(true);
 
   const isPassword = computed(() => props.type === 'password');
@@ -216,6 +220,12 @@
     window.changeConfirm = true;
   };
 
+  onMounted(() => {
+    if (props.autoFocus) {
+      inputRef.value.focus();
+    }
+  });
+
   defineExpose<Exposes>({
     getValue() {
       return validator(modelValue.value)

diff --git a/dbm-ui/frontend/src/locales/en.json b/dbm-ui/frontend/src/locales/en.json
@@ -1655,5 +1655,6 @@
   "Mongo分片集群": "",
   "sqlserver单节点版": "",
   "sqlserver主从版": "",
+  "排除业务": "",
   "这行勿动！新增翻译请在上一行添加！": ""
 }
diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json
@@ -3918,6 +3918,11 @@
   "Influxdb实例": "Influxdb实例",
   "Doris集群": "Doris集群",
   "单据协作人": "单据协作人",
+  "获取会话ID方法:": "获取会话ID方法:",
+  "1. 群聊添加群机器人: 蓝鲸审批助手": "1. 群聊添加群机器人: 蓝鲸审批助手",
+  "2. 手动蓝鲸审批助手，获取会话ID": "2. 手动 {'@'}蓝鲸审批助手，获取会话ID",
+  "3. 将获取到的会话ID粘贴到输入框，多个会话ID使用逗号分隔": "3. 将获取到的会话ID粘贴到输入框，多个会话ID使用逗号分隔",
+  "排除业务": "排除业务",
   "这行勿动！新增翻译请在上一行添加！": ""
 
 }
diff --git a/dbm-ui/frontend/src/services/model/monitor/duty-rule.ts b/dbm-ui/frontend/src/services/model/monitor/duty-rule.ts
@@ -38,11 +38,11 @@ export default class DutyRule {
     exclude?: {
       bk_biz_id: number;
       bk_biz_name: string;
-    };
+    }[];
     include?: {
       bk_biz_id: number;
       bk_biz_name: string;
-    };
+    }[];
   };
   category: string;
   creator: string;

diff --git a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/content/Index.vue b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/content/Index.vue
@@ -189,6 +189,7 @@
                 resource={props.activeDbType}>
                 <NumberInput
                   type='number'
+                  autoFocus
                   model-value={level}
                   min={1}
                   max={100}
@@ -241,6 +242,20 @@
         );
       },
     },
+    {
+      label: t('轮值业务'),
+      field: 'status',
+      width: 250,
+      render: ({ data }: {data: DutyRuleModel}) => {
+        if (data.biz_config_display.include) {
+          return data.biz_config_display.include.map((biz) => biz.bk_biz_name).join(' , ')
+        }
+        if (data.biz_config_display.exclude) {
+          return `${t('全部业务')} (${t('排除业务')} : ${data.biz_config_display.exclude.map((biz) => biz.bk_biz_name).join(' , ')}) `
+        }
+        return t('全部业务')
+      },
+    },
     {
       label: t('轮值表'),
       field: 'duty_arranges',

diff --git a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/content/RenderRotateTable.vue b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/content/RenderRotateTable.vue
@@ -90,7 +90,7 @@
     {
       label: t('日期'),
       field: 'dateTime',
-      width: 120,
+      minWidth: 120,
       render: ({ data }: {data: RowData}) => {
         let tag = null;
         const today = dayjs(new Date()).format('YYYY-MM-DD');
@@ -104,7 +104,7 @@
       label: t('时段'),
       field: 'timeRange',
       showOverflowTooltip: true,
-      width: 200,
+      minWidth: 200,
       render: ({ data }: {data: RowData}) => data.timeRange.join(' , '),
     },
     {