💄 修改样式.

2024-05-31 13:36:49 +08:00
parent fc34b24029
commit 7bfa8a73be
30 changed files with 81 additions and 42 deletions
--- a/README.md
+++ b/README.md
@@ -70,12 +70,11 @@ docker compose up -d

 ## 项目文档

-* [文档地址](https://lijiahangmax.github.io/orion-visor/#/)
-* [docker安装](https://lijiahangmax.github.io/orion-visor/#/quickstart/docker-install)
-* [普通安装](https://lijiahangmax.github.io/orion-visor/#/quickstart/install)
-* [更新日志](https://lijiahangmax.github.io/orion-visor/#/about/change-log)
-* [操作手册](https://lijiahangmax.github.io/orion-visor/#/operator/asset)
-* [常见问题](https://lijiahangmax.github.io/orion-visor/#/quickstart/faq)
+* [文档地址](https://lijiahangmax.github.io/open-orion/orion-visor/)
+* [安装文档](https://lijiahangmax.github.io/open-orion/orion-visor/quickstart/docker.html)
+* [更新日志](https://lijiahangmax.github.io/open-orion/orion-visor/update/change-log.html)
+* [操作手册](https://lijiahangmax.github.io/open-orion/orion-visor/operator/asset.html)
+* [常见问题](https://lijiahangmax.github.io/open-orion/orion-visor/support/faq.html)

 ## 技术栈

--- a/docs/README.md
+++ b/docs/README.md
@@ -40,6 +40,12 @@

 ------------------------------

+<p><b>⛔⛔此页面已不再维护, 请跳转至 
+<a target="_blank" href="https://lijiahangmax.github.io/open-orion/orion-visor">这里</a> 
+查看最新文档 ❗</b></p>
+
+------------------------------
+
 **`orion-visor`** 提供一站式服务器运维解决方案。

 * **资产管理**：支持对资产进行分组，实现对主机、密钥和身份的统一管理和授权。
@@ -70,9 +76,8 @@ docker compose up -d

 ## 项目文档

-* [文档地址](https://lijiahangmax.github.io/orion-visor/#/)
-* [docker安装](/quickstart/docker-install)
-* [普通安装](/quickstart/install)
+* [文档地址](/)
+* [安装文档](/quickstart/docker-install)
 * [更新日志](/about/change-log)
 * [操作手册](/operator/asset)
 * [常见问题](/quickstart/faq)
--- a/docs/_coverpage.md
+++ b/docs/_coverpage.md
@@ -1,4 +1,4 @@
-# orion-visor <small>2.0.3</small>
+# orion-visor

 > 一款高颜值、现代化的智能运维&轻量堡垒机平台。

--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-table.columns.ts.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-table.columns.ts.vm
@@ -6,7 +6,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, #foreach($field in ${table.fields})#if("$!field.propertyName" != "id"){
--- a/orion-visor-launch/src/main/resources/application.yaml
+++ b/orion-visor-launch/src/main/resources/application.yaml
@@ -195,7 +195,7 @@ orion:
  api:
    # 公共 api 前缀
    prefix: /orion-visor/api
-    # 是否开启跨域
+    # 是否允许跨域
    cors: true
  websocket:
    # 公共 websocket 前缀
--- a/orion-visor-ui/src/components/app/app-footer/index.vue
+++ b/orion-visor-ui/src/components/app/app-footer/index.vue
@@ -2,11 +2,9 @@
  <a-layout-footer class="footer">
    <a-space direction="vertical" size="small">
      <a-space size="large">
-        <!-- <a-link target="_blank" href="https://github.com/lijiahangmax/orion-visor">官网</a-link> -->
-        <!-- <a-link target="_blank" href="https://github.com/lijiahangmax/orion-visor">教程</a-link> -->
        <a-link target="_blank" href="https://github.com/lijiahangmax/orion-visor">github</a-link>
        <a-link target="_blank" href="https://gitee.com/lijiahangmax/orion-visor">gitee</a-link>
-        <a-link target="_blank" href="https://lijiahangmax.github.io/orion-visor">文档</a-link>
+        <a-link target="_blank" href="https://lijiahangmax.github.io/open-orion/orion-visor">文档</a-link>
        <a-link target="_blank" href="https://github.com/lijiahangmax/orion-visor/blob/main/LICENSE">License</a-link>
        <a-link target="_blank" :href="`https://github.com/lijiahangmax/orion-visor/releases/tag/v${version}`">v{{ version }} Community</a-link>
      </a-space>
--- a/orion-visor-ui/src/components/exec/template/modal/table.columns.ts
+++ b/orion-visor-ui/src/components/exec/template/modal/table.columns.ts
@@ -5,7 +5,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {
--- a/orion-visor-ui/src/components/meta/history/modal/table.columns.ts
+++ b/orion-visor-ui/src/components/meta/history/modal/table.columns.ts
@@ -6,7 +6,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {
--- a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
+++ b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
@@ -74,7 +74,7 @@
                        type="warning"
                        @ok="deleteSelectRows">
            <a-button v-permission="['asset:host-connect-log:management:delete']"
-                      type="secondary"
+                      type="primary"
                      status="danger"
                      :disabled="selectedKeys.length === 0">
              删除
--- a/orion-visor-ui/src/views/asset-audit/connect-session/types/table.columns.ts
+++ b/orion-visor-ui/src/views/asset-audit/connect-session/types/table.columns.ts
@@ -6,7 +6,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {
--- a/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
+++ b/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
@@ -61,7 +61,7 @@
                        type="warning"
                        @ok="deleteSelectRows">
            <a-button v-permission="['infra:operator-log:delete', 'asset:host-sftp-log:management:delete']"
-                      type="secondary"
+                      type="primary"
                      status="danger"
                      :disabled="selectedKeys.length === 0">
              删除
--- a/orion-visor-ui/src/views/asset/host-identity/types/table.columns.ts
+++ b/orion-visor-ui/src/views/asset/host-identity/types/table.columns.ts
@@ -6,7 +6,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {
--- a/orion-visor-ui/src/views/asset/host-list/types/table.columns.ts
+++ b/orion-visor-ui/src/views/asset/host-list/types/table.columns.ts
@@ -5,7 +5,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {
--- a/orion-visor-ui/src/views/dashboard/workplace/components/docs.vue
+++ b/orion-visor-ui/src/views/dashboard/workplace/components/docs.vue
@@ -17,10 +17,10 @@
        <a-link target="_blank" href="https://github.com/lijiahangmax/orion-visor/issues">上报 bug</a-link>
      </a-col>
      <a-col :span="12">
-        <a-link target="_blank" href="https://lijiahangmax.github.io/orion-visor">操作文档</a-link>
+        <a-link target="_blank" href="https://lijiahangmax.github.io/open-orion/orion-visor/operator/asset.html">操作手册</a-link>
      </a-col>
      <a-col :span="12">
-        <a-link target="_blank" href="https://lijiahangmax.github.io/orion-visor/#/about/update-log">更新日志</a-link>
+        <a-link target="_blank" href="https://lijiahangmax.github.io/open-orion/orion-visor/update/change-log.html">更新日志</a-link>
      </a-col>
    </a-row>
  </a-card>
--- a/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
@@ -85,7 +85,7 @@
                        type="warning"
                        @ok="deleteSelectRows">
            <a-button v-permission="['asset:exec-command-log:delete']"
-                      type="secondary"
+                      type="primary"
                      status="danger"
                      :disabled="selectedKeys.length === 0">
              删除
--- a/orion-visor-ui/src/views/exec/exec-command-log/types/host-table.columns.ts
+++ b/orion-visor-ui/src/views/exec/exec-command-log/types/host-table.columns.ts
@@ -6,7 +6,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {
--- a/orion-visor-ui/src/views/exec/exec-command-log/types/table.columns.ts
+++ b/orion-visor-ui/src/views/exec/exec-command-log/types/table.columns.ts
@@ -5,7 +5,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {
--- a/orion-visor-ui/src/views/exec/exec-template/types/table.columns.ts
+++ b/orion-visor-ui/src/views/exec/exec-template/types/table.columns.ts
@@ -6,7 +6,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {
--- a/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
+++ b/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
@@ -85,7 +85,7 @@
                        type="warning"
                        @ok="deleteSelectRows">
            <a-button v-permission="['asset:upload-task:delete']"
-                      type="secondary"
+                      type="primary"
                      status="danger"
                      :disabled="selectedKeys.length === 0">
              删除
--- a/orion-visor-ui/src/views/exec/upload-task/types/table.columns.ts
+++ b/orion-visor-ui/src/views/exec/upload-task/types/table.columns.ts
@@ -6,7 +6,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {
--- a/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-log-table.vue
+++ b/orion-visor-ui/src/views/job/exec-job-log/components/exec-job-log-table.vue
@@ -70,7 +70,7 @@
                        type="warning"
                        @ok="deleteSelectRows">
            <a-button v-permission="['asset:exec-job-log:delete']"
-                      type="secondary"
+                      type="primary"
                      status="danger"
                      :disabled="selectedKeys.length === 0">
              删除
--- a/orion-visor-ui/src/views/job/exec-job-log/types/table.columns.ts
+++ b/orion-visor-ui/src/views/job/exec-job-log/types/table.columns.ts
@@ -5,7 +5,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {
--- a/orion-visor-ui/src/views/job/exec-job/types/table.columns.ts
+++ b/orion-visor-ui/src/views/job/exec-job/types/table.columns.ts
@@ -6,7 +6,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {
--- a/orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue
+++ b/orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue
@@ -63,6 +63,21 @@
              </template>
            </a-button>
          </a-popconfirm>
+          <!-- 删除 -->
+          <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
+                        position="br"
+                        type="warning"
+                        @ok="deleteSelectRows">
+            <a-button v-permission="['infra:dict-key:delete']"
+                      type="primary"
+                      status="danger"
+                      :disabled="selectedKeys.length === 0">
+              删除
+              <template #icon>
+                <icon-delete />
+              </template>
+            </a-button>
+          </a-popconfirm>
        </a-space>
      </div>
    </template>
@@ -71,6 +86,8 @@
             ref="tableRef"
             :loading="loading"
             :columns="columns"
+             v-model:selected-keys="selectedKeys"
+             :row-selection="rowSelection"
             :data="tableRenderData"
             :pagination="pagination"
             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
@@ -144,24 +161,26 @@
 <script lang="ts" setup>
  import type { DictKeyQueryRequest, DictKeyQueryResponse } from '@/api/system/dict-key';
  import { reactive, ref, onMounted } from 'vue';
-  import { deleteDictKey, getDictKeyPage, refreshCache } from '@/api/system/dict-key';
+  import { deleteDictKey, batchDeleteDictKey, getDictKeyPage, refreshCache } from '@/api/system/dict-key';
  import { Message } from '@arco-design/web-vue';
  import useLoading from '@/hooks/loading';
  import columns from '../types/table.columns';
-  import { usePagination } from '@/types/table';
+  import { usePagination, useRowSelection } from '@/types/table';
  import { dictValueTypeKey } from '../types/const';
  import { copy } from '@/hooks/copy';
  import { useCacheStore, useDictStore } from '@/store';
  import { getDictValueList } from '@/api/system/dict-value';

-  const tableRenderData = ref<DictKeyQueryResponse[]>([]);
  const emits = defineEmits(['openAdd', 'openUpdate', 'openView']);

  const pagination = usePagination();
+  const rowSelection = useRowSelection();
  const { loading, setLoading } = useLoading();
  const { toOptions, getDictValue } = useDictStore();
  const cacheStore = useCacheStore();

+  const selectedKeys = ref<number[]>([]);
+  const tableRenderData = ref<DictKeyQueryResponse[]>([]);
  const formModel = reactive<DictKeyQueryRequest>({
    id: undefined,
    keyName: undefined,
@@ -186,6 +205,23 @@
    }
  };

+  // 删除选中行
+  const deleteSelectRows = async () => {
+    try {
+      setLoading(true);
+      // 调用删除接口
+      await batchDeleteDictKey(selectedKeys.value);
+      Message.success(`成功删除 ${selectedKeys.value.length} 条数据`);
+      selectedKeys.value = [];
+      cacheStore.reset('dictKeys');
+      // 重新加载数据
+      fetchTableData();
+    } catch (e) {
+    } finally {
+      setLoading(false);
+    }
+  };
+
  // 添加后回调
  const addedCallback = () => {
    fetchTableData();
@@ -238,6 +274,7 @@
      pagination.total = data.total;
      pagination.current = request.page;
      pagination.pageSize = request.limit;
+      selectedKeys.value = [];
    } catch (e) {
    } finally {
      setLoading(false);
--- a/orion-visor-ui/src/views/system/dict-key/types/table.columns.ts
+++ b/orion-visor-ui/src/views/system/dict-key/types/table.columns.ts
@@ -5,7 +5,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {
--- a/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
+++ b/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
@@ -55,7 +55,7 @@
                        type="warning"
                        @ok="deleteSelectRows">
            <a-button v-permission="['infra:dict-value:delete']"
-                      type="secondary"
+                      type="primary"
                      status="danger"
                      :disabled="selectedKeys.length === 0">
              删除
--- a/orion-visor-ui/src/views/system/dict-value/types/table.columns.ts
+++ b/orion-visor-ui/src/views/system/dict-value/types/table.columns.ts
@@ -6,7 +6,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {
--- a/orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue
+++ b/orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue
@@ -32,7 +32,7 @@
                        type="warning"
                        @ok="deleteSelectRows">
            <a-button v-permission="['infra:operator-log:delete']"
-                      type="secondary"
+                      type="primary"
                      status="danger"
                      :disabled="selectedKeys.length === 0">
              删除
--- a/orion-visor-ui/src/views/user/role/types/table.columns.ts
+++ b/orion-visor-ui/src/views/user/role/types/table.columns.ts
@@ -6,7 +6,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {
--- a/orion-visor-ui/src/views/user/user/types/table.columns.ts
+++ b/orion-visor-ui/src/views/user/user/types/table.columns.ts
@@ -6,7 +6,7 @@ const columns = [
    title: 'id',
    dataIndex: 'id',
    slotName: 'id',
-    width: 70,
+    width: 100,
    align: 'left',
    fixed: 'left',
  }, {