v3.26.0 【优化】分页请求2次；【优化】菜单展开单个代码优化；【优化】操作记录返回结果；【优化】json viewer升级；【优化】S3协议优化；【优化】代码生成字典优化；

2025-11-07 11:13:48 +08:00 · 2025-08-10 13:02:01 +08:00
parent 8135e0ec10
commit d2c55e35ff
109 changed files with 309 additions and 266 deletions
--- a/smart-admin-web-javascript/package.json
+++ b/smart-admin-web-javascript/package.json
@@ -43,7 +43,7 @@
    "vue": "3.4.27",
    "vue-i18n": "9.13.1",
    "vue-router": "4.3.2",
-    "vue3-json-viewer": "2.2.2"
+    "vue3-json-viewer": "2.3.1"
  },
  "devDependencies": {
    "@vitejs/plugin-vue": "5.0.4",
--- a/smart-admin-web-javascript/src/components/support/data-tracer/index.vue
+++ b/smart-admin-web-javascript/src/components/support/data-tracer/index.vue
@@ -51,7 +51,6 @@
      v-model:pageSize="queryForm.pageSize"
      :total="total"
      @change="ajaxQuery"
-      @showSizeChange="ajaxQuery"
      :show-total="(total) => `共${total}条`"
    />
    <a-modal v-model:open="visibleDiff" width="90%" title="数据比对" :footer="null">
--- a/smart-admin-web-javascript/src/components/system/employee-table-select-modal/index.vue
+++ b/smart-admin-web-javascript/src/components/system/employee-table-select-modal/index.vue
@@ -71,7 +71,6 @@
        v-model:pageSize="params.pageSize"
        :total="total"
        @change="queryEmployee"
-        @showSizeChange="queryEmployee"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/config/app-config.js
+++ b/smart-admin-web-javascript/src/config/app-config.js
@@ -27,7 +27,7 @@ export const appDefaultConfig = {
  // 圆角
  borderRadius: 6,
  // 菜单展开模式
-  flatPattern: false,
+  menuSingleExpandFlag: true,
  // 标签页
  pageTagFlag: true,
  // 标签页样式: default、 antd、chrome
--- a/smart-admin-web-javascript/src/i18n/lang/en-US/index.js
+++ b/smart-admin-web-javascript/src/i18n/lang/en-US/index.js
@@ -21,11 +21,11 @@ export default {
  'setting.menu.layout': 'Menu Layout',
  'setting.menu.width': 'Menu Width',
  'setting.menu.theme': 'Menu Theme',
+  'setting.menu.expand': 'Menu Expand',
  'setting.page.width': 'Page Width',
  'setting.border.radius': 'Border Radius',
  'setting.compact': 'Page Compact',
  'setting.bread': 'Show Bread',
-  'setting.flatPattern': 'Flat Pattern',
  'setting.pagetag': 'Show PageTag',
  'setting.pagetag.style': 'PageTag Style',
  'setting.footer': 'Show Footer',
--- a/smart-admin-web-javascript/src/i18n/lang/zh-CN/index.js
+++ b/smart-admin-web-javascript/src/i18n/lang/zh-CN/index.js
@@ -21,11 +21,11 @@ export default {
  'setting.menu.layout': '菜单布局',
  'setting.menu.width': '菜单宽度',
  'setting.menu.theme': '菜单主题',
+  'setting.menu.expand': '菜单展开',
  'setting.compact': '页面紧凑',
  'setting.border.radius': '页面圆角',
  'setting.page.width': '页面宽度',
  'setting.bread': '面包屑',
-  'setting.flatPattern': '菜单展开模式',
  'setting.pagetag': '标签页',
  'setting.pagetag.style': '标签页样式',
  'setting.footer': '页脚',
--- a/smart-admin-web-javascript/src/layout/components/header-user-space/header-setting.vue
+++ b/smart-admin-web-javascript/src/layout/components/header-user-space/header-setting.vue
@@ -83,8 +83,8 @@
          <a-radio-button value="chrome">Chrome</a-radio-button>
        </a-radio-group>
      </a-form-item>
-      <a-form-item :label="$t('setting.flatPattern')" v-if="formState.layout === LAYOUT_ENUM.SIDE.value">
-        <a-switch @change="changeFlatPattern" v-model:checked="formState.flatPattern" checked-children="多个" un-checked-children="单个" />
+      <a-form-item :label="$t('setting.menu.expand')" v-if="formState.layout === LAYOUT_ENUM.SIDE.value">
+        <a-switch @change="changeMenuExpandFlag" v-model:checked="formState.menuSingleExpandFlag" checked-children="单个" un-checked-children="多个" />
      </a-form-item>
      <a-form-item :label="$t('setting.pagetag')">
        <a-switch @change="changePageTagFlag" v-model:checked="formState.pageTagFlag" checked-children="显示" un-checked-children="隐藏" />
@@ -213,8 +213,8 @@
    borderRadius: appConfigStore.borderRadius,
    // 标签页
    pageTagFlag: appConfigStore.pageTagFlag,
-    // 标签页
-    flatPattern: appConfigStore.flatPattern,
+    // 菜单展开方式
+    menuSingleExpandFlag: appConfigStore.menuSingleExpandFlag,
    // 标签页 样式
    pageTagStyle: appConfigStore.pageTagStyle,
    // 面包屑
@@ -303,9 +303,9 @@
    });
  }

-  function changeFlatPattern(e) {
+  function changeMenuExpandFlag(e) {
    appConfigStore.$patch({
-      flatPattern: e,
+      menuSingleExpandFlag: e,
    });
  }

--- a/smart-admin-web-javascript/src/layout/components/side-menu/recursion-menu.vue
+++ b/smart-admin-web-javascript/src/layout/components/side-menu/recursion-menu.vue
@@ -36,7 +36,7 @@
  import { useUserStore } from '/@/store/modules/system/user';

  const theme = computed(() => useAppConfigStore().$state.sideMenuTheme);
-  const flatPattern = computed(() => useAppConfigStore().$state.flatPattern);
+  const menuSingleExpandFlag = computed(() => useAppConfigStore().$state.menuSingleExpandFlag);

  const props = defineProps({
    collapsed: {
@@ -46,8 +46,7 @@
  });

  const menuTree = computed(() => useUserStore().getMenuTree || []);
-  const rootSubmenuKeys = computed(()=>menuTree.value.map(item=>item.menuId));
-
+  const rootSubmenuKeys = computed(() => menuTree.value.map((item) => item.menuId));

  //展开的菜单
  let currentRoute = useRoute();
@@ -76,9 +75,15 @@
    let parentList = menuParentIdListMap.get(currentRoute.name) || [];

    // 如果是折叠菜单的话，则不需要设置openkey
-    if (!props.collapsed) {
+    if (props.collapsed) {
+      return;
+    }
+
+    let needOpenKeys = _.map(parentList, 'name').map(Number);
+    if (menuSingleExpandFlag.value) {
+      openKeys.value = [...needOpenKeys];
+    } else {
      // 使用lodash的union函数，进行 去重合并两个数组
-      let needOpenKeys = _.map(parentList, 'name').map(Number);
      openKeys.value = _.union(openKeys.value, needOpenKeys);
    }
  }
@@ -92,17 +97,18 @@
      immediate: true,
    }
  );
-  function onOpenChange(openKeysParams){
-  if(flatPattern.value){
-    return;
+
+  function onOpenChange(openKeysParams) {
+    if (!menuSingleExpandFlag.value) {
+      return;
+    }
+    const latestOpenKey = openKeysParams.find((key) => openKeys.value.indexOf(key) === -1);
+    if (rootSubmenuKeys.value.indexOf(latestOpenKey) === -1) {
+      openKeys.value = openKeysParams;
+    } else {
+      openKeys.value = latestOpenKey ? [latestOpenKey] : [];
+    }
  }
-  const latestOpenKey = openKeysParams.find(key => openKeys.value.indexOf(key) === -1);
-  if (rootSubmenuKeys.value.indexOf(latestOpenKey) === -1) {
-    openKeys.value = openKeysParams;
-  } else {
-    openKeys.value = latestOpenKey ? [latestOpenKey] : [];
-  }
-};
  defineExpose({
    updateOpenKeysAndSelectKeys,
  });
--- a/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue
+++ b/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue
@@ -149,7 +149,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="queryData"
-        @showSizeChange="queryData"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue
+++ b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue
@@ -78,7 +78,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="ajaxQuery"
-        @showSizeChange="ajaxQuery"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-employee-list.vue
+++ b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-employee-list.vue
@@ -63,7 +63,6 @@
          v-model:pageSize="queryForm.pageSize"
          :total="total"
          @change="queryEmployee"
-          @showSizeChange="queryEmployee"
          :show-total="showTableTotal"
        />
      </div>
--- a/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue
+++ b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue
@@ -75,7 +75,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="ajaxQuery"
-        @showSizeChange="ajaxQuery"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/business/oa/enterprise/enterprise-list.vue
+++ b/smart-admin-web-javascript/src/views/business/oa/enterprise/enterprise-list.vue
@@ -102,7 +102,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="ajaxQuery"
-        @showSizeChange="ajaxQuery"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/business/oa/notice/components/notice-view-record-list.vue
+++ b/smart-admin-web-javascript/src/views/business/oa/notice/components/notice-view-record-list.vue
@@ -53,7 +53,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="queryViewRecord"
-        @showSizeChange="queryViewRecord"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/business/oa/notice/notice-employee-list.vue
+++ b/smart-admin-web-javascript/src/views/business/oa/notice/notice-employee-list.vue
@@ -72,7 +72,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="queryNoticeList"
-        @showSizeChange="queryNoticeList"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/business/oa/notice/notice-list.vue
+++ b/smart-admin-web-javascript/src/views/business/oa/notice/notice-list.vue
@@ -122,7 +122,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="queryNoticeList"
-        @showSizeChange="queryNoticeList"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/support/change-log/change-log-list.vue
+++ b/smart-admin-web-javascript/src/views/support/change-log/change-log-list.vue
@@ -107,7 +107,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="queryData"
-        @showSizeChange="queryData"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue
+++ b/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue
@@ -74,7 +74,6 @@
          v-model:pageSize="queryForm.pageSize"
          :total="total"
          @change="ajaxQuery"
-          @showSizeChange="ajaxQuery"
          :show-total="(total) => `共${total}条`"
        />
      </div>
--- a/smart-admin-web-javascript/src/views/support/config/config-list.vue
+++ b/smart-admin-web-javascript/src/views/support/config/config-list.vue
@@ -66,7 +66,6 @@
          v-model:pageSize="queryForm.pageSize"
          :total="total"
          @change="ajaxQuery"
-          @showSizeChange="ajaxQuery"
          :show-total="(total) => `共${total}条`"
        />
      </div>
--- a/smart-admin-web-javascript/src/views/support/dict/index.vue
+++ b/smart-admin-web-javascript/src/views/support/dict/index.vue
@@ -98,7 +98,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="ajaxQuery"
-        @showSizeChange="ajaxQuery"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/support/feedback/feedback-list.vue
+++ b/smart-admin-web-javascript/src/views/support/feedback/feedback-list.vue
@@ -64,7 +64,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="queryList"
-        @showSizeChange="queryList"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/support/file/file-list.vue
+++ b/smart-admin-web-javascript/src/views/support/file/file-list.vue
@@ -103,7 +103,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="queryData"
-        @showSizeChange="queryData"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/support/heart-beat/heart-beat-list.vue
+++ b/smart-admin-web-javascript/src/views/support/heart-beat/heart-beat-list.vue
@@ -79,7 +79,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="ajaxQuery"
-        @showSizeChange="ajaxQuery"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/support/help-doc/management/components/help-doc-list.vue
+++ b/smart-admin-web-javascript/src/views/support/help-doc/management/components/help-doc-list.vue
@@ -88,7 +88,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="queryHelpDocList"
-        @showSizeChange="queryHelpDocList"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/support/help-doc/user-view/components/help-doc-view-record-list.vue
+++ b/smart-admin-web-javascript/src/views/support/help-doc/user-view/components/help-doc-view-record-list.vue
@@ -49,7 +49,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="queryViewRecord"
-        @showSizeChange="queryViewRecord"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/support/job/components/deleted-job-list.vue
+++ b/smart-admin-web-javascript/src/views/support/job/components/deleted-job-list.vue
@@ -117,7 +117,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="queryJobList"
-        @showSizeChange="queryJobList"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/support/job/components/job-log-list-modal.vue
+++ b/smart-admin-web-javascript/src/views/support/job/components/job-log-list-modal.vue
@@ -71,7 +71,6 @@
          v-model:pageSize="queryForm.pageSize"
          :total="total"
          @change="queryLogList"
-          @showSizeChange="queryLogList"
          :show-total="(total) => `共${total}条`"
        />
      </div>
--- a/smart-admin-web-javascript/src/views/support/job/job-list.vue
+++ b/smart-admin-web-javascript/src/views/support/job/job-list.vue
@@ -136,7 +136,6 @@
              v-model:pageSize="queryForm.pageSize"
              :total="total"
              @change="queryJobList"
-              @showSizeChange="queryJobList"
              :show-total="(total) => `共${total}条`"
            />
          </div>
--- a/smart-admin-web-javascript/src/views/support/login-fail/login-fail-list.vue
+++ b/smart-admin-web-javascript/src/views/support/login-fail/login-fail-list.vue
@@ -102,7 +102,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="onSearch"
-        @showSizeChange="onSearch"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/support/login-log/login-log-list.vue
+++ b/smart-admin-web-javascript/src/views/support/login-log/login-log-list.vue
@@ -89,7 +89,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="ajaxQuery"
-        @showSizeChange="ajaxQuery"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/support/message/components/message-receiver-modal.vue
+++ b/smart-admin-web-javascript/src/views/support/message/components/message-receiver-modal.vue
@@ -47,7 +47,6 @@
        v-model:pageSize="queryParam.pageSize"
        :total="total"
        @change="queryList"
-        @showSizeChange="queryList"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/support/message/message-list.vue
+++ b/smart-admin-web-javascript/src/views/support/message/message-list.vue
@@ -78,7 +78,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="queryData"
-        @showSizeChange="queryData"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/support/operate-log/operate-log-detail-modal.vue
+++ b/smart-admin-web-javascript/src/views/support/operate-log/operate-log-detail-modal.vue
@@ -12,6 +12,10 @@
    <div class="info-box">
      <a-row class="smart-margin-top10">
        <a-col :span="16">
+          <a-row class="detail-info">
+            <a-col :span="12"> 用户id：{{ detail.operateUserId }}</a-col>
+            <a-col :span="12"> 用户名称： {{ detail.operateUserName }}</a-col>
+          </a-row>
          <a-row class="detail-info">
            <a-col :span="12"> 请求url： {{ detail.url }}</a-col>
            <a-col :span="12"> 请求日期： {{ detail.createTime }}</a-col>
@@ -21,8 +25,7 @@
            <a-col :span="12"> IP地区： {{ detail.ipRegion }}</a-col>
          </a-row>
          <a-row class="detail-info">
-            <a-col :span="12"> 用户id：{{ detail.operateUserId }}</a-col>
-            <a-col :span="12"> 用户名称： {{ detail.operateUserName }}</a-col>
+            <a-col :span="12"> 客户端： {{ detail.os }} / {{ detail.browser }}  {{ detail.device ? '/' + detail.device : detail.device }}</a-col>
          </a-row>
        </a-col>
        <a-col :span="8">
@@ -32,21 +35,26 @@
          </a-typography-text>
        </a-col>
      </a-row>
-    </div>
-    <div class="info-box">
-      <h4>请求明细：</h4>
-      <a-col :span="24"> 方法： {{ detail.method }}</a-col>
-      <a-col :span="24"> 说明： {{ detail.module }} - {{ detail.content }}</a-col>
+      <a-row class="detail-info">
+        <a-col :span="24"> 方法： {{ detail.method }}</a-col>
+      </a-row>
+      <a-row class="detail-info">
+        <a-col :span="24"> 说明： {{ detail.module }} - {{ detail.content }}</a-col>
+      </a-row>
    </div>
    <div class="info-box">
      <h4>请求参数：</h4>
-      <JsonViewer :value="detail.param ? JSON.parse(detail.param) : ''" theme="jv-dark" copyable boxed sort />
+      <JsonViewer :value="detail.param ? JSON.parse(detail.param) : ''" :expanded="true" :expandDepth="10" copyable boxed sort theme="light" />
+    </div>
+    <div class="info-box" v-if="detail.successFlag">
+      <h4>返回结果：</h4>
+      <JsonViewer :value="detail.response ? JSON.parse(detail.response) : ''" :expanded="true" :expandDepth="10" copyable boxed sort theme="light" />
    </div>
    <div class="info-box" v-if="detail.failReason">
      <h4>请求失败原因：</h4>
-      <div>
+      <a-card>
        {{ detail.failReason }}
-      </div>
+      </a-card>
    </div>
  </a-modal>
 </template>
@@ -57,6 +65,7 @@
  import { operateLogApi } from '/@/api/support/operate-log-api';
  import { smartSentry } from '/@/lib/smart-sentry';
  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import uaparser from 'ua-parser-js';

  defineExpose({
    show,
@@ -87,11 +96,16 @@
    param: '',
    url: '',
  });
+
  async function getDetail(operateLogId) {
    try {
      SmartLoading.show();
      let res = await operateLogApi.detail(operateLogId);
      detail = Object.assign(detail, res.data);
+      let ua = uaparser(res.data.userAgent);
+      detail.browser = ua.browser.name;
+      detail.os = ua.os.name;
+      detail.device = ua.device.vendor ? ua.device.vendor + ua.device.model : '';
    } catch (e) {
      smartSentry.captureError(e);
    } finally {
@@ -107,10 +121,11 @@
    font-size: 20px;
    font-weight: bold;
  }
+
  .info-box {
-    border-bottom: 1px solid #f0f0f0;
    padding: 10px 8px;
  }
+
  .detail-info {
    .ant-col {
      line-height: 1.46;
@@ -118,6 +133,7 @@
      padding-right: 5px;
    }
  }
+
  .detail-right-title {
    text-align: right;
    color: grey;
--- a/smart-admin-web-javascript/src/views/support/operate-log/operate-log-list.vue
+++ b/smart-admin-web-javascript/src/views/support/operate-log/operate-log-list.vue
@@ -14,7 +14,7 @@
        <a-input style="width: 150px" v-model:value="queryForm.keywords" placeholder="模块/操作内容" />
      </a-form-item>
      <a-form-item label="请求关键字" class="smart-query-form-item">
-        <a-input style="width: 220px" v-model:value="queryForm.requestKeywords" placeholder="请求地址/请求方法/请求参数" />
+        <a-input style="width: 270px" v-model:value="queryForm.requestKeywords" placeholder="请求地址/请求方法/请求参数/返回结果" />
      </a-form-item>
      <a-form-item label="用户名称" class="smart-query-form-item">
        <a-input style="width: 100px" v-model:value="queryForm.userName" placeholder="用户名称" />
@@ -24,7 +24,7 @@
        <a-range-picker @change="changeCreateDate" v-model:value="createDateRange" :presets="defaultChooseTimeRange" style="width: 240px" />
      </a-form-item>

-      <a-form-item label="快速筛选" class="smart-query-form-item">
+      <a-form-item label="状态：" class="smart-query-form-item">
        <a-radio-group v-model:value="queryForm.successFlag" @change="onSearch">
          <a-radio-button :value="undefined">全部</a-radio-button>
          <a-radio-button :value="true">成功</a-radio-button>
@@ -51,18 +51,23 @@
    </a-row>
  </a-form>

-  <a-card size="small" :bordered="false" :hoverable="true" style="height: 100%">
+  <a-card size="small" :bordered="false" :hoverable="true" >
    <a-row justify="end">
      <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.CONFIG" :refresh="ajaxQuery" />
    </a-row>
    <a-table size="small" :loading="tableLoading" :dataSource="tableData" :columns="columns" bordered rowKey="operateLogId" :pagination="false">
      <template #bodyCell="{ text, record, column }">
+        <template v-if="column.dataIndex === 'response'">
+          <a-typography-text v-if="text && text.ok">{{ text ? text.msg : '-' }}</a-typography-text>
+          <a-typography-text v-else type="warning">{{ text ? text.msg : '-' }}</a-typography-text>
+        </template>
+
        <template v-if="column.dataIndex === 'successFlag'">
-          <a-tag :color="text ? 'success' : 'error'">{{ text ? '成功' : '失败' }}</a-tag>
+          <a-tag :color="text ? 'success' : 'error'">{{ text ? '成功' : '报错' }}</a-tag>
        </template>

        <template v-if="column.dataIndex === 'userAgent'">
-          <div>{{ record.browser }} / {{ record.os }} / {{ record.device }}</div>
+          <div>{{ record.os }} / {{ record.browser }}  {{ record.device ? '/' + record.device : record.device }}</div>
        </template>

        <template v-if="column.dataIndex === 'operateUserType'">
@@ -88,7 +93,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="ajaxQuery"
-        @showSizeChange="ajaxQuery"
        :show-total="(total) => `共${total}条`"
      />
    </div>
@@ -135,14 +139,15 @@
      ellipsis: true,
    },
    {
-      title: 'IP',
-      dataIndex: 'ip',
+      title: '返回结果',
+      dataIndex: 'response',
      ellipsis: true,
    },
    {
      title: 'IP地区',
      dataIndex: 'ipRegion',
      ellipsis: true,
+      width: 150,
    },
    {
      title: '客户端',
@@ -150,20 +155,15 @@
      ellipsis: true,
    },
    {
-      title: '请求方法',
-      dataIndex: 'method',
-      ellipsis: true,
-    },
-    {
-      title: '请求结果',
-      dataIndex: 'successFlag',
-      width: 80,
-    },
-    {
-      title: '时间',
+      title: '操作时间',
      dataIndex: 'createTime',
      width: 150,
    },
+    {
+      title: '状态',
+      dataIndex: 'successFlag',
+      width: 60,
+    },
    {
      title: '操作',
      dataIndex: 'action',
@@ -212,6 +212,10 @@
      let responseModel = await operateLogApi.queryList(queryForm);

      for (const e of responseModel.data.list) {
+        if(e.response){
+          e.response = JSON.parse(e.response);
+        }
+
        if (!e.userAgent) {
          continue;
        }
--- a/smart-admin-web-javascript/src/views/support/serial-number/serial-number-record-list.vue
+++ b/smart-admin-web-javascript/src/views/support/serial-number/serial-number-record-list.vue
@@ -32,7 +32,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="ajaxQuery"
-        @showSizeChange="ajaxQuery"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/system/account/components/login-log/index.vue
+++ b/smart-admin-web-javascript/src/views/system/account/components/login-log/index.vue
@@ -63,7 +63,6 @@
      v-model:pageSize="queryForm.pageSize"
      :total="total"
      @change="ajaxQuery"
-      @showSizeChange="ajaxQuery"
      :show-total="(total) => `共${total}条`"
    />
  </div>
--- a/smart-admin-web-javascript/src/views/system/account/components/message/index.vue
+++ b/smart-admin-web-javascript/src/views/system/account/components/message/index.vue
@@ -75,7 +75,6 @@
      v-model:pageSize="queryForm.pageSize"
      :total="total"
      @change="ajaxQuery"
-      @showSizeChange="ajaxQuery"
      :show-total="(total) => `共${total}条`"
    />
  </div>
--- a/smart-admin-web-javascript/src/views/system/account/components/operate-log/index.vue
+++ b/smart-admin-web-javascript/src/views/system/account/components/operate-log/index.vue
@@ -68,7 +68,6 @@
      v-model:pageSize="queryForm.pageSize"
      :total="total"
      @change="ajaxQuery"
-      @showSizeChange="ajaxQuery"
      :show-total="(total) => `共${total}条`"
    />
  </div>
--- a/smart-admin-web-javascript/src/views/system/employee/components/employee-list/index.vue
+++ b/smart-admin-web-javascript/src/views/system/employee/components/employee-list/index.vue
@@ -94,7 +94,6 @@
        v-model:pageSize="params.pageSize"
        :total="total"
        @change="queryEmployee"
-        @showSizeChange="queryEmployee"
        :show-total="showTableTotal"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/system/home/ad-modal.vue
+++ b/smart-admin-web-javascript/src/views/system/home/ad-modal.vue
@@ -8,23 +8,24 @@
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
-  <a-modal :open="visible" width="600px" :bodyStyle="{height:'480px'}"   title="" :closable="false" :maskClosable="true">
-    <a-row><div style="font-weight:bolder;margin: 0 auto;font-size: 16px">助力卓大抖音1000个粉丝，开播写代码🎉🎉</div> </a-row>
-    <a-row><div style="font-weight:bolder;margin: 20px auto;font-size: 15px">和1024创新实验室一起，热爱代码，热爱生活，永远年轻，永远前行🎉🎉</div> </a-row>
+  <a-modal :open="visible" width="600px" :bodyStyle="{height:'360px'}"   title="" :closable="false" :maskClosable="true">
+    <a-row><div style="font-weight:bolder;margin: 0 auto;font-size: 16px;color: red;">重磅更新：国产数据库支持🎉🎉</div> </a-row>
+    <a-row><div style="font-weight:bolder;margin: 10px auto;font-size: 16px;color: red;">支持：达梦、人大金仓、华为高斯GaussDB 等🎉🎉</div> </a-row>
    <br />
    <div class="app-qr-box">
      <div class="app-qr">
        <a-image
-            :width="300"
+            :width="200"
            style="border-radius: 15px;"
-            src="https://img.smartadmin.1024lab.net/wechat/douyin.png"
+            src="https://img.smartadmin.1024lab.net/wechat/zhuoda-wechat.jpg"
        />

-        <span class="qr-desc strong"> 打开【抖音APP】-点击【左上角侧边栏】-【点击扫一扫】-【进行关注】</span>
+        <span class="qr-desc strong"> 添加“卓大”微信，备注对应数据库，如 达梦</span>
      </div>
    </div>
    <template #footer>
-      <a-button type="primary" @click="hide">知道了</a-button>
+      <a-button type="default" @click="hide">知道了</a-button>
+      <a-button danger type="default" @click="goto" target="_blank" href="https://smartadmin.vip/views/other/china-db/">去看看国产数据库，了解一下</a-button>
    </template>
  </a-modal>
 </template>
@@ -36,6 +37,9 @@ defineExpose({
  });

  const visible = ref(true);
+  function goto(){
+
+  }
  function show() {
    visible.value = true;
  }
@@ -64,8 +68,7 @@ defineExpose({
        display: flex;
        margin-top: 20px;
        align-items: center;
-        font-size: 13px;
-        color: red;
+        font-size: 15px;
        text-align: center;
        overflow-x: hidden;
        > img {
--- a/smart-admin-web-javascript/src/views/system/home/home-header.vue
+++ b/smart-admin-web-javascript/src/views/system/home/home-header.vue
@@ -108,7 +108,7 @@
    let lunarMonth = lunar.getMonthInChinese();
    let lunarDay = lunar.getDayInChinese();
    //节气
-    let jieqi = lunar.getPrevJieQi().getName();
+    let jieqi = lunar.getJieQi();
    let next = lunar.getNextJieQi();
    let nextJieqi = next.getName() + ' ' + next.getSolar().toYmd();

--- a/smart-admin-web-javascript/src/views/system/position/position-list.vue
+++ b/smart-admin-web-javascript/src/views/system/position/position-list.vue
@@ -86,7 +86,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="queryData"
-        @showSizeChange="queryData"
        :show-total="(total) => `共${total}条`"
      />
    </div>
--- a/smart-admin-web-javascript/src/views/system/role/components/role-employee-list/index.vue
+++ b/smart-admin-web-javascript/src/views/system/role/components/role-employee-list/index.vue
@@ -68,7 +68,6 @@
        v-model:pageSize="queryForm.pageSize"
        :total="total"
        @change="queryRoleEmployee"
-        @showSizeChange="queryRoleEmployee"
        :show-total="showTableTotal"
      />
    </div>