Merge pull request #58 from dromara/dev

Dev
dromara · Sep 11, 2024 · 44c2260 · 44c2260
2 parents 2df3f2f + 14cf8c2
commit 44c2260
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<div align="center"><img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/5/29/cec03bbd-0eab-464d-9caf-d0b5a7ffc5a6.png" alt="logo" width="32" /></div>
+<div align="center"><img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/9/11/11e7e78e-2af0-4c68-9811-db8a4c4400f4.png" alt="logo" width="520" /></div>
 <p style="margin-top: 12px" align="center"><b>一款高颜值、现代化的智能运维&轻量堡垒机平台。</b></p>
 <p align="center">
     <a target="_blank"
@@ -51,7 +51,7 @@
 
 ## 演示环境
 
-* 🔗 演示地址: https://dv.orionsec.cn/
+* 🔗 演示地址: [https://dv.orionsec.cn/](https://dv.orionsec.cn/)
 * 🔏 演示账号: admin/admin
 * ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor)  [gitcode](https://gitcode.com/dromara/orion-visor/overview)
 * 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!

diff --git a/orion-visor-ui/src/assets/logo_horizontal.png b/orion-visor-ui/src/assets/logo_horizontal.png
diff --git a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-clear-modal.vue b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-clear-modal.vue
@@ -59,8 +59,8 @@
         <a-form-item field="limit" label="数量限制">
           <a-input-number v-model="formModel.limit"
                           :min="1"
-                          :max="maxLimit"
-                          :placeholder="`请输入数量限制 最大: ${maxLimit}`"
+                          :max="maxClearLimit"
+                          :placeholder="`请输入数量限制 最大: ${maxClearLimit}`"
                           hide-button
                           allow-clear />
         </a-form-item>
@@ -101,16 +101,14 @@
       type: undefined,
       status: undefined,
       startTimeRange: undefined,
-      limit: maxLimit.value,
+      limit: maxClearLimit,
     };
   };
 
-  const maxLimit = ref<number>(0);
   const formModel = ref<HostConnectLogQueryRequest>({});
 
   // 打开
   const open = (record: any) => {
-    maxLimit.value = maxClearLimit;
     renderForm({ ...defaultForm(), ...record });
     setVisible(true);
   };

diff --git a/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-clear-modal.vue b/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-clear-modal.vue
@@ -51,8 +51,8 @@
         <a-form-item field="limit" label="数量限制">
           <a-input-number v-model="formModel.limit"
                           :min="1"
-                          :max="maxLimit"
-                          :placeholder="`请输入数量限制 最大: ${maxLimit}`"
+                          :max="maxClearLimit"
+                          :placeholder="`请输入数量限制 最大: ${maxClearLimit}`"
                           hide-button
                           allow-clear />
         </a-form-item>
@@ -85,7 +85,6 @@
   const { loading, setLoading } = useLoading();
   const { toOptions } = useDictStore();
 
-  const maxLimit = ref<number>(0);
   const formModel = ref<ExecLogQueryRequest>({});
 
   const defaultForm = (): ExecLogQueryRequest => {
@@ -96,13 +95,12 @@
       command: undefined,
       status: undefined,
       startTimeRange: undefined,
-      limit: maxLimit.value,
+      limit: maxClearLimit,
     };
   };
 
   // 打开
   const open = (record: any) => {
-    maxLimit.value = maxClearLimit;
     renderForm({ ...defaultForm(), ...record });
     setVisible(true);
   };

diff --git a/orion-visor-ui/src/views/exec/upload-task/components/upload-task-clear-modal.vue b/orion-visor-ui/src/views/exec/upload-task/components/upload-task-clear-modal.vue
@@ -52,8 +52,8 @@
         <a-form-item field="limit" label="数量限制">
           <a-input-number v-model="formModel.limit"
                           :min="1"
-                          :max="maxLimit"
-                          :placeholder="`请输入数量限制 最大: ${maxLimit}`"
+                          :max="maxClearLimit"
+                          :placeholder="`请输入数量限制 最大: ${maxClearLimit}`"
                           hide-button
                           allow-clear />
         </a-form-item>
@@ -85,7 +85,6 @@
   const { loading, setLoading } = useLoading();
   const { toOptions } = useDictStore();
 
-  const maxLimit = ref<number>(0);
   const formModel = ref<UploadTaskQueryRequest>({});
 
   const defaultForm = (): UploadTaskQueryRequest => {
@@ -95,13 +94,12 @@
       description: undefined,
       status: undefined,
       createTimeRange: undefined,
-      limit: maxLimit.value,
+      limit: maxClearLimit,
     };
   };
 
   // 打开
   const open = (record: any) => {
-    maxLimit.value = maxClearLimit;
     renderForm({ ...defaultForm(), ...record });
     setVisible(true);
   };

diff --git a/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-log-clear-modal.vue b/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-log-clear-modal.vue
@@ -46,8 +46,8 @@
         <a-form-item field="limit" label="数量限制">
           <a-input-number v-model="formModel.limit"
                           :min="1"
-                          :max="maxLimit"
-                          :placeholder="`请输入数量限制 最大: ${maxLimit}`"
+                          :max="maxClearLimit"
+                          :placeholder="`请输入数量限制 最大: ${maxClearLimit}`"
                           hide-button
                           allow-clear />
         </a-form-item>
@@ -80,7 +80,6 @@
   const { loading, setLoading } = useLoading();
   const { toOptions } = useDictStore();
 
-  const maxLimit = ref<number>(0);
   const formModel = ref<ExecLogQueryRequest>({});
 
   const defaultForm = (): ExecLogQueryRequest => {
@@ -91,13 +90,12 @@
       command: undefined,
       status: undefined,
       startTimeRange: undefined,
-      limit: maxLimit.value,
+      limit: maxClearLimit,
     };
   };
 
   // 打开
   const open = (record: any) => {
-    maxLimit.value = maxClearLimit;
     renderForm({ ...defaultForm(), ...record });
     setVisible(true);
   };

diff --git a/orion-visor-ui/src/views/user/operator-log/components/operator-log-clear-modal.vue b/orion-visor-ui/src/views/user/operator-log/components/operator-log-clear-modal.vue
@@ -65,8 +65,8 @@
         <a-form-item field="limit" label="数量限制">
           <a-input-number v-model="formModel.limit"
                           :min="1"
-                          :max="maxLimit"
-                          :placeholder="`请输入数量限制 最大: ${maxLimit}`"
+                          :max="maxClearLimit"
+                          :placeholder="`请输入数量限制 最大: ${maxClearLimit}`"
                           hide-button
                           allow-clear />
         </a-form-item>
@@ -105,19 +105,17 @@
       riskLevel: undefined,
       result: undefined,
       startTimeRange: undefined,
-      limit: maxLimit.value,
+      limit: maxClearLimit,
     };
   };
 
-  const maxLimit = ref<number>(0);
   const typeOptions = ref<SelectOptionData[]>(toOptions(operatorLogTypeKey));
   const formModel = ref<OperatorLogQueryRequest>({});
 
   const emits = defineEmits(['clear']);
 
   // 打开
   const open = (record: OperatorLogQueryRequest) => {
-    maxLimit.value = maxClearLimit;
     renderForm({ ...defaultForm(), ...record });
     setVisible(true);
   };