Merge pull request #1269 from EightMonth/sas

sas兼容shiro处理
2024-06-20 16:09:05 +08:00 · 2024-05-23 10:49:37 +08:00 · 2024-05-22 18:43:06 +08:00 · 2024-01-17 13:56:40 +08:00 · 2024-01-16 19:50:33 +08:00 · 2024-01-12 09:43:22 +08:00
188 changed files with 14173 additions and 14150 deletions
--- a/.env.development
+++ b/.env.development
@@ -4,6 +4,7 @@ VITE_USE_MOCK = true
 # 发布路径
 VITE_PUBLIC_PATH = /

+
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
 VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]

--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ pnpm-debug.log*

 # Editor directories and files
 .idea
+.svn
 # .vscode
 *.suo
 *.ntvs*
--- a/4
+++ b/4
@@ -32,4 +32,6 @@ SOFTWARE.
 	 违反此条款属于侵权行为，须赔偿侵权经济损失，同时立即停止著作权侵权行为。
 	 
   总结：在遵循Apache开源协议和开源协议补充条款下，允许商用使用，不会造成侵权行为！
-	 解释权归：http://www.jeecg.com
+	 解释权归：
+   http://www.jeecg.com
+   http://guojusoft.com
--- a/README.md
+++ b/README.md
@@ -1,18 +1,18 @@
 JEECG BOOT 低代码开发平台（Vue3前端）
 ===============
-当前最新版本： 3.6.1（发布时间：2023-12-11）
+当前最新版本： 3.6.2（发布时间：2024-01-08）

 [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
 [![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://jeecg.com/aboutusIndex)
 [![](https://img.shields.io/badge/Blog-官方博客-blue.svg)](https://jeecg.blog.csdn.net)
-[![](https://img.shields.io/badge/version-3.6.1-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![](https://img.shields.io/badge/version-3.6.2-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot)



 ## 简介
-JeecgBoot-Vue3采用 Vue3.0、Vite、 Ant-Design-Vue3、TypeScript 等新技术方案，包括二次封装组件、utils、hooks、动态菜单、权限校验、按钮级别权限控制等功能。
+JeecgBoot-Vue3采用 Vue3.0、Vite、 Ant-Design-Vue4、TypeScript 等新技术方案，包括二次封装组件、utils、hooks、动态菜单、权限校验、按钮级别权限控制等功能。
 是采用Vben实现的 JeecgBoot低代码平台的全新vue3版本。
 
 > 强大的代码生成器让前后端代码一键生成! JeecgBoot引领低代码开发模式(OnlineCoding-> 代码生成-> 手工MERGE)， 帮助解决Java项目70%的重复工作，让开发更多关注业务。既能快速提高效率，节省成本，同时又不失灵活性
@@ -44,8 +44,8 @@ JeecgBoot-Vue3采用 Vue3.0、Vite、 Ant-Design-Vue3、TypeScript 等新技术

 ## 技术文档

-   官方文档：[http://help.jeecg.com](http://help.jeecg.com)
-   官方网站： [http://www.jeecg.com](http://www.jeecg.com)
+-   官方文档：[https://help.jeecg.com](https://help.jeecg.com)
+-   官方网站： [https://www.jeecg.com](https://www.jeecg.com)
 -   快速入门：[快速入门](http://jeecg.com/doc/quickstart) | [常见问题](http://help.jeecg.com/qa.html) | [视频教程](https://www.bilibili.com/video/BV1V34y187Y9 "入门视频") |  [ 代码生成](http://help.jeecg.com/vue3/codegen/online.html)
 -   QQ交流群：⑧825232878、⑦791696430(满)、683903138(满)
 -   在线演示 ：  [Vue3演示](http://boot3.jeecg.com)   | [APP演示](http://jeecg.com/appIndex)|  [敲敲云零代码](https://www.qiaoqiaoyun.com)
--- a/build/generate/generateModifyVars.ts
+++ b/build/generate/generateModifyVars.ts
@@ -1,11 +1,21 @@
-import { generateAntColors, primaryColor } from '../config/themeConfig';
-import { getThemeVariables } from 'ant-design-vue/dist/theme';
+import { primaryColor } from '../config/themeConfig';
+// import { getThemeVariables } from 'ant-design-vue/dist/theme';
 import { resolve } from 'path';
+import { generate } from '@ant-design/colors';
+import { theme } from 'ant-design-vue/lib';
+import convertLegacyToken from 'ant-design-vue/lib/theme/convertLegacyToken';
+const { defaultAlgorithm, defaultSeed } = theme;
+
+function generateAntColors(color: string, theme: 'default' | 'dark' = 'default') {
+  return generate(color, {
+    theme,
+  });
+}

 /**
 * less global variable
 */
-export function generateModifyVars(dark = false) {
+export function generateModifyVars() {
  const palettes = generateAntColors(primaryColor);
  const primary = palettes[5];

@@ -15,12 +25,14 @@ export function generateModifyVars(dark = false) {
    primaryColorObj[`primary-${index + 1}`] = palettes[index];
  }

-  const modifyVars = getThemeVariables({ dark });
+  const mapToken = defaultAlgorithm(defaultSeed);
+  const v3Token = convertLegacyToken(mapToken);
  return {
-    ...modifyVars,
+    ...v3Token,
+    // ...modifyVars,
    // Used for global import to avoid the need to import each style file separately
    // reference:  Avoid repeated references
-    hack: `${modifyVars.hack} @import (reference) "${resolve('src/design/config.less')}";`,
+    hack: `true; @import (reference) "${resolve('src/design/config.less')}";`,
    'primary-color': primary,
    ...primaryColorObj,
    'info-color': primary,
--- a/build/vite/plugin/index.ts
+++ b/build/vite/plugin/index.ts
@@ -11,7 +11,6 @@ import vueSetupExtend from 'vite-plugin-vue-setup-extend-plus';
 import { configHtmlPlugin } from './html';
 import { configMockPlugin } from './mock';
 import { configCompressPlugin } from './compress';
-import { configStyleImportPlugin } from './styleImport';
 import { configVisualizerConfig } from './visualizer';
 import { configThemePlugin } from './theme';
 import { configSvgIconsPlugin } from './svgSprite';
@@ -49,9 +48,6 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
  // vite-plugin-purge-icons
  vitePlugins.push(purgeIcons());

-  // vite-plugin-style-import
-  vitePlugins.push(configStyleImportPlugin(isBuild));
-
  // rollup-plugin-visualizer
  vitePlugins.push(configVisualizerConfig());

--- a/build/vite/plugin/theme.ts
+++ b/build/vite/plugin/theme.ts
@@ -57,7 +57,7 @@ export function configThemePlugin(isBuild: boolean): PluginOption[] {
    vite_theme_plugin,
    antdDarkThemePlugin({
      preloadFiles: [
-        path.resolve(process.cwd(), 'node_modules/ant-design-vue/dist/antd.less'),
+        // path.resolve(process.cwd(), 'node_modules/ant-design-vue/dist/reset.css'),
        //path.resolve(process.cwd(), 'node_modules/ant-design-vue/dist/antd.dark.less'),
        path.resolve(process.cwd(), 'src/design/index.less'),
      ],
--- a/index.html
+++ b/index.html
@@ -166,6 +166,7 @@
      </div>
    </div>
    <script type="module" src="/src/main.ts"></script>
+    <!-- 百度统计 -->
    <script>
      var _hmt = _hmt || [];
      (function() {
@@ -175,5 +176,6 @@
        s.parentNode.insertBefore(hm, s);
      })();
    </script>
+
  </body>
 </html>
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
  "name": "jeecgboot-vue3",
-  "version": "3.6.1",
+  "version": "3.6.2",
  "author": {
    "name": "北京国炬信息技术有限公司",
    "email": "jeecgos@163.com",
-    "url": "http://guojusoft.com"
+    "url": "https://github.com/jeecgboot/jeecgboot-vue3"
  },
  "scripts": {
    "pinstall": "pnpm install",
@@ -21,19 +21,19 @@
    "husky:install": "husky install"
  },
  "dependencies": {
-    "@jeecg/online": "3.6.0-beta",
-    "@qiaoqiaoyun/drag-free": "^1.1.4",
+    "@jeecg/online": "3.6.2-beta",
    "@iconify/iconify": "^3.1.1",
    "@ant-design/colors": "^7.0.0",
-    "@ant-design/icons-vue": "^6.1.0",
+    "@ant-design/icons-vue": "^7.0.1",
    "@logicflow/core": "^1.2.12",
    "@logicflow/extension": "^1.2.13",
    "@vue/runtime-core": "^3.3.4",
    "@vue/shared": "^3.3.4",
    "@vueuse/shared": "^10.4.1",
    "@vueuse/core": "^10.4.1",
+    "@tinymce/tinymce-vue": "^4.0.7",
    "@zxcvbn-ts/core": "^3.0.3",
-    "ant-design-vue": "^3.2.20",
+    "ant-design-vue": "^4.0.8",
    "axios": "^1.5.0",
    "china-area-data": "^5.0.1",
    "clipboard": "^2.0.11",
@@ -61,9 +61,9 @@
    "resize-observer-polyfill": "^1.5.1",
    "showdown": "^2.1.0",
    "sortablejs": "^1.15.0",
-    "tinymce": "^5.10.3",
+    "tinymce": "^6.6.2",
    "vditor": "^3.9.5",
-    "vue": "^3.3.4",
+    "vue": "3.3.11",
    "vue-cropper": "^0.6.2",
    "vue-cropperjs": "^5.0.0",
    "vue-i18n": "9.2.2",
@@ -150,7 +150,6 @@
    "vite-plugin-mkcert": "^1.16.0",
    "vite-plugin-mock": "^2.9.6",
    "vite-plugin-purge-icons": "^0.9.2",
-    "vite-plugin-style-import": "^2.0.0",
    "vite-plugin-svg-icons": "^2.0.1",
    "@rys-fe/vite-plugin-theme": "^0.8.6",
    "vite-plugin-vue-setup-extend-plus": "^0.1.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <ConfigProvider :locale="getAntdLocale">
+  <ConfigProvider :theme="appTheme" :locale="getAntdLocale">
    <AppProvider>
      <RouterView />
    </AppProvider>
@@ -7,20 +7,73 @@
 </template>

 <script lang="ts" setup>
+  import { watch, ref } from 'vue';
+  import { theme } from 'ant-design-vue';
  import { ConfigProvider } from 'ant-design-vue';
  import { AppProvider } from '/@/components/Application';
  import { useTitle } from '/@/hooks/web/useTitle';
  import { useLocale } from '/@/locales/useLocale';
+  import { useAppStore } from '/@/store/modules/app';
+  import { useRootSetting } from '/@/hooks/setting/useRootSetting';
+  import { ThemeEnum } from '/@/enums/appEnum';
+  import { changeTheme } from '/@/logics/theme/index';

+  const appStore = useAppStore();
  // 解决日期时间国际化问题
  import 'dayjs/locale/zh-cn';
  // support Multi-language
  const { getAntdLocale } = useLocale();

  useTitle();
+  // update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
+  const appTheme: any = ref({});
+  const { getDarkMode } = useRootSetting();
+  watch(
+    () => getDarkMode.value,
+    (newValue) => {
+      delete appTheme.value.algorithm;
+      if (newValue === ThemeEnum.DARK) {
+        appTheme.value.algorithm = theme.darkAlgorithm;
+      }
+      appTheme.value = {
+        ...appTheme.value,
+      };
+    },
+    { immediate: true }
+  );
+  watch(
+    appStore.getProjectConfig,
+    (newValue) => {
+      const primary = newValue.themeColor;
+      appTheme.value = {
+        ...appTheme.value,
+        ...{
+          token: {
+            colorPrimary: primary,
+            wireframe: true,
+            fontSize: 14,
+            colorSuccess: '#55D187',
+            colorInfo: primary,
+            borderRadius: 2,
+            sizeStep: 4,
+            sizeUnit: 4,
+            colorWarning: '#EFBD47',
+            colorError: '#ED6F6F',
+          },
+        },
+      };
+    },
+    { immediate: true }
+  );
+  setTimeout(() => {
+    appStore.getProjectConfig?.themeColor && changeTheme(appStore.getProjectConfig.themeColor);
+  }, 300);
+  // update-end--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
 </script>
 <style lang="less">
-// update-begin--author:liaozhiyang---date:20230803---for：【QQYUN-5839】windi会影响到html2canvas绘制的图片样式
-img{display:inline-block;}
-// update-end--author:liaozhiyang---date:20230803---for：【QQYUN-5839】windi会影响到html2canvas绘制的图片样式
+  // update-begin--author:liaozhiyang---date:20230803---for：【QQYUN-5839】windi会影响到html2canvas绘制的图片样式
+  img {
+    display: inline-block;
+  }
+  // update-end--author:liaozhiyang---date:20230803---for：【QQYUN-5839】windi会影响到html2canvas绘制的图片样式
 </style>
--- a/src/api/sys/model/userModel.ts
+++ b/src/api/sys/model/userModel.ts
@@ -4,11 +4,13 @@
 export interface LoginParams {
  username: string;
  password: string;
+  grant_type: string;
 }

 export interface ThirdLoginParams {
  token: string;
  thirdType: string;
+  grant_type: string;
 }

 export interface RoleInfo {
--- a/src/api/sys/user.ts
+++ b/src/api/sys/user.ts
@@ -12,7 +12,7 @@ import { PageEnum } from '/@/enums/pageEnum';
 const { createErrorModal } = useMessage();
 enum Api {
  Login = '/sys/login',
-  phoneLogin = '/sys/phoneLogin',
+  phoneLogin = '/oauth2/token',
  Logout = '/sys/logout',
  GetUserInfo = '/sys/user/getUserInfo',
  // 获取系统权限
@@ -35,7 +35,7 @@ enum Api {
  //修改密码
  passwordChange = '/sys/user/passwordChange',
  //第三方登录
-  thirdLogin = '/sys/thirdLogin/getLoginUser',
+  thirdLogin = '/oauth2/token',
  //第三方登录
  getThirdCaptcha = '/sys/thirdSms',
  //获取二维码信息
@@ -52,6 +52,10 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal')
    {
      url: Api.Login,
      params,
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        'Authorization': 'Basic amVlY2ctY2xpZW50OnNlY3JldA=='
+      },
    },
    {
      errorMessageMode: mode,
@@ -67,8 +71,13 @@ export function phoneLoginApi(params: LoginParams, mode: ErrorMessageMode = 'mod
    {
      url: Api.phoneLogin,
      params,
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        'Authorization': 'Basic amVlY2ctY2xpZW50OnNlY3JldA=='
+      },
    },
    {
+      isTransformResponse: false,
      errorMessageMode: mode,
    }
  );
@@ -162,12 +171,19 @@ export function thirdLogin(params, mode: ErrorMessageMode = 'modal') {
    tenantId = params.tenantId;
  }
  //==========end 第三方登录/auth2登录需要传递租户id===========
-  return defHttp.get<LoginResultModel>(
+  return defHttp.post<LoginResultModel>(
    {
-      url: `${Api.thirdLogin}/${params.token}/${params.thirdType}/${tenantId}`,
+      url: `${Api.thirdLogin}`,
+      params,
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        'Authorization': 'Basic amVlY2ctY2xpZW50OnNlY3JldA=='
+      },
    },
    {
+      isTransformResponse: false,
      errorMessageMode: mode,
+      
    }
  );
 }
--- a/src/components/Application/src/search/AppSearchModal.vue
+++ b/src/components/Application/src/search/AppSearchModal.vue
@@ -178,7 +178,7 @@
    &-input {
      width: 100%;
      height: 48px;
-      font-size: 1.5em;
+      font-size: 1.3em;
      color: #1c1e21;
      border-radius: 6px;

@@ -222,7 +222,7 @@
        font-size: 14px;
        color: @text-color-base;
        cursor: pointer;
-        background-color: @component-background;
+        // background-color: @component-background;
        border-radius: 4px;
        box-shadow: 0 1px 3px 0 #d4d9e1;
        align-items: center;
--- a/src/components/Basic/src/BasicTitle.vue
+++ b/src/components/Basic/src/BasicTitle.vue
@@ -53,6 +53,10 @@
    cursor: move;
    user-select: none;

+    &.is-drawer {
+      cursor: default;
+    }
+
    &-normal {
      font-size: 14px;
      font-weight: 500;
--- a/src/components/Drawer/src/BasicDrawer.vue
+++ b/src/components/Drawer/src/BasicDrawer.vue
@@ -40,7 +40,7 @@
    components: { Drawer, ScrollContainer, DrawerFooter, DrawerHeader },
    inheritAttrs: false,
    props: basicProps,
-    emits: ['visible-change', 'ok', 'close', 'register'],
+    emits: ['visible-change', 'open-change', 'ok', 'close', 'register'],
    setup(props, { emit }) {
      const visibleRef = ref(false);
      const attrs = useAttrs();
@@ -63,12 +63,14 @@
      });

      const getProps = computed((): DrawerProps => {
+        // update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
        const opt = {
          placement: 'right',
          ...unref(attrs),
          ...unref(getMergeProps),
-          visible: unref(visibleRef),
+          open: unref(visibleRef),
        };
+        // update-end--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
        opt.title = undefined;
        let { isDetail, width, wrapClassName, getContainer } = opt;
        if (isDetail) {
@@ -123,11 +125,20 @@
        { deep: true }
      );

+      watch(
+        () => props.open,
+        (newVal, oldVal) => {
+          if (newVal !== oldVal) visibleRef.value = newVal;
+        },
+        { deep: true }
+      );
+
      watch(
        () => visibleRef.value,
        (visible) => {
          nextTick(() => {
            emit('visible-change', visible);
+            emit('open-change', visible);
            instance && drawerInstance.emitVisible?.(visible, instance.uid);
          });
        }
@@ -152,6 +163,9 @@
        if (Reflect.has(props, 'visible')) {
          visibleRef.value = !!props.visible;
        }
+        if (Reflect.has(props, 'open')) {
+          visibleRef.value = !!props.open;
+        }
      }

      function handleOk() {
--- a/src/components/Drawer/src/components/DrawerHeader.vue
+++ b/src/components/Drawer/src/components/DrawerHeader.vue
@@ -1,5 +1,5 @@
 <template>
-  <BasicTitle v-if="!isDetail" :class="prefixCls">
+  <BasicTitle v-if="!isDetail" :class="[prefixCls, 'is-drawer']">
    <slot name="title"></slot>
    {{ !$slots.title ? title : '' }}
  </BasicTitle>
--- a/src/components/Drawer/src/props.ts
+++ b/src/components/Drawer/src/props.ts
@@ -31,6 +31,7 @@ export const basicProps = {
  loadingText: { type: String },
  showDetailBack: { type: Boolean, default: true },
  visible: { type: Boolean },
+  open: { type: Boolean },
  loading: { type: Boolean },
  maskClosable: { type: Boolean, default: true },
  getContainer: {
--- a/src/components/Drawer/src/typing.ts
+++ b/src/components/Drawer/src/typing.ts
@@ -11,6 +11,7 @@ export interface ReturnMethods extends DrawerInstance {
  openDrawer: <T = any>(visible?: boolean, data?: T, openOnSet?: boolean) => void;
  closeDrawer: () => void;
  getVisible?: ComputedRef<boolean>;
+  getOpen?: ComputedRef<boolean>;
 }

 export type RegisterFn = (drawerInstance: DrawerInstance, uuid?: string) => void;
@@ -20,6 +21,7 @@ export interface ReturnInnerMethods extends DrawerInstance {
  changeLoading: (loading: boolean) => void;
  changeOkLoading: (loading: boolean) => void;
  getVisible?: ComputedRef<boolean>;
+  getOpen?: ComputedRef<boolean>;
 }

 export type UseDrawerReturnType = [RegisterFn, ReturnMethods];
@@ -74,6 +76,7 @@ export interface DrawerProps extends DrawerFooterProps {
  loading?: boolean;
  showDetailBack?: boolean;
  visible?: boolean;
+  open?: boolean;
  /**
   * Built-in ScrollContainer component configuration
   * @type ScrollContainerOptions
--- a/src/components/Drawer/src/useDrawer.ts
+++ b/src/components/Drawer/src/useDrawer.ts
@@ -58,10 +58,16 @@ export function useDrawer(): UseDrawerReturnType {
      return visibleData[~~unref(uid)];
    }),

+    getOpen: computed((): boolean => {
+      return visibleData[~~unref(uid)];
+    }),
+
    openDrawer: <T = any>(visible = true, data?: T, openOnSet = true): void => {
+      // update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
      getInstance()?.setDrawerProps({
-        visible: visible,
+        open: visible,
      });
+      // update-end--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
      if (!data) return;

      if (openOnSet) {
@@ -75,7 +81,9 @@ export function useDrawer(): UseDrawerReturnType {
      }
    },
    closeDrawer: () => {
-      getInstance()?.setDrawerProps({ visible: false });
+      // update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
+      getInstance()?.setDrawerProps({ open: false });
+      // update-end--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
    },
  };

@@ -133,9 +141,11 @@ export const useDrawerInner = (callbackFn?: Fn): UseDrawerInnerReturnType => {
      getVisible: computed((): boolean => {
        return visibleData[~~unref(uidRef)];
      }),
-
+      getOpen: computed((): boolean => {
+        return visibleData[~~unref(uidRef)];
+      }),
      closeDrawer: () => {
-        getInstance()?.setDrawerProps({ visible: false });
+        getInstance()?.setDrawerProps({ open: false });
      },

      setDrawerProps: (props: Partial<DrawerProps>) => {
--- a/src/components/Form/src/components/FormAction.vue
+++ b/src/components/Form/src/components/FormAction.vue
@@ -75,16 +75,18 @@
        const { showAdvancedButton, actionSpan: span, actionColOptions } = props;
        const actionSpan = 24 - span;
        const advancedSpanObj = showAdvancedButton ? { span: actionSpan < 6 ? 24 : actionSpan } : {};
+        // update-begin--author:liaozhiyang---date:20240105---for：【QQYUN-6566】BasicForm支持一行显示(inline)
+        const defaultSpan = props.layout == 'inline' ? {} : { span: showAdvancedButton ? 6 : 4 };
+        // update-end--author:liaozhiyang---date:20240105---for：【QQYUN-6566】BasicForm支持一行显示(inline)
        const actionColOpt: Partial<ColEx> = {
          style: { textAlign: 'right' },
+          ...defaultSpan,
          ...advancedSpanObj,
          ...actionColOptions,
        };
-        // update-begin--author:liaozhiyang---date:20231017---for：【QQYUN-6566】BasicForm支持一行显示(inline)
-        if (props.layout !== 'inline') {
-          actionColOpt['span'] = showAdvancedButton ? 6 : 4;
-        }
-        // update-end--author:liaozhiyang---date:20231017---for：【QQYUN-6566】BasicForm支持一行显示(inline)
+        
+        
+        
        return actionColOpt;
      });

--- a/src/components/Form/src/components/FormItem.vue
+++ b/src/components/Form/src/components/FormItem.vue
@@ -202,6 +202,22 @@
        if (characterInx !== -1 && !rules[characterInx].validator) {
          rules[characterInx].message = rules[characterInx].message || t('component.form.maxTip', [rules[characterInx].max] as Recordable);
        }
+        // update-begin--author:liaozhiyang---date:20241226---for：【QQYUN-7495】pattern由字符串改成正则传递给antd（因使用InputNumber时发现正则无效）
+        rules.forEach((item) => {
+          if (typeof item.pattern === 'string') {
+            try {
+              const reg = new Function('item', `return ${item.pattern}`)(item);
+              if (Object.prototype.toString.call(reg) === '[object RegExp]') {
+                item.pattern = reg;
+              } else {
+                item.pattern = new RegExp(item.pattern);
+              }
+            } catch (error) {
+              item.pattern = new RegExp(item.pattern);
+            }
+          }
+        });
+        // update-end--author:liaozhiyang---date:20231226---for：【QQYUN-7495】pattern由字符串改成正则传递给antd（因使用InputNumber时发现正则无效）
        return rules;
      }

@@ -249,7 +265,10 @@
        const { autoSetPlaceHolder, size } = props.formProps;
        const propsData: Recordable = {
          allowClear: true,
-          getPopupContainer: (trigger: Element) => trigger.parentNode,
+          getPopupContainer: (trigger: Element) => {
+
+            return trigger?.parentNode;
+          },
          size,
          ...unref(getComponentsProps),
          disabled: unref(getDisable),
@@ -372,10 +391,10 @@
        // update-begin--author:liaozhiyang---date:20230803---for：【issues-641】调整表格搜索表单的span配置无效 
        const { getIsMobile } = useAppInject();
        let realColProps;
-        if (colProps['span'] && !unref(getIsMobile)) {
-          ['xs', 'sm', 'md', 'lg', 'xl', 'xxl'].forEach((name) => delete baseColProps[name]);
-        }
        realColProps = { ...baseColProps, ...colProps };
+        if (colProps['span'] && !unref(getIsMobile)) {
+          ['xs', 'sm', 'md', 'lg', 'xl', 'xxl'].forEach((name) => delete realColProps[name]);
+        }
        // update-end--author:liaozhiyang---date:20230803---for：【issues-641】调整表格搜索表单的span配置无效 
        const { isIfShow, isShow } = getShow();
        const values = unref(getValues);
--- a/src/components/Form/src/helper.ts
+++ b/src/components/Form/src/helper.ts
@@ -61,6 +61,18 @@ export function handleInputNumberValue(component?: ComponentType, val?: any) {
  }
  return val;
 }
+/** 
+*liaozhiyang
+*2023-12-26
+*某些组件的传值需要把字符串类型转成数值类型
+*/ 
+export function handleInputStringValue(component?: ComponentType, val?: any) {
+  if (!component) return val;
+  if (['InputNumber'].includes(component) && typeof val === 'string') {
+    return Number(val);
+  }
+  return val;
+}

 /**
 * 时间字段
--- a/src/components/Form/src/hooks/useFormEvents.ts
+++ b/src/components/Form/src/hooks/useFormEvents.ts
@@ -4,7 +4,7 @@ import type { NamePath, ValidateOptions } from 'ant-design-vue/lib/form/interfac
 import { unref, toRaw } from 'vue';
 import { isArray, isFunction, isObject, isString } from '/@/utils/is';
 import { deepMerge, getValueType } from '/@/utils';
-import { dateItemType, handleInputNumberValue } from '../helper';
+import { dateItemType, handleInputNumberValue, handleInputStringValue } from '../helper';
 import { dateUtil } from '/@/utils/dateUtil';
 import { cloneDeep, uniqBy } from 'lodash-es';
 import { error } from '/@/utils/log';
@@ -65,6 +65,9 @@ export function useFormEvents({
      const hasKey = Reflect.has(values, key);

      value = handleInputNumberValue(schema?.component, value);
+      // update-begin--author:liaozhiyang---date:20231226---for：【QQYUN-7535】popup回填字段inputNumber组件验证错误
+      value = handleInputStringValue(schema?.component, value);
+      // update-end--author:liaozhiyang---date:20231226---for：【QQYUN-7535】popup回填字段inputNumber组件验证错误
      // 0| '' is allow
      if (hasKey && fields.includes(key)) {
        // time type
--- a/src/components/Form/src/jeecg/components/JAreaSelect.vue
+++ b/src/components/Form/src/jeecg/components/JAreaSelect.vue
@@ -44,7 +44,7 @@
      allowClear: propTypes.bool.def(false),
      getPopupContainer: {
        type: Function,
-        default: (node) => node.parentNode,
+        default: (node) => node?.parentNode,
      },
    },
    emits: ['change', 'update:value','update:area','update:city','update:province'],
--- a/src/components/Form/src/jeecg/components/JCodeEditor.vue
+++ b/src/components/Form/src/jeecg/components/JCodeEditor.vue
@@ -60,7 +60,7 @@
      // 是否显示全屏按钮
      fullScreen: propTypes.bool.def(false),
      // 全屏以后的z-index
-      zIndex: propTypes.any.def(999),
+      zIndex: propTypes.any.def(1500),
      theme: propTypes.string.def('idea'),
      language: propTypes.string.def(''),
      // 代码提示
--- a/src/components/Form/src/jeecg/components/JDictSelectTag.vue
+++ b/src/components/Form/src/jeecg/components/JDictSelectTag.vue
@@ -71,7 +71,7 @@
      stringToNumber: propTypes.bool,
      getPopupContainer: {
        type: Function,
-        default: (node) => node.parentNode,
+        default: (node) => node?.parentNode,
      },
      // 是否显示【请选择】选项
      showChooseOption: propTypes.bool.def(true),
--- a/src/components/Form/src/jeecg/components/JImageUpload.vue
+++ b/src/components/Form/src/jeecg/components/JImageUpload.vue
@@ -25,7 +25,7 @@
        </a-button>
      </div>
    </a-upload>
-    <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel()">
+    <a-modal :open="previewVisible" :footer="null" @cancel="handleCancel()">
      <img alt="example" style="width: 100%" :src="previewImage" />
    </a-modal>
  </div>
--- a/src/components/Form/src/jeecg/components/JImportModal.vue
+++ b/src/components/Form/src/jeecg/components/JImportModal.vue
@@ -2,14 +2,14 @@
  <div>
    <BasicModal v-bind="$attrs" @register="register" title="导入EXCEL" :width="600" @cancel="handleClose" :confirmLoading="uploading" destroyOnClose>
      <!--是否校验-->
-      <div style="margin: 0 5px 1px" v-if="online">
+      <div style="margin: 0 5px 5px" v-if="online">
        <span style="display: inline-block; height: 32px; line-height: 32px; vertical-align: middle">是否开启校验:</span>
        <span style="margin-left: 6px">
-          <a-switch :checked="validateStatus == 1" @change="handleChangeValidateStatus" checked-children="是" un-checked-children="否" size="small" />
+          <a-switch :checked="validateStatus == 1" @change="handleChangeValidateStatus" checked-children="是" un-checked-children="否" />
        </span>
      </div>
      <!--上传-->
-      <a-upload name="file" accept=".xls,.xlsx" :multiple="true" :fileList="fileList" :remove="handleRemove" :beforeUpload="beforeUpload">
+      <a-upload name="file" accept=".xls,.xlsx" :multiple="true" :fileList="fileList" @remove="handleRemove" :beforeUpload="beforeUpload">
        <a-button preIcon="ant-design:upload-outlined">选择导入文件</a-button>
      </a-upload>
      <!--页脚-->
@@ -81,7 +81,10 @@

      //关闭方法
      function handleClose() {
-        closeModal() && reset();
+        // update-begin--author:liaozhiyang---date:20231226---for：【QQYUN-7477】关闭弹窗清空内容（之前上传失败关闭后不会清除）
+        closeModal();
+        reset();
+        // update-end--author:liaozhiyang---date:20231226---for：【QQYUN-7477】关闭弹窗清空内容（之前上传失败关闭后不会清除）
      }

      //校验状态切换
@@ -139,6 +142,8 @@
          } else {
            createMessage.warning(res.message);
          }
+        }).catch(() => {
+          uploading.value = false;
        });
      }

--- a/src/components/Form/src/jeecg/components/JInputPop.vue
+++ b/src/components/Form/src/jeecg/components/JInputPop.vue
@@ -1,7 +1,7 @@
 <template>
  <a-popover
    trigger="contextmenu"
-    v-model:visible="visible"
+    v-model:open="visible"
    :overlayClassName="`${prefixCls}-popover`"
    :getPopupContainer="getPopupContainer"
    :placement="position"
@@ -80,7 +80,7 @@
  // 获取弹出框挂载的元素
  function getPopupContainer(node) {
    if (!props.popContainer) {
-      return node.parentNode;
+      return node?.parentNode;
    } else if (typeof props.popContainer === 'function') {
      return props.popContainer(node);
    } else {
--- a/src/components/Form/src/jeecg/components/JPopup.vue
+++ b/src/components/Form/src/jeecg/components/JPopup.vue
@@ -115,7 +115,10 @@
        //匹配popup设置的回调值
        let values = {};
        for (let item of fieldConfig) {
-          let val = rows.map((row) => row[item.source]).join(',');
+          let val = rows.map((row) => row[item.source]);
+          // update-begin--author:liaozhiyang---date:20230831---for：【QQYUN-7535】数组只有一个且是number类型，join会改变值的类型为string
+          val = val.length == 1 ? val[0] : val.join(',');
+          // update-begin--author:liaozhiyang---date:20230831---for：【QQYUN-7535】数组只有一个且是number类型，join会改变值的类型为string
          item.target.split(',').forEach((target) => {
            values[target] = val;
          });
--- a/src/components/Form/src/jeecg/components/JSearchSelect.vue
+++ b/src/components/Form/src/jeecg/components/JSearchSelect.vue
@@ -9,7 +9,7 @@
    allowClear
    :getPopupContainer="getParentContainer"
    :placeholder="placeholder"
-    :filterOption="false"
+    :filterOption="isDictTable ? false : filterOption"
    :notFoundContent="loading ? undefined : null"
    @search="loadData"
    @change="handleAsyncChange"
@@ -63,7 +63,7 @@
      pageSize: propTypes.number.def(10),
      getPopupContainer: {
        type: Function,
-        default: (node) => node.parentNode,
+        default: (node) => node?.parentNode,
      },
      //默认开启Y轴溢出位置调整，因此在可视空间不足时下拉框位置会自动上移，导致Select的输入框被遮挡。需要注意的是，默认情况是是可视空间，而不是所拥有的空间
      //update-begin-author:liusq date:2023-04-04 for:[issue/286]下拉搜索框遮挡问题
@@ -91,12 +91,29 @@
      const lastLoad = ref(0);
      // 是否根据value加载text
      const loadSelectText = ref(true);
+
+      // 是否是字典表
+      const isDictTable = computed(() => {
+        if (props.dict) {
+          return props.dict.split(',').length >= 2
+        }
+        return false;
+      })
+
      /**
       * 监听字典code
       */
-      watchEffect(() => {
-        props.dict && initDictData();
-      });
+      watch(() => props.dict, () => {
+        if (!props.dict) {
+          return
+        }
+        if (isDictTable.value) {
+          initDictTableData();
+        } else {
+          initDictCodeData();
+        }
+      }, {immediate: true});
+
      /**
       * 监听value
       */
@@ -128,6 +145,9 @@
       * 异步查询数据
       */
      async function loadData(value) {
+        if (!isDictTable.value) {
+          return;
+        }
        lastLoad.value += 1;
        const currentLoad = unref(lastLoad);
        options.value = [];
@@ -190,7 +210,7 @@
      /**
       * 初始化字典下拉数据
       */
-      async function initDictData() {
+      async function initDictTableData() {
        let { dict, async, dictOptions, pageSize } = props;
        if (!async) {
          //如果字典项集合有数据
@@ -233,6 +253,14 @@
          }
        }
      }
+
+      /**
+       * 查询数据字典
+       */
+      async function initDictCodeData() {
+        options.value = await initDictOptions(props.dict);
+      }
+
      /**
       * 同步改变事件
       * */
@@ -288,7 +316,7 @@
          if (typeof props.getPopupContainer === 'function') {
            return props.getPopupContainer(node);
          } else {
-            return node.parentNode;
+            return node?.parentNode;
          }
        }
        // update-end-author:taoyan date:20220407 for: getPopupContainer一直有值 导致popContainer的逻辑永远走不进去，把它挪到前面判断
@@ -316,6 +344,7 @@
        attrs,
        options,
        loading,
+        isDictTable,
        selectedValue,
        selectedAsyncValue,
        loadData: useDebounceFn(loadData, 800),
--- a/src/components/Form/src/jeecg/components/JSelectMultiple.vue
+++ b/src/components/Form/src/jeecg/components/JSelectMultiple.vue
@@ -118,7 +118,7 @@

      function getParentContainer(node) {
        if (!props.popContainer) {
-          return node.parentNode;
+          return node?.parentNode;
        } else {
          return document.querySelector(props.popContainer);
        }
--- a/src/components/Form/src/jeecg/components/JSwitch.vue
+++ b/src/components/Form/src/jeecg/components/JSwitch.vue
@@ -41,12 +41,14 @@
    () => props.value,
    (val) => {
      if (!props.query) {
-        if (!val) {
+        // update-begin--author:liaozhiyang---date:20231226---for：【QQYUN-7473】options使用[0,1]，导致开关无法切换
+        if (!val && !props.options.includes(val)) {
          checked.value = false;
          emitValue(props.options[1]);
        } else {
          checked.value = props.options[0] == val;
        }
+        // update-end--author:liaozhiyang---date:20231226---for：【QQYUN-7473】options使用[0,1]，导致开关无法切换
      }
    },
    { immediate: true }
--- a/src/components/Form/src/jeecg/components/JTreeSelect.vue
+++ b/src/components/Form/src/jeecg/components/JTreeSelect.vue
@@ -3,7 +3,7 @@
    allowClear
    labelInValue
    style="width: 100%"
-    :getPopupContainer="(node) => node.parentNode"
+    :getPopupContainer="(node) => node?.parentNode"
    :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
    :placeholder="placeholder"
    :loadData="asyncLoadTreeData"
--- a/src/components/Form/src/jeecg/components/modal/DeptSelectModal.vue
+++ b/src/components/Form/src/jeecg/components/modal/DeptSelectModal.vue
@@ -1,7 +1,7 @@
 <!--部门选择框-->
 <template>
  <div>
-    <BasicModal v-bind="$attrs" @register="register" :title="modalTitle" width="500px" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
+    <BasicModal v-bind="$attrs" @register="register" :title="modalTitle" width="500px" :maxHeight="maxHeight" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
      <BasicTree
        ref="treeRef"
        :treeData="treeData"
@@ -55,6 +55,12 @@
        type: String,
        default: '部门选择',
      },
+      // update-begin--author:liaozhiyang---date:20231220---for：【QQYUN-7678】部门组件内容过多没有滚动条（给一个默认最大高）
+      maxHeight: {
+        type: Number,
+        default: 500,
+      },
+      // update-end--author:liaozhiyang---date:20231220---for：【QQYUN-7678】部门组件内容过多没有滚动条（给一个默认最大高）
      value: propTypes.oneOfType([propTypes.string, propTypes.array])
    },
    emits: ['register', 'getSelectResult'],
--- a/src/components/Form/src/jeecg/components/modal/PositionSelectModal.vue
+++ b/src/components/Form/src/jeecg/components/modal/PositionSelectModal.vue
@@ -5,7 +5,7 @@
      v-bind="$attrs"
      @register="register"
      :title="modalTitle"
-      width="900px"
+      width="1100px"
      wrapClassName="j-user-select-modal"
      @ok="handleOk"
      destroyOnClose
@@ -90,7 +90,7 @@
      //查询form
      const formConfig = {
        labelCol: {
-          span: 8,
+          span: 4,
        },
        baseColProps: {
          xs: 24,
--- a/src/components/Form/src/jeecg/components/userSelect/UserList.vue
+++ b/src/components/Form/src/jeecg/components/userSelect/UserList.vue
@@ -3,8 +3,9 @@
    <template #renderItem="{ item }">
      <a-list-item style="padding: 3px 0">
        <div class="user-select-user-info" @click="(e) => onClickUser(e, item)">
-          <div>
-            <a-checkbox v-model:checked="checkStatus[item.id]" />
+          <div style="margin-left: 10px">
+            <a-checkbox v-model:checked="checkStatus[item.id]" v-if="multi" />
+            <a-radio v-model:checked="checkStatus[item.id]" v-else />
          </div>
          <div>
            <a-avatar v-if="item.avatar" :src="getFileAccessHttpUrl(item.avatar)"></a-avatar>
@@ -38,6 +39,10 @@
  export default {
    name: 'UserList',
    props: {
+      multi: {
+        type: Boolean,
+        default: false,
+      },
      dataList: {
        type: Array,
        default: () => [],
--- a/src/components/Form/src/jeecg/components/userSelect/UserListAndDepart.vue
+++ b/src/components/Form/src/jeecg/components/userSelect/UserListAndDepart.vue
@@ -20,7 +20,7 @@
    </a-col>
    <a-col :span="12" style="padding-left: 10px">
      <div :style="containerStyle">
-        <user-list :excludeUserIdList="excludeUserIdList" :dataList="userDataList" :selectedIdList="selectedIdList" @selected="onSelectUser" @unSelect="unSelectUser" />
+        <user-list :multi="multi" :excludeUserIdList="excludeUserIdList" :dataList="userDataList" :selectedIdList="selectedIdList" @selected="onSelectUser" @unSelect="unSelectUser" />
      </div>
    </a-col>
  </a-row>
@@ -50,6 +50,10 @@
      excludeUserIdList:{
        type: Array,
        default: () => [],
+      },
+      multi: {
+        type: Boolean,
+        default: false,
      }
    },
    emits: ['loaded', 'selected', 'unSelect'],
--- a/src/components/Form/src/jeecg/components/userSelect/UserListAndRole.vue
+++ b/src/components/Form/src/jeecg/components/userSelect/UserListAndRole.vue
@@ -11,7 +11,7 @@
    </a-col>
    <a-col :span="12" style="padding-left: 10px">
      <div :style="containerStyle">
-        <user-list :excludeUserIdList="excludeUserIdList" :dataList="userDataList" :selectedIdList="selectedIdList" @selected="onSelectUser" @unSelect="unSelectUser" />
+        <user-list :multi="multi" :excludeUserIdList="excludeUserIdList" :dataList="userDataList" :selectedIdList="selectedIdList" @selected="onSelectUser" @unSelect="unSelectUser" />
      </div>
    </a-col>
  </a-row>
@@ -41,6 +41,10 @@
      excludeUserIdList:{
        type: Array,
        default: () => [],
+      },
+      multi: {
+        type: Boolean,
+        default: false,
      }
    },
    emits: ['selected', 'unSelect'],
--- a/src/components/Form/src/jeecg/components/userSelect/UserSelectModal.vue
+++ b/src/components/Form/src/jeecg/components/userSelect/UserSelectModal.vue
@@ -35,7 +35,7 @@
        <a-tabs v-model:activeKey="myActiveKey" :centered="true" @change="onChangeTab">
          <!-- 所有用户 -->
          <a-tab-pane key="1" tab="全部" forceRender>
-            <user-list :excludeUserIdList="excludeUserIdList" :dataList="userDataList" :selectedIdList="selectedIdList" depart @selected="onSelectUser" @unSelect="unSelectUser" />
+            <user-list :multi="multi" :excludeUserIdList="excludeUserIdList" :dataList="userDataList" :selectedIdList="selectedIdList" depart @selected="onSelectUser" @unSelect="unSelectUser" />
          </a-tab-pane>

          <!-- 部门用户 -->
--- a/src/components/Form/src/jeecg/hooks/useSelectBiz.ts
+++ b/src/components/Form/src/jeecg/hooks/useSelectBiz.ts
@@ -31,7 +31,7 @@ export function useSelectBiz(getList, props) {
      if (selectValues['change'] == false && !isEmpty(selectValues['value'])) {
        //update-end-author:liusq---date:2023-10-19--for: [issues/788]判断有设置数值才去加载
        //update-begin---author:wangshuai ---date:20220412  for：[VUEN-672]发文草稿箱编辑时拟稿人显示用户名------------
-        let params = {};
+        let params = { isMultiTranslate: 'true' };
        params[props.rowKey] = selectValues['value'].join(',');
        //update-end---author:wangshuai ---date:20220412  for：[VUEN-672]发文草稿箱编辑时拟稿人显示用户名--------------
        loadingEcho.value = isFirstLoadEcho;
--- a/src/components/Form/src/types/form.ts
+++ b/src/components/Form/src/types/form.ts
@@ -59,9 +59,9 @@ export interface FormProps {
  // Submit form on reset
  submitOnReset?: boolean;
  // Col configuration for the entire form
-  labelCol?: Partial<ColEx>;
+  labelCol?: Partial<ColEx> | null;
  // Col configuration for the entire form
-  wrapperCol?: Partial<ColEx>;
+  wrapperCol?: Partial<ColEx> | null;

  // General row style
  baseRowStyle?: CSSProperties;
--- a/src/components/JVxeCustom/src/components/JVxeFileCell.vue
+++ b/src/components/JVxeCustom/src/components/JVxeFileCell.vue
@@ -17,7 +17,7 @@
          <span style="margin-left: 5px">{{ ellipsisFileName }}</span>
        </a-tooltip>

-        <Dropdown :trigger="['click']" placement="bottomRight" style="margin-left: 10px">
+        <Dropdown :trigger="['click']" placement="bottomRight" style="margin-left: 10px" :disabled="cellProps.disabled">
          <a-tooltip title="操作">
            <Icon v-if="file.status !== 'uploading'" icon="ant-design:setting" style="cursor: pointer" />
          </a-tooltip>
--- a/src/components/JVxeCustom/src/components/JVxeImageCell.vue
+++ b/src/components/JVxeCustom/src/components/JVxeImageCell.vue
@@ -9,10 +9,10 @@
        </template>
        <template v-else-if="file['path']">
          <template v-for="src of imgList">
-            <img class="j-vxe-image" :src="src" alt="图片错误" @click="handleMoreOperation" />
+            <img class="j-vxe-image" :src="src" alt="图片错误" @[clickEvent]="handleMoreOperation" />
          </template>
        </template>
-        <a-tooltip v-else :title="file.message || '上传失败'" @click="handleClickShowImageError">
+        <a-tooltip v-else :title="file.message || '上传失败'" @[clickEvent]="handleClickShowImageError">
          <Icon icon="ant-design:exclamation-circle" style="color: red" />
        </a-tooltip>
      </div>
@@ -38,7 +38,7 @@
  </div>
 </template>
 <script lang="ts">
-  import { computed, defineComponent } from 'vue';
+  import { computed, defineComponent ,unref } from 'vue';
  import { useMessage } from '/@/hooks/web/useMessage';
  import { JVxeComponent } from '/@/components/jeecg/JVxeTable/types';
  import { useJVxeCompProps } from '/@/components/jeecg/JVxeTable/hooks';
@@ -51,8 +51,14 @@
    components: components,
    props: useJVxeCompProps(),
    setup(props: JVxeComponent.Props) {
+      
      const { createErrorModal } = useMessage();
      const setup = useFileCell(props, UploadTypeEnum.image, { multiple: true });
+      // update-begin--author:liaozhiyang---date:20240105---for：【issues/953】online子表vxe-table展现形式详情图片上传可点击
+      const clickEvent = computed(() => {
+        return unref(setup.cellProps).disabled ? null : 'click';
+      });
+      // update-end--author:liaozhiyang---date:20240105---for：【issues/953】online子表vxe-table展现形式详情图片上传可点击
      const { innerFile, maxCount } = setup;

      const imgList = computed(() => {
@@ -84,6 +90,7 @@
        imgList,
        maxCount,
        handleClickShowImageError,
+        clickEvent
      };
    },
    // 【组件增强】注释详见：JVxeComponent.Enhanced
--- a/src/components/Markdown/src/Markdown.vue
+++ b/src/components/Markdown/src/Markdown.vue
@@ -113,6 +113,7 @@
          theme: getDarkMode.value === 'dark' ? 'dark' : 'classic',
          lang: unref(getCurrentLang),
          mode: 'sv',
+          cdn: 'https://cdn.jsdelivr.net/npm/vditor@3.9.6',
          fullscreen: {
            index: 520,
          },
--- a/src/components/Modal/src/BasicModal.vue
+++ b/src/components/Modal/src/BasicModal.vue
@@ -27,6 +27,7 @@
          :loading="getProps.loading"
          :loading-tip="getProps.loadingTip"
          :minHeight="getProps.minHeight"
+          :maxHeight="getProps.maxHeight"
          :height="getWrapperHeight"
          :visible="visibleRef"
          :modalFooterHeight="footer !== undefined && !footer ? 0 : undefined"
@@ -69,7 +70,7 @@
    components: { Modal, ModalWrapper, ModalClose, ModalFooter, ModalHeader },
    inheritAttrs: false,
    props: basicProps,
-    emits: ['visible-change', 'height-change', 'cancel', 'ok', 'register', 'update:visible', 'fullScreen'],
+    emits: ['visible-change', 'open-change', 'height-change', 'cancel', 'ok', 'register', 'update:visible', 'update:open', 'fullScreen'],
    setup(props, { emit, attrs , slots}) {
      const visibleRef = ref(false);
      const propsRef = ref<Partial<ModalProps> | null>(null);
@@ -131,16 +132,18 @@
      });

      const getBindValue = computed((): Recordable => {
+        // update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
        const attr = {
          ...attrs,
          ...unref(getMergeProps),
-          visible: unref(visibleRef),
+          open: unref(visibleRef),
          wrapClassName: unref(getWrapClassName),
        };
        if (unref(fullScreenRef)) {
-          return omit(attr, ['height', 'title']);
+          return omit(attr, ['height', 'title', 'visible']);
        }
-        return omit(attr, 'title');
+        return omit(attr, ['title', 'visible']);
+        // update-end--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
      });

      const getWrapperHeight = computed(() => {
@@ -156,11 +159,16 @@
        visibleRef.value = !!props.visible;
      });

+      watchEffect(() => {
+        visibleRef.value = !!props.open;
+      });
+
      watch(
        () => unref(visibleRef),
        (v) => {
          emit('visible-change', v);
          emit('update:visible', v);
+          emit('update:open', v);
          instance && modalMethods.emitVisible?.(v, instance.uid);
          nextTick(() => {
            if (props.scrollTop && v && unref(modalWrapperRef)) {
@@ -197,6 +205,9 @@
        if (Reflect.has(props, 'visible')) {
          visibleRef.value = !!props.visible;
        }
+        if (Reflect.has(props, 'open')) {
+          visibleRef.value = !!props.open;
+        }
        if (Reflect.has(props, 'defaultFullscreen')) {
          fullScreenRef.value = !!props.defaultFullscreen;
        }
@@ -272,7 +283,9 @@
  }
  .jeecg-modal-content{
    >.scroll-container{
-      padding: 14px;
+      //update-begin---author:wangshuai---date:2023-12-05---for:【QQYUN-7297】表单讨论弹窗放大按钮时只显示一部分---
+      padding: 6px;
+      //update-end---author:wangshuai---date:2023-12-05---for:【QQYUN-7297】表单讨论弹窗放大按钮时只显示一部分---
    }
  }
  /*update-end-author:taoyan date:2022-7-27 for:modal评论区域样式*/
--- a/src/components/Modal/src/components/Modal.tsx
+++ b/src/components/Modal/src/components/Modal.tsx
@@ -4,17 +4,18 @@ import { basicProps } from '../props';
 import { useModalDragMove } from '../hooks/useModalDrag';
 import { useAttrs } from '/@/hooks/core/useAttrs';
 import { extendSlots } from '/@/utils/helper/tsxHelper';
+import { omit } from 'lodash-es';

 export default defineComponent({
  name: 'Modal',
  inheritAttrs: false,
-  props: basicProps,
+  props: omit(basicProps, ['visible']),
  emits: ['cancel'],
  setup(props, { slots, emit }) {
-    const { visible, draggable, destroyOnClose } = toRefs(props);
+    const { open, draggable, destroyOnClose } = toRefs(props);
    const attrs = useAttrs();
    useModalDragMove({
-      visible,
+      visible: open,
      destroyOnClose,
      draggable,
    });
--- a/src/components/Modal/src/components/ModalWrapper.vue
+++ b/src/components/Modal/src/components/ModalWrapper.vue
@@ -18,7 +18,8 @@
    useWrapper: { type: Boolean, default: true },
    modalHeaderHeight: { type: Number, default: 57 },
    modalFooterHeight: { type: Number, default: 74 },
-    minHeight: { type: Number, default: 200 },
+    minHeight: { type: Number, default: null },
+    maxHeight: { type: Number, default: null },
    height: { type: Number },
    footerOffset: { type: Number, default: 0 },
    visible: { type: Boolean },
@@ -60,10 +61,34 @@
      });

      const spinStyle = computed((): CSSProperties => {
-        return {
-          minHeight: `${props.minHeight}px`,
-          [props.fullScreen ? 'height' : 'maxHeight']: `${unref(realHeightRef)}px`,
-        };
+        // update-begin--author:liaozhiyang---date:20231205---for：【QQYUN-7147】Model的高度设置不生效
+        if (props.fullScreen) {
+          return {
+            height: `${unref(realHeightRef)}px`,
+          };
+        } else {
+          const defaultMiniHeight = 200;
+          if (props.height != undefined) {
+            let height: number = props.height;
+            if (props.minHeight === null) {
+              return {
+                height: `${height}px`,
+              };
+            } else {
+              return {
+                height: `${props.minHeight > height ? props.minHeight : height}px`,
+              };
+            }
+          } else {
+            return {
+              minHeight: `${props.minHeight === null ? defaultMiniHeight : props.minHeight}px`,
+              // update-begin--author:liaozhiyang---date:20231219---for：【QQYUN-7641】basicModal组件添加MaxHeight属性
+              maxHeight: `${props.maxHeight ? props.maxHeight : unref(realHeightRef)}px`,
+              // update-end--author:liaozhiyang---date:20231219---for：【QQYUN-7641】basicModal组件添加MaxHeight属性
+            };
+          }
+        }
+        // update-end--author:liaozhiyang---date:20231205---for：【QQYUN-7147】Model的高度设置不生效
      });

      watchEffect(() => {
--- a/src/components/Modal/src/hooks/useModal.ts
+++ b/src/components/Modal/src/hooks/useModal.ts
@@ -55,15 +55,19 @@ export function useModal(): UseModalReturnType {
    getVisible: computed((): boolean => {
      return visibleData[~~unref(uid)];
    }),
-
+    getOpen: computed((): boolean => {
+      return visibleData[~~unref(uid)];
+    }),
    redoModalHeight: () => {
      getInstance()?.redoModalHeight?.();
    },

    openModal: <T = any>(visible = true, data?: T, openOnSet = true): void => {
+      // update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
      getInstance()?.setModalProps({
-        visible: visible,
+        open: visible,
      });
+      // update-end--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x

      if (!data) return;
      const id = unref(uid);
@@ -79,7 +83,9 @@ export function useModal(): UseModalReturnType {
    },

    closeModal: () => {
-      getInstance()?.setModalProps({ visible: false });
+      // update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
+      getInstance()?.setModalProps({ open: false });
+      // update-end--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
    },
  };
  return [register, methods];
@@ -126,13 +132,15 @@ export const useModalInner = (callbackFn?: Fn): UseModalInnerReturnType => {
      getVisible: computed((): boolean => {
        return visibleData[~~unref(uidRef)];
      }),
-
+      getOpen: computed((): boolean => {
+        return visibleData[~~unref(uidRef)];
+      }),
      changeOkLoading: (loading = true) => {
        getInstance()?.setModalProps({ confirmLoading: loading });
      },

      closeModal: () => {
-        getInstance()?.setModalProps({ visible: false });
+        getInstance()?.setModalProps({ open: false });
      },

      setModalProps: (props: Partial<ModalProps>) => {
--- a/src/components/Modal/src/index.less
+++ b/src/components/Modal/src/index.less
@@ -1,4 +1,4 @@
-.fullscreen-modal {
+.ant-modal-root .fullscreen-modal {
  overflow: hidden;

  .ant-modal {
@@ -30,7 +30,7 @@
    padding: 14px;
  }

-  &-title {
+  .ant-modal-title {
    font-size: 16px;
    font-weight: bold;
    line-height: 16px;
@@ -48,7 +48,7 @@
    }
  }

-  &-large {
+  .ant-modal-large {
    top: 60px;

    &--mini {
@@ -56,34 +56,33 @@
    }
  }

-  &-header {
+  .ant-modal-header {
    padding: 16px;
  }

-  &-content {
+  .ant-modal-content {
    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
  }

-  &-footer {
+  .ant-modal-footer {
    button + button {
      margin-left: 10px;
    }
  }

-  &-close {
+  .ant-modal-close {
    font-weight: normal;
    outline: none;
  }

-  &-close-x {
+  .ant-modal-close-x {
    display: inline-block;
    width: 96px;
-/*    width: auto;*/
    height: 56px;
    line-height: 56px;
  }

-  &-confirm-body {
+  .ant-modal-confirm-body {
    .ant-modal-confirm-content {
      // color: #fff;

@@ -93,23 +92,23 @@
    }
  }

-  &-confirm-confirm.error .ant-modal-confirm-body > .anticon {
+  .ant-modal-confirm-confirm.error .ant-modal-confirm-body > .anticon {
    color: @error-color;
  }

-  &-confirm-btns {
+  .ant-modal-confirm-btns {
    .ant-btn:last-child {
      margin-right: 0;
    }
  }

-  &-confirm-info {
+  .ant-modal-confirm-info {
    .ant-modal-confirm-body > .anticon {
      color: @warning-color;
    }
  }

-  &-confirm-confirm.success {
+  .ant-modal-confirm-confirm.success {
    .ant-modal-confirm-body > .anticon {
      color: @success-color;
    }
--- a/src/components/Modal/src/props.ts
+++ b/src/components/Modal/src/props.ts
@@ -75,12 +75,14 @@ export const basicProps = Object.assign({}, modalProps, {

  visible: { type: Boolean },

+  open: { type: Boolean },
+
  width: [String, Number] as PropType<string | number>,

  wrapClassName: { type: String },

  zIndex: { type: Number },
-
+  maxHeight: { type: Number },
  // 是否开启评论区域
  enableComment: { type: Boolean, default: false },
 });
--- a/src/components/Modal/src/typing.ts
+++ b/src/components/Modal/src/typing.ts
@@ -15,6 +15,7 @@ export interface ReturnMethods extends ModalMethods {
  openModal: <T = any>(props?: boolean, data?: T, openOnSet?: boolean) => void;
  closeModal: () => void;
  getVisible?: ComputedRef<boolean>;
+  getOpen?: ComputedRef<boolean>;
 }

 export type UseModalReturnType = [RegisterFn, ReturnMethods];
@@ -24,6 +25,7 @@ export interface ReturnInnerMethods extends ModalMethods {
  changeLoading: (loading: boolean) => void;
  changeOkLoading: (loading: boolean) => void;
  getVisible?: ComputedRef<boolean>;
+  getOpen?: ComputedRef<boolean>;
  redoModalHeight: () => void;
 }

@@ -41,6 +43,7 @@ export interface ModalProps {
  canFullscreen?: boolean;
  defaultFullscreen?: boolean;
  visible?: boolean;
+  open?: boolean;
  // 温馨提醒信息
  helpMessage: string | string[];

--- a/src/components/SimpleMenu/src/components/SubMenuItem.vue
+++ b/src/components/SimpleMenu/src/components/SubMenuItem.vue
@@ -16,8 +16,8 @@
      placement="right"
      :overlayClassName="`${prefixCls}-menu-popover`"
      v-else
-      :visible="getIsOpend"
-      @visibleChange="handleVisibleChange"
+      :open="getIsOpend"
+      @openChange="handleVisibleChange"
      :overlayStyle="getOverlayStyle"
      :align="{ offset: [0, 0] }"
    >
--- a/src/components/SimpleMenu/src/components/menu.less
+++ b/src/components/SimpleMenu/src/components/menu.less
@@ -268,7 +268,7 @@
      .@{menu-prefix-cls}-submenu-active {
        position: relative;
        color: #fff !important;
-        background-color: @sider-dark-darken-bg-color !important;
+        background-color: @primary-color !important;

        &::before {
          position: absolute;
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -48,7 +48,7 @@
 <script lang="ts">
  import type { BasicTableProps, TableActionType, SizeType, ColumnChangeParam, BasicColumn } from './types/table';

-  import { defineComponent, ref, computed, unref, toRaw, inject, watchEffect, watch, onUnmounted, onMounted } from 'vue';
+  import { defineComponent, ref, computed, unref, toRaw, inject, watchEffect, watch, onUnmounted, onMounted, nextTick } from 'vue';
  import { Table } from 'ant-design-vue';
  import { BasicForm, useForm } from '/@/components/Form/index';
  import { PageWrapperFixedHeightKey } from '/@/components/Page/injectionKey';
@@ -370,7 +370,11 @@
        return { native, custom };
      });
      // update-end--author:sunjianlei---date:220230718---for：【issues/179】兼容新老slots写法，移除控制台警告
-
+      // update-begin--author:liaozhiyang---date:20231226---for：【issues/945】BasicTable组件设置默认展开不生效
+      nextTick(() => {
+        getProps.value.defaultExpandAllRows && expandAll();
+      })
+      // update-end--author:sunjianlei---date:20231226---for：【issues/945】BasicTable组件设置默认展开不生效
      expose(tableAction);

      emit('register', tableAction, formActions);
@@ -421,8 +425,8 @@
    .@{prefix-cls} {
      //表格选择工具栏样式
      .alert {
-        background-color: #323232;
-        border-color: #424242;
+        // background-color: #323232;
+        // border-color: #424242;
      }
    }
  }
@@ -523,8 +527,8 @@
    //表格选择工具栏样式
    .alert {
      height: 38px;
-      background-color: #e6f7ff;
-      border-color: #91d5ff;
+      // background-color: #e6f7ff;
+      // border-color: #91d5ff;
    }
    &--inset {
      .ant-table-wrapper {
--- a/src/components/Table/src/components/HeaderCell.vue
+++ b/src/components/Table/src/components/HeaderCell.vue
@@ -29,7 +29,16 @@
      const { prefixCls } = useDesign('basic-table-header-cell');

      const getIsEdit = computed(() => !!props.column?.edit);
-      const getTitle = computed(() => props.column?.customTitle || props.column?.title);
+      const getTitle = computed(() => {
+        // update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
+        const result = props.column?.customTitle || props.column?.title;
+        if (typeof result === 'string') {
+          return result;
+        } else {
+          return '';
+        }
+        // update-end--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
+      });
      const getHelpMessage = computed(() => props.column?.helpMessage);

      return { prefixCls, getIsEdit, getTitle, getHelpMessage };
--- a/src/components/Table/src/components/TableAction.vue
+++ b/src/components/Table/src/components/TableAction.vue
@@ -90,13 +90,21 @@
          })
          .map((action) => {
            const { popConfirm } = action;
+            // update-begin--author:liaozhiyang---date:20240105---for：【issues/951】table删除记录时按钮显示错位
+            if (popConfirm) {
+              const overlayClassName = popConfirm.overlayClassName;
+              popConfirm.overlayClassName = `${overlayClassName ? overlayClassName : ''} ${prefixCls}-popconfirm`;
+            }
+            // update-end--author:liaozhiyang---date:20240105---for：【issues/951】table删除记录时按钮显示错位
            return {
              getPopupContainer: () => unref((table as any)?.wrapRef.value) ?? document.body,
              type: 'link',
              size: 'small',
              ...action,
              ...(popConfirm || {}),
-              onConfirm: popConfirm?.confirm,
+              // update-begin--author:liaozhiyang---date:20240108---for：【issues/936】表格操作栏删除当接口失败时，气泡确认框不会消失
+              onConfirm: handelConfirm(popConfirm?.confirm),
+              // update-end--author:liaozhiyang---date:20240108---for：【issues/936】表格操作栏删除当接口失败时，气泡确认框不会消失
              onCancel: popConfirm?.cancel,
              enable: !!popConfirm,
            };
@@ -110,17 +118,52 @@
        });
        return list.map((action, index) => {
          const { label, popConfirm } = action;
+          // update-begin--author:liaozhiyang---date:20240105---for：【issues/951】table删除记录时按钮显示错位
+          if (popConfirm) {
+            const overlayClassName = popConfirm.overlayClassName;
+            popConfirm.overlayClassName = `${overlayClassName ? overlayClassName : ''} ${prefixCls}-popconfirm`;
+          }
+          // update-end--author:liaozhiyang---date:20240105---for：【issues/951】table删除记录时按钮显示错位
+          // update-begin--author:liaozhiyang---date:20240108---for：【issues/936】表格操作栏删除当接口失败时，气泡确认框不会消失
+          if (popConfirm) {
+            popConfirm.confirm = handelConfirm(popConfirm?.confirm);
+          }
+          // update-end--author:liaozhiyang---date:20240108---for：【issues/936】表格操作栏删除当接口失败时，气泡确认框不会消失
          return {
            ...action,
            ...popConfirm,
-            onConfirm: popConfirm?.confirm,
+            onConfirm: handelConfirm(popConfirm?.confirm),
            onCancel: popConfirm?.cancel,
            text: label,
            divider: index < list.length - 1 ? props.divider : false,
          };
        });
      });
-
+      /*
+      2023-01-08
+      liaozhiyang
+      给传进来的函数包一层promise
+      */
+      const handelConfirm = (fn) => {
+        if (typeof fn !== 'function') return fn;
+        const anyc = () => {
+          return new Promise<void>((resolve) => {
+            const result = fn();
+            if (Object.prototype.toString.call(result) === '[object Promise]') {
+              result
+                .finally(() => {
+                  resolve();
+                })
+                .catch((err) => {
+                  console.log(err);
+                });
+            } else {
+              resolve();
+            }
+          });
+        };
+        return anyc;
+      };
      const getDropdownSlotList = computed((): any[] => {
        return unref(getDropdownList).filter((item) => item.slot);
      });
@@ -205,5 +248,10 @@
        font-weight: 700;
      }
    }
+    &-popconfirm {
+      .ant-popconfirm-buttons {
+        min-width: 120px;
+      }
+    }
  }
 </style>
--- a/src/components/Table/src/components/TableHeader.vue
+++ b/src/components/Table/src/components/TableHeader.vue
@@ -14,7 +14,7 @@
        <slot name="toolbar"></slot>
        <Divider type="vertical" v-if="$slots.toolbar && showTableSetting" />
        <TableSetting :class="`${prefixCls}__toolbar-desktop`" style="white-space: nowrap;" :setting="tableSetting" v-if="showTableSetting" @columns-change="handleColumnChange" />
-        <a-popover :overlayClassName="`${prefixCls}__toolbar-mobile`" trigger="click" placement="left" :getPopupContainer="(n) => n.parentElement">
+        <a-popover :overlayClassName="`${prefixCls}__toolbar-mobile`" trigger="click" placement="left" :getPopupContainer="(n) => n?.parentElement">
          <template #content>
            <TableSetting mode="mobile" :setting="tableSetting" v-if="showTableSetting" @columns-change="handleColumnChange" />
          </template>
--- a/src/components/Table/src/components/editable/CellComponent.ts
+++ b/src/components/Table/src/components/editable/CellComponent.ts
@@ -27,7 +27,7 @@ export const CellComponent: FunctionalComponent = (
    Popover,
    {
      overlayClassName: 'edit-cell-rule-popover',
-      visible: !!popoverVisible,
+      open: !!popoverVisible,
      ...(getPopupContainer ? { getPopupContainer } : {}),
    },
    {
--- a/src/components/Table/src/components/editable/index.ts
+++ b/src/components/Table/src/components/editable/index.ts
@@ -1,6 +1,6 @@
 import type { BasicColumn } from '/@/components/Table/src/types/table';

-import { h, Ref } from 'vue';
+import { h, Ref, toRaw } from 'vue';

 import EditableCell from './EditableCell.vue';
 import { isArray } from '/@/utils/is';
@@ -13,7 +13,7 @@ interface Params {

 export function renderEditCell(column: BasicColumn) {
  return ({ text: value, record, index }: Params) => {
-    record.onValid = async () => {
+    toRaw(record).onValid = async () => {
      if (isArray(record?.validCbs)) {
        const validFns = (record?.validCbs || []).map((fn) => fn());
        const res = await Promise.all(validFns);
@@ -23,7 +23,7 @@ export function renderEditCell(column: BasicColumn) {
      }
    };

-    record.onEdit = async (edit: boolean, submit = false) => {
+    toRaw(record).onEdit = async (edit: boolean, submit = false) => {
      if (!submit) {
        record.editable = edit;
      }
--- a/src/components/Table/src/components/settings/ColumnSetting.vue
+++ b/src/components/Table/src/components/settings/ColumnSetting.vue
@@ -4,10 +4,10 @@
      <span>{{ t('component.table.settingColumn') }}</span>
    </template>
    <Popover
-      v-model:visible="popoverVisible"
+      v-model:open="popoverVisible"
      placement="bottomLeft"
      trigger="click"
-      @visible-change="handleVisibleChange"
+      @open-change="handleVisibleChange"
      :overlayClassName="`${prefixCls}__cloumn-list`"
      :getPopupContainer="getPopupContainer"
    >
@@ -174,7 +174,7 @@
      const getBindProps = computed(() => {
        let obj = {};
        if (props.isMobile) {
-          obj['visible'] = false;
+          obj['open'] = false;
        }
        return obj;
      });
--- a/src/components/Table/src/hooks/useColumns.ts
+++ b/src/components/Table/src/hooks/useColumns.ts
@@ -186,7 +186,7 @@ export function useColumns(
        return reactive(column);
      });
    // update-begin--author:liaozhiyang---date:20230919---for：【QQYUN-6387】展开写法（去掉报错）
-    if (propsRef.value.expandedRowKeys) {
+    if (propsRef.value.expandedRowKeys && !propsRef.value.isTreeTable) {
      let index = 0;
      const findIndex = result.findIndex((item) => item.key === CUS_SEL_COLUMN_KEY);
      if (findIndex != -1) {
--- a/src/components/Table/src/types/column.ts
+++ b/src/components/Table/src/types/column.ts
@@ -77,7 +77,7 @@ export interface ColumnProps<T> {
   * Whether filterDropdown is visible
   * @type boolean
   */
-  filterDropdownVisible?: boolean;
+  filterDropdownOpen?: boolean;

  /**
   * Whether the dataSource is filtered
@@ -181,7 +181,7 @@ export interface ColumnProps<T> {
  onFilter?: (value: any, record: T) => boolean;

  /**
-   * Callback executed when filterDropdownVisible is changed, Use as a filterDropdownVisible event when using template or jsx
+   * Callback executed when filterDropdownOpen is changed, Use as a filterDropdownVisible event when using template or jsx
   * @type Function
   */
  onFilterDropdownVisibleChange?: (visible: boolean) => void;
--- a/src/components/Table/src/types/table.ts
+++ b/src/components/Table/src/types/table.ts
@@ -414,7 +414,7 @@ export interface BasicTableProps<T = any> {
 export type CellFormat = string | ((text: string, record: Recordable, index: number) => string | number) | Map<string | number, any>;

 // @ts-ignore
-export interface BasicColumn extends ColumnProps {
+export interface BasicColumn extends ColumnProps<Recordable> {
  children?: BasicColumn[];
  filters?: {
    text: string;
--- a/src/components/Table/src/types/tableAction.ts
+++ b/src/components/Table/src/types/tableAction.ts
@@ -28,4 +28,5 @@ export interface PopConfirm {
  cancel?: Fn;
  icon?: string;
  placement?: string;
+  overlayClassName?: string;
 }
--- a/src/components/Tinymce/src/Editor.vue
+++ b/src/components/Tinymce/src/Editor.vue
@@ -8,52 +8,28 @@
      v-show="editorRef"
      :disabled="disabled"
    />
-    <textarea :id="tinymceId" ref="elRef" :style="{ visibility: 'hidden' }" v-if="!initOptions.inline"></textarea>
+    <Editor :id="tinymceId" ref="elRef" :disabled="disabled" :init="initOptions" :style="{ visibility: 'hidden' }" v-if="!initOptions.inline"></Editor>
    <slot v-else></slot>
  </div>
 </template>

 <script lang="ts">
-  import type { Editor, RawEditorSettings } from 'tinymce';
  import tinymce from 'tinymce/tinymce';
+  import Editor from '@tinymce/tinymce-vue'
  import 'tinymce/themes/silver';
  import 'tinymce/icons/default/icons';
-  import 'tinymce/plugins/advlist';
-  import 'tinymce/plugins/anchor';
-  import 'tinymce/plugins/autolink';
-  import 'tinymce/plugins/autosave';
-  import 'tinymce/plugins/code';
-  import 'tinymce/plugins/codesample';
-  import 'tinymce/plugins/directionality';
+  import 'tinymce/models/dom';
+
+  // tinymce插件可按自己的需要进行导入
+  // 更多插件参考：https://www.tiny.cloud/docs/plugins/
  import 'tinymce/plugins/fullscreen';
-  import 'tinymce/plugins/hr';
-  import 'tinymce/plugins/insertdatetime';
  import 'tinymce/plugins/link';
  import 'tinymce/plugins/lists';
-  import 'tinymce/plugins/media';
-  import 'tinymce/plugins/nonbreaking';
-  import 'tinymce/plugins/noneditable';
-  import 'tinymce/plugins/pagebreak';
-  import 'tinymce/plugins/paste';
  import 'tinymce/plugins/preview';
-  import 'tinymce/plugins/print';
-  import 'tinymce/plugins/save';
-  import 'tinymce/plugins/searchreplace';
-  import 'tinymce/plugins/spellchecker';
-  import 'tinymce/plugins/tabfocus';
-  // import 'tinymce/plugins/table';
-  import 'tinymce/plugins/template';
-  import 'tinymce/plugins/textpattern';
-  import 'tinymce/plugins/visualblocks';
-  import 'tinymce/plugins/visualchars';
-  import 'tinymce/plugins/wordcount';
  import 'tinymce/plugins/image';
-  import 'tinymce/plugins/table';
-  import 'tinymce/plugins/textcolor';
-  import 'tinymce/plugins/contextmenu';
  import { defineComponent, computed, nextTick, ref, unref, watch, onDeactivated, onBeforeUnmount } from 'vue';
  import ImgUpload from './ImgUpload.vue';
-  import { toolbar, plugins, simplePlugins, simpleToolbar, menubar } from './tinymce';
+  import {simpleToolbar, menubar, simplePlugins} from './tinymce';
  import { buildShortUUID } from '/@/utils/uuid';
  import { bindHandlers } from './helper';
  import { onMountedOrActivated } from '/@/hooks/core/onMountedOrActivated';
@@ -74,11 +50,11 @@

    toolbar: {
      type: [Array as PropType<string[]>, String],
-      default: toolbar,
+      default: simpleToolbar,
    },
    plugins: {
-      type: Array as PropType<string[]>,
-      default: plugins,
+      type: [Array as PropType<string[]>, String],
+      default: simplePlugins,
    },
    menubar: {
      type: [Object, String],
@@ -105,12 +81,14 @@

  export default defineComponent({
    name: 'Tinymce',
-    components: { ImgUpload },
+    components: { ImgUpload,Editor },
    inheritAttrs: false,
    props: tinymceProps,
    emits: ['change', 'update:modelValue', 'inited', 'init-error'],
    setup(props, { emit, attrs }) {
-      const editorRef = ref<Nullable<Editor>>(null);
+      console.log("---Tinymce---初始化---")
+      
+      const editorRef = ref<Nullable<any>>(null);
      const fullscreen = ref(false);
      const tinymceId = ref<string>(buildShortUUID('tiny-vue'));
      const elRef = ref<Nullable<HTMLElement>>(null);
@@ -138,14 +116,14 @@
        return ['zh_CN', 'en'].includes(lang) ? lang : 'zh_CN';
      });

-      const initOptions = computed((): RawEditorSettings => {
+      const initOptions = computed(() => {
        const { height, options, toolbar, plugins, menubar } = props;
        const publicPath = import.meta.env.VITE_PUBLIC_PATH || '/';
        return {
          selector: `#${unref(tinymceId)}`,
          height,
          toolbar,
-          menubar: menubar,
+          menubar: false,
          plugins,
          language_url: publicPath + 'resource/tinymce/langs/' + langName.value + '.js',
          language: langName.value,
@@ -155,10 +133,11 @@
          object_resizing: true,
          toolbar_mode: 'sliding',
          auto_focus: true,
-          toolbar_groups: true,
+          // toolbar_groups: true,
          skin: skinName.value,
          skin_url: publicPath + 'resource/tinymce/skins/ui/' + skinName.value,
-          images_upload_handler: (blobInfo, success) => {
+          images_upload_handler: (blobInfo, process) =>
+            new Promise((resolve, reject) => {
            let params = {
              file: blobInfo.blob(),
              filename: blobInfo.filename(),
@@ -168,18 +147,20 @@
              if (res.success) {
                if (res.message == 'local') {
                  const img = 'data:image/jpeg;base64,' + blobInfo.base64();
-                  success(img);
+                      resolve(img);
                } else {
                  let img = getFileAccessHttpUrl(res.message);
-                  success(img);
+                  resolve(img);
                }
+              } else {
+                  reject('上传失败！');
              }
            };
            uploadFile(params, uploadSuccess);
-          },
+        }),
          content_css: publicPath + 'resource/tinymce/skins/ui/' + skinName.value + '/content.min.css',
          ...options,
-          setup: (editor: Editor) => {
+          setup: (editor: any) => {
            editorRef.value = editor;
            editor.on('init', (e) => initSetup(e));
          },
@@ -191,7 +172,7 @@
        const getdDisabled = options && Reflect.get(options, 'readonly');
        const editor = unref(editorRef);
        // update-begin-author:taoyan date:20220407 for: 设置disabled，图片上传没有被禁用
-        if (editor) {
+        if (editor && editor?.setMode) {
          editor.setMode(getdDisabled || attrs.disabled === true ? 'readonly' : 'design');
        }
        if (attrs.disabled === true) {
@@ -208,7 +189,7 @@
          if (!editor) {
            return;
          }
-          editor.setMode(attrs.disabled ? 'readonly' : 'design');
+         editor?.setMode && editor.setMode(attrs.disabled ? 'readonly' : 'design');
        }
      );

@@ -239,7 +220,7 @@

      function initEditor() {
        const el = unref(elRef);
-        if (el) {
+        if (el && el?.style && el?.style?.visibility) {
          el.style.visibility = '';
        }
        tinymce
--- a/src/components/jeecg/JPrompt/JPrompt.vue
+++ b/src/components/jeecg/JPrompt/JPrompt.vue
@@ -62,7 +62,7 @@
        let modalProps: Partial<ModalProps> = {
          width: (opt.width ?? 500) as number,
          title: (opt.title ?? 'prompt') as string,
-          visible: unref(visible),
+          open: unref(visible),
          confirmLoading: unref(loading),
        };
        let finalProps: Recordable = {
--- a/src/components/jeecg/JVxeTable/src/components/JVxeSubPopover.vue
+++ b/src/components/jeecg/JVxeTable/src/components/JVxeSubPopover.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-popover :visible="visible" :placement="placement" overlayClassName="j-vxe-popover-overlay" :overlayStyle="overlayStyle">
+  <a-popover :open="visible" :placement="placement" overlayClassName="j-vxe-popover-overlay" :overlayStyle="overlayStyle">
    <template #title>
      <div class="j-vxe-popover-title">
        <div>子表</div>
--- a/src/components/jeecg/JVxeTable/src/components/cells/JVxeDateCell.vue
+++ b/src/components/jeecg/JVxeTable/src/components/cells/JVxeDateCell.vue
@@ -4,7 +4,7 @@
    allowClear
    :format="dateFormat"
    :showTime="isDatetime"
-    dropdownClassName="j-vxe-date-picker"
+    popupClassName="j-vxe-date-picker"
    style="min-width: 0"
    v-model:open="openPicker"
    v-bind="cellProps"
--- a/src/components/jeecg/JVxeTable/src/components/cells/JVxeTimeCell.vue
+++ b/src/components/jeecg/JVxeTable/src/components/cells/JVxeTimeCell.vue
@@ -3,12 +3,12 @@
    :value="innerTimeValue"
    allowClear
    :format="format"
-    dropdownClassName="j-vxe-time-picker"
+    popupClassName="j-vxe-time-picker"
    style="min-width: 0"
    v-model:open="openPicker"
    v-bind="cellProps"
    @change="handleChange"
-    :getPopupContainer="(node) => node.parentNode"
+    :getPopupContainer="(node) => node?.parentNode"
  />
 </template>

--- a/src/components/jeecg/JVxeTable/src/vxe.data.ts
+++ b/src/components/jeecg/JVxeTable/src/vxe.data.ts
@@ -90,7 +90,8 @@ export const vxeProps = () => ({
  keyboardEdit: propTypes.bool.def(false),
  // update-begin--author:liaozhiyang---date:20231013---for：【QQYUN-5133】JVxeTable 行编辑升级
  // 横向虚拟滚动配置（不支持展开行）
-  scrollX: propTypes.object.def(() => ({ enabled: true })),
+  // 【QQYUN-7676】x滚动条滚动时字典变成了id
+  scrollX: propTypes.object.def(() => ({ enabled: false })),
  // 纵向虚拟滚动配置（不支持展开行）
  scrollY: propTypes.object.def(() => ({ enabled: true })),
  // update-end--author:liaozhiyang---date:20231013---for：【QQYUN-5133】JVxeTable 行编辑升级
--- a/src/components/jeecg/OnLine/hooks/usePopBiz.ts
+++ b/src/components/jeecg/OnLine/hooks/usePopBiz.ts
@@ -8,6 +8,7 @@ import { h } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useMethods } from '/@/hooks/system/useMethods';
 import { importViewsFile, _eval } from '/@/utils';
+import {getToken} from "@/utils/auth";

 export function usePopBiz(ob, tableRef?) {
  // update-begin--author:liaozhiyang---date:20230811---for：【issues/675】子表字段Popup弹框数据不更新
@@ -71,6 +72,7 @@ export function usePopBiz(ob, tableRef?) {
   */
  const rowSelection = {
    fixed: true,
+    type: props.multi ? 'checkbox' : 'radio',
    selectedRowKeys: checkedKeys,
    selectionRows: selectRows,
    onChange: onSelectChange,
@@ -111,6 +113,13 @@ export function usePopBiz(ob, tableRef?) {
   * @param selectRow
   */
  function onSelectChange(selectedRowKeys: (string | number)[]) {
+    // update-begin--author:liaozhiyang---date:20240105---for：【QQYUN-7514】popup单选显示radio
+    if (!props.multi) {
+      selectRows.value = [];
+      checkedKeys.value = [];
+      selectedRowKeys = [selectedRowKeys[selectedRowKeys.length - 1]];
+    }
+    // update-end--author:liaozhiyang---date:20240105---for：【QQYUN-7514】popup单选显示radio
    // update-begin--author:liaozhiyang---date:20230919---for：【QQYUN-4263】跨页选择导出问题
    if (!selectedRowKeys || selectedRowKeys.length == 0) {
      selectRows.value = [];
@@ -206,7 +215,13 @@ export function usePopBiz(ob, tableRef?) {
            width: 60,
            align: 'center',
            customRender: function ({ text }) {
-              return parseInt(text) + 1;
+              // update-begin--author:liaozhiyang---date:20231226---for：【QQYUN-7584】popup有合计时序号列会出现NaN
+              if (text == undefined) {
+                return '';
+              } else {
+                return parseInt(text) + 1;
+              }
+              // update-end--author:liaozhiyang---date:20231226---for：【QQYUN-7584】popup有合计时序号列会出现NaN
            },
          });
        }
@@ -450,6 +465,11 @@ export function usePopBiz(ob, tableRef?) {
      if (jsPattern.test(href)) {
        href = href.replace(jsPattern, function (text, s0) {
          try {
+            // 支持 {{ ACCESS_TOKEN }} 占位符
+            if (s0.trim() === 'ACCESS_TOKEN') {
+              return getToken()
+            }
+
            // update-begin--author:liaozhiyang---date:20230904---for：【QQYUN-6390】eval替换成new Function，解决build警告
            return _eval(s0);
            // update-end--author:liaozhiyang---date:20230904---for：【QQYUN-6390】eval替换成new Function，解决build警告
@@ -707,6 +727,12 @@ export function usePopBiz(ob, tableRef?) {
   */
  function clickThenCheck(record) {
    if (clickThenCheckFlag === true) {
+      // update-begin--author:liaozhiyang---date:20240104---for：【QQYUN-7514】popup单选显示radio
+      if (!props.multi) {
+        selectRows.value = [];
+        checkedKeys.value = [];
+      }
+      // update-end--author:liaozhiyang---date:20240104---for：【QQYUN-7514】popup单选显示radio
      let rowKey = combineRowKey(record);
      if (!unref(checkedKeys) || unref(checkedKeys).length == 0) {
        let arr1: any[] = [],
@@ -777,7 +803,7 @@ export function usePopBiz(ob, tableRef?) {
      title: '',
      okText: '关闭',
      width: '100%',
-      visible: false,
+      open: false,
      destroyOnClose: true,
      style: dialogStyle,
      // dialogStyle: dialogStyle,
@@ -791,8 +817,8 @@ export function usePopBiz(ob, tableRef?) {
      cancelButtonProps: { style: { display: 'none' } },
    },
    on: {
-      ok: () => (hrefComponent.value.model.visible = false),
-      cancel: () => (hrefComponent.value.model.visible = false),
+      ok: () => (hrefComponent.value.model.open = false),
+      cancel: () => (hrefComponent.value.model.open = false),
    },
    is: <any>null,
    params: {},
@@ -816,7 +842,7 @@ export function usePopBiz(ob, tableRef?) {
    } else {
      hrefComponent.value.params = {};
    }
-    hrefComponent.value.model.visible = true;
+    hrefComponent.value.model.open = true;
    hrefComponent.value.model.title = '操作';
    hrefComponent.value.is = markRaw(defineAsyncComponent(() => importViewsFile(path)));
  }
--- a/src/components/jeecg/comment/CommentList.vue
+++ b/src/components/jeecg/comment/CommentList.vue
@@ -15,7 +15,7 @@
                <template v-if="item.toUserId">
                  <span>回复</span>
                  <span>{{ item.toUserId_dictText }}</span>
-                  <Tooltip class="comment-last-content" @visibleChange="(v)=>visibleChange(v, item)">
+                  <Tooltip class="comment-last-content" @openChange="(v)=>visibleChange(v, item)">
                    <template #title>
                      <div v-html="getHtml(item.commentId_dictText)"></div>
                    </template>
@@ -320,7 +320,7 @@
    .comment-last-content {
      margin-left: 5px;
      &:hover{
-        color: #1890ff;
+        color: @primary-color;
      }
    }
  }
--- a/src/components/jeecg/comment/MyComment.vue
+++ b/src/components/jeecg/comment/MyComment.vue
@@ -25,7 +25,7 @@
    <upload-chunk ref="uploadRef" :visible="uploadVisible" @select="selectFirstFile"></upload-chunk>
  </div>
  <UserSelectModal labelKey="realname" rowKey="username" @register="registerModal" @getSelectResult="setValue" isRadioSelection></UserSelectModal>
-  <a-modal v-model:visible="visibleEmoji" :footer="null" wrapClassName="emoji-modal" :closable="false" :width="490">
+  <a-modal v-model:open="visibleEmoji" :footer="null" wrapClassName="emoji-modal" :closable="false" :width="490">
    <template #title>
      <span></span>
    </template>
--- a/src/components/registerGlobComp.ts
+++ b/src/components/registerGlobComp.ts
@@ -2,7 +2,7 @@ import type { App } from 'vue';
 import { Icon } from './Icon';
 import AIcon from '/@/components/jeecg/AIcon.vue';
 //Tinymce富文本
-import Editor from '/@/components/Tinymce/src/Editor.vue';
+import Editor from '/@/components/Tinymce/src/Editor.vue'

 import { Button, JUploadButton } from './Button';

@@ -60,20 +60,16 @@ import {
 } from 'ant-design-vue';
 const compList = [AntButton.Group, Icon, AIcon, JUploadButton];

-//敲敲云—仪表盘设计器（拖拽设计）
-import DragEngine from '@qiaoqiaoyun/drag-free';
-import('@qiaoqiaoyun/drag-free/lib/index.css');
-console.log('---初始化---， 全局注册仪表盘--------------');

 export function registerGlobComp(app: App) {
  compList.forEach((comp) => {
    app.component(comp.name || comp.displayName, comp);
  });
+  
  //仪表盘依赖Tinymce，需要提前加载（没办法按需加载了）
  app.component(Editor.name, Editor);
-
-  app
-    .use(Select)
+  
+  app.use(Select)
    .use(Alert)
    .use(Button)
    .use(Breadcrumb)
@@ -118,9 +114,7 @@ export function registerGlobComp(app: App) {
    .use(InputNumber)
    .use(Carousel)
    .use(Popconfirm)
-    .use(DragEngine)
    .use(Skeleton)
    .use(Cascader)
    .use(Rate);
-  console.log("注册antd组件完成！");
 }
--- a/src/design/ant/index.less
+++ b/src/design/ant/index.less
@@ -1,6 +1,6 @@
@import './pagination.less';
@import './input.less';
-@import './btn.less';
+//@import './btn.less';
 // @import './table.less';

 // TODO beta.11 fix
@@ -13,11 +13,11 @@
    display: unset;
  }
 }
-//update-begin---author:scott ---date:2023-08-28  for<6F><72><EFBFBD><EFBFBD>QQYUN-6374<37><34>UnoCSS<53><53><EFBFBD><EFBFBD>windicss<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>--
+//update-begin---author:scott ---date:2023-08-28  for<6F><72><EFBFBD><EFBFBD>QQYUN-6374<37><34>UnoCSS<53><53><EFBFBD>windicss<73><73><EFBFBD><EFBFBD>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD>--
 /*span.anticon:not(.app-iconify) {
  vertical-align: 0.125em !important;
 }*/
-//update-end---author:scott ---date::2023-08-28  for<6F><72><EFBFBD><EFBFBD>QQYUN-6374<37><34>UnoCSS<53><53><EFBFBD><EFBFBD>windicss<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>--
+//update-end---author:scott ---date::2023-08-28  for<6F><72><EFBFBD><EFBFBD>QQYUN-6374<37><34>UnoCSS<53><53><EFBFBD>windicss<73><73><EFBFBD><EFBFBD>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD>--

 .ant-back-top {
  right: 20px;
@@ -64,3 +64,99 @@
  border-top: 0 !important;
  border-left: 0 !important;
 }
+
+// update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
+.ant-modal {
+  .ant-modal-close {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: auto;
+    height: auto;
+  }
+  .ant-modal-content {
+    padding: 0;
+  }
+}
+
+.ant-input-affix-wrapper > input.ant-input {
+  font-size: 14px;
+}
+
+.ant-pagination-options-size-changer.ant-select {
+  display: inline-block;
+  width: auto;
+}
+
+.ant-tree-select-dropdown .ant-select-tree .ant-select-tree-list-holder-inner {
+  align-items: stretch;
+}
+
+.ant-list .ant-list-item {padding-left: 0;padding-right: 0;}
+
+
+.ant-list-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 12px 0;
+  color: #000000d9;
+}
+/** anticon-down跟3.x保持一致*/ 
+.ant-dropdown-trigger>.anticon.anticon-down, .ant-dropdown-link>.anticon.anticon-down, .ant-dropdown-button>.anticon.anticon-down {
+  font-size: 10px;
+  vertical-align: baseline;
+}
+/** 表格排序箭头尺寸保持跟3.x一致 */ 
+.ant-table-wrapper .ant-table-column-sorter-up, .ant-table-wrapper .ant-table-column-sorter-down {
+  font-size: 11px;
+}
+ /** 表格头部文字颜色跟3.x版本保持一致 */
+.ant-table-wrapper .ant-table-thead >tr>th, .ant-table-wrapper .ant-table-thead >tr>td {
+  color: #000000d9;
+  font-weight: 500;
+}
+html[data-theme='dark'] .ant-table-wrapper .ant-table-thead >tr>th, .ant-table-wrapper .ant-table-thead >tr>td {
+  color:rgba(255,255,255,.65);
+}
+ /** 下拉菜单文字和图标折叠了 */
+.ant-dropdown .ant-dropdown-menu .ant-dropdown-menu-title-content, .ant-dropdown-menu-submenu .ant-dropdown-menu .ant-dropdown-menu-title-content{
+  flex: auto;
+  white-space:nowrap;
+}
+// update-end--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
+
+// update-end--author:liaozhiyang---date:20230105---for：【QQYUN-7493】多行文本内容过多时内容会覆盖掉清空按钮
+.ant-input-affix-wrapper-textarea-with-clear-btn {
+  .ant-input-clear-icon {
+    background-color: #fff;
+  }
+}
+html[data-theme='dark'] .ant-input-affix-wrapper-textarea-with-clear-btn {
+  .ant-input-clear-icon {
+    background-color: #141414;
+  }
+}
+// update-end--author:liaozhiyang---date:20230105---for：【QQYUN-7493】多行文本内容过多时内容会覆盖掉清空按钮
+
+// update-begin--author:liaozhiyang---date:20230108---for：【QQYUN-7855】table页码同步3.x页面效果
+.ant-table-pagination.ant-pagination {
+  .ant-pagination-item-active,
+  .ant-pagination-item-active:hover {
+    background-color: @primary-color;
+    border-color: transparent;
+    a {
+      color: #fff;
+    }
+  }
+  .ant-pagination-item:not(.ant-pagination-item-active) {
+    background-color: transparent !important;
+    border-color: transparent;
+  }
+  .ant-pagination-prev,
+  .ant-pagination-next,
+  .ant-pagination-item {
+    margin: 0 4px;
+  }
+}
+// update-end--author:liaozhiyang---date:20230108---for：【QQYUN-7855】table页码同步3.x页面效果
--- a/src/design/index.less
+++ b/src/design/index.less
@@ -22,7 +22,9 @@ html,
 body {
  width: 100%;
  height: 100%;
-
+  // body添加行高保持跟3.x一致
+  line-height: 1.5715;
+  
  &.color-weak {
    filter: invert(80%);
  }
@@ -82,3 +84,8 @@ img, video {
  
 }
 // update-end--author:liaozhiyang---date:20231013---for：【QQYUN-5133】升级之后提示样式跟之前一致
+// update-begin--author:liaozhiyang---date:20231116---for：【QQYUN-7011】online表单多了一个蓝色的边框
+// .vxe-table.vxe-table--render-default .vxe-body--column.col--selected {
+//   box-shadow: none;
+// }
+// update-end--author:liaozhiyang---date:20231116---for：【QQYUN-7011】online表单多了一个蓝色的边框
--- a/src/enums/CompTypeEnum.ts
+++ b/src/enums/CompTypeEnum.ts
@@ -18,7 +18,7 @@ export enum CompTypeEnum {
  CatTree = 'cat_tree',
  //下拉搜索
  SelSearch = 'search',
-  //用户选择框
+  //用户现在框
  SelUser = 'sel_user',
  //复选框
  Checkbox = 'checkbox',
--- a/src/enums/httpEnum.ts
+++ b/src/enums/httpEnum.ts
@@ -9,7 +9,7 @@ export enum ResultEnum {
 }

 /**
- * @description: Request method
+ * @description: request method
 */
 export enum RequestEnum {
  GET = 'GET',
@@ -19,7 +19,7 @@ export enum RequestEnum {
 }

 /**
- * @description: Content type
+ * @description:  contentTyp
 */
 export enum ContentTypeEnum {
  // json
@@ -32,7 +32,7 @@ export enum ContentTypeEnum {

 /**
 * 请求header
- * @description: Request header
+ * @description:  contentTyp
 */
 export enum ConfigEnum {
  // TOKEN
--- a/src/hooks/web/useSso.ts
+++ b/src/hooks/web/useSso.ts
@@ -7,7 +7,10 @@ import { useUserStore } from '/@/store/modules/user';
 const globSetting = useGlobSetting();
 const openSso = globSetting.openSso;
 export function useSso() {
-  let locationUrl = 'http://' + window.location.host + '/';
+  //update-begin---author:wangshuai---date:2024-01-03---for:【QQYUN-7805】SSO登录强制用http #957---
+  let locationUrl = document.location.protocol +"//" + window.location.host + '/';
+  //update-end---author:wangshuai---date:2024-01-03---for:【QQYUN-7805】SSO登录强制用http #957---
+
  /**
   * 单点登录
   */
--- a/src/layouts/default/header/components/notify/index_old.vue
+++ b/src/layouts/default/header/components/notify/index_old.vue
@@ -1,6 +1,6 @@
 <template>
  <div :class="prefixCls">
-    <Popover v-model:visible="popoverVisible" title="" trigger="click" :overlayClassName="`${prefixCls}__overlay`">
+    <Popover v-model:open="popoverVisible" title="" trigger="click" :overlayClassName="`${prefixCls}__overlay`">
      <Badge :count="count" :overflowCount="9" :offset="[-4, 10]" :numberStyle="numberStyle">
        <BellOutlined />
      </Badge>
--- a/src/layouts/default/header/components/user-dropdown/index.vue
+++ b/src/layouts/default/header/components/user-dropdown/index.vue
@@ -236,6 +236,9 @@
    }

    &-dropdown-overlay {
+      // update-begin--author:liaozhiyang---date:20231226---for：【QQYUN-7512】顶部账号划过首次弹出时位置会变更一下
+      width: 160px;
+      // update-end--author:liaozhiyang---date:20231226---for：【QQYUN-7512】顶部账号划过首次弹出时位置会变更一下
      .ant-dropdown-menu-item {
        min-width: 160px;
      }
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@@ -219,9 +219,10 @@
  //顶部欢迎语展示样式
  @prefix-cls: ~'@{namespace}-layout-header';
  
-  .@{prefix-cls} {
+  .ant-layout .@{prefix-cls} {
    display: flex;
    padding: 0 8px;
+    height: 48px;
    align-items: center;
    
    .headerIntroductionClass {
@@ -241,7 +242,7 @@
      .headerIntroductionClass {
        color: rgba(255, 255, 255, 0.6);
      }
-      .anticon {
+      .anticon, .truncate {
        color: rgba(255, 255, 255, 0.8);
      }
    }
--- a/src/layouts/default/setting/components/InputNumberItem.vue
+++ b/src/layouts/default/setting/components/InputNumberItem.vue
@@ -48,4 +48,9 @@
      width: 126px;
    }
  }
+  html[data-theme='dark'] {
+    .@{prefix-cls} {
+      color: rgba(255, 255, 255, 0.8);
+    }
+  }
 </style>
--- a/src/layouts/default/setting/components/SelectItem.vue
+++ b/src/layouts/default/setting/components/SelectItem.vue
@@ -65,4 +65,9 @@
      width: 126px;
    }
  }
+  html[data-theme='dark'] {
+    .@{prefix-cls} {
+      color: rgba(255, 255, 255, 0.8);
+    }
+  }
 </style>
--- a/src/layouts/default/setting/components/SwitchItem.vue
+++ b/src/layouts/default/setting/components/SwitchItem.vue
@@ -63,4 +63,9 @@
    justify-content: space-between;
    margin: 16px 0;
  }
+  html[data-theme='dark'] {
+    .@{prefix-cls} {
+      color: rgba(255, 255, 255, 0.8);
+    }
+  }
 </style>
--- a/src/layouts/default/setting/components/ThemeColorPicker.vue
+++ b/src/layouts/default/setting/components/ThemeColorPicker.vue
@@ -62,7 +62,9 @@
    flex-wrap: wrap;
    margin: 16px 0;
    justify-content: space-around;
-
+    // update-begin--author:liaozhiyang---date:20231220---for：【QQYUN-7677】antd4兼容改造，勾选垂直居中
+    line-height: 1.3;
+    // update-end--author:liaozhiyang---date:20231220---for：【QQYUN-7677】antd4兼容改造，勾选垂直居中
    &__item {
      width: 20px;
      height: 20px;
--- a/src/layouts/default/sider/LayoutSider.vue
+++ b/src/layouts/default/sider/LayoutSider.vue
@@ -125,7 +125,7 @@
    z-index: @layout-sider-fixed-z-index;

    &--fixed {
-      position: fixed;
+      position: fixed !important;
      top: 0;
      left: 0;
      height: 100%;
--- a/src/layouts/default/sider/index.vue
+++ b/src/layouts/default/sider/index.vue
@@ -5,7 +5,7 @@
    :class="prefixCls"
    :width="getMenuWidth"
    :getContainer="null"
-    :visible="!getCollapsed"
+    :open="!getCollapsed"
    @close="handleClose"
  >
    <Sider />
--- a/src/layouts/default/tabs/index.less
+++ b/src/layouts/default/tabs/index.less
@@ -98,9 +98,7 @@ html[data-theme='light'] {

      .ant-tabs-tab:not(.ant-tabs-tab-active) {
        &:hover {
-          background-color: #ecf5ff;
          color: @primary-color;
-          border-color: #b3d8ff;
        }
      }

--- a/src/layouts/default/tabs/index.vue
+++ b/src/layouts/default/tabs/index.vue
@@ -145,3 +145,11 @@
  @import './tabs.theme.card.less';
  @import './tabs.theme.smooth.less';
 </style>
+<style lang="less" scoped>
+@prefix-cls: ~'@{namespace}-multiple-tabs';
+.@{prefix-cls} {
+  :deep(.anticon) {
+    display: inline-block;
+  }
+}
+</style>
--- a/src/logics/theme/index.ts
+++ b/src/logics/theme/index.ts
@@ -2,8 +2,14 @@ import { getThemeColors, generateColors } from '../../../build/config/themeConfi

 import { replaceStyleVariables } from '@rys-fe/vite-plugin-theme/es/client';
 import { mixLighten, mixDarken, tinycolor } from '@rys-fe/vite-plugin-theme/es/colorUtils';
+import { useAppStore } from '/@/store/modules/app';
+

 export async function changeTheme(color: string) {
+  // update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
+  const appStore = useAppStore();
+  appStore.setProjectConfig({ themeColor: color });
+  // update-end--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
  const colors = generateColors({
    mixDarken,
    mixLighten,
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,7 +1,9 @@
 import 'uno.css';
 import '/@/design/index.less';
+import 'ant-design-vue/dist/reset.css';
 // 注册图标
 import 'virtual:svg-icons-register';
+
 import App from './App.vue';
 import { createApp } from 'vue';
 import { initAppConfigStore } from '/@/logics/initAppConfig';
@@ -17,11 +19,6 @@ import { useSso } from '/@/hooks/web/useSso';
 // 注册online模块lib
 import { registerPackages } from '/@/utils/monorepo/registerPackages';

-// 在本地开发中引入的,以提高浏览器响应速度
-if (import.meta.env.DEV) {
-  // @ts-ignore
-  import('ant-design-vue/dist/antd.less');
-}
 async function bootstrap() {
  // 创建应用实例
  const app = createApp(App);
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -39,6 +39,7 @@ export const LoginRoute: AppRouteRecordRaw = {
  },
 };

+//update-begin---author:wangshuai ---date:20220629  for：auth2登录页面路由------------
 export const Oauth2LoginRoute: AppRouteRecordRaw = {
  path: '/oauth2-app/login',
  name: 'oauth2-app-login',
@@ -49,6 +50,7 @@ export const Oauth2LoginRoute: AppRouteRecordRaw = {
    title: t('routes.oauth2.login'),
  },
 };
+//update-end---author:wangshuai ---date:20220629  for：auth2登录页面路由------------

 /**
 * 【通过token直接静默登录】流程办理登录页面 中转跳转
--- a/src/router/routes/modules/demo/comp.ts
+++ b/src/router/routes/modules/demo/comp.ts
@@ -466,14 +466,6 @@ const comp: AppRouteModule = {
            title: t('routes.demo.feat.copy'),
          },
        },
-        {
-          path: 'codemirror',
-          name: 'codemirrorDemo',
-          component: () => import('/@/views/demo/codemirror/index.vue'),
-          meta: {
-            title: t('routes.demo.feat.codemirror'),
-          },
-        },
        {
          path: 'ripple',
          name: 'RippleDemo',
--- a/src/settings/siteSetting.ts
+++ b/src/settings/siteSetting.ts
@@ -2,7 +2,7 @@
 export const GITHUB_URL = 'https://github.com/jeecgboot/jeecg-boot';

 // vue-Jeecg-admin-next-doc
-export const DOC_URL = 'http://help.jeecg.com';
+export const DOC_URL = 'https://help.jeecg.com';

 // site url
 export const SITE_URL = 'http://www.jeecg.com';
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -134,6 +134,7 @@ export const useUserStore = defineStore({
    ): Promise<GetUserInfoModel | null> {
      try {
        const { goHome = true, mode, ...loginParams } = params;
+        loginParams.grant_type = 'password';
        const data = await loginApi(loginParams, mode);
        const { token, userInfo } = data;
        // save token
@@ -188,6 +189,12 @@ export const useUserStore = defineStore({
        //update-begin---author:wangshuai ---date:20230424  for：【QQYUN-5195】登录之后直接刷新页面导致没有进入创建组织页面------------
        if (redirect && goHome) {
        //update-end---author:wangshuai ---date:20230424  for：【QQYUN-5195】登录之后直接刷新页面导致没有进入创建组织页面------------
+          // update-begin--author:liaozhiyang---date:20240104---for：【QQYUN-7804】部署生产环境，登录跳转404问题
+          const publicPath = import.meta.env.VITE_PUBLIC_PATH;
+          if (publicPath && publicPath != '/') {
+            redirect = publicPath + redirect;
+          }
+          // update-end--author:liaozhiyang---date:20240104---for：【QQYUN-7804】部署生产环境，登录跳转404问题
          // 当前页面打开
          window.open(redirect, '_self')
          return data;
@@ -210,10 +217,11 @@ export const useUserStore = defineStore({
    ): Promise<GetUserInfoModel | null> {
      try {
        const { goHome = true, mode, ...loginParams } = params;
+        loginParams.grant_type = 'phone';
        const data = await phoneLoginApi(loginParams, mode);
-        const { token } = data;
+        const { access_token } = data;
        // save token
-        this.setToken(token);
+        this.setToken(access_token);
        return this.afterLoginAction(goHome, data);
      } catch (error) {
        return Promise.reject(error);
@@ -313,10 +321,11 @@ export const useUserStore = defineStore({
    ): Promise<any | null> {
      try {
        const { goHome = true, mode, ...ThirdLoginParams } = params;
+        ThirdLoginParams.grant_type = "social";
        const data = await thirdLogin(ThirdLoginParams, mode);
-        const { token } = data;
+        const { access_token } = data;
        // save token
-        this.setToken(token);
+        this.setToken(access_token);
        return this.afterLoginAction(goHome, data);
      } catch (error) {
        return Promise.reject(error);
--- a/src/utils/common/compUtils.ts
+++ b/src/utils/common/compUtils.ts
@@ -488,9 +488,15 @@ export async function userExitChangeLoginTenantId(tenantId){
      }
    }
  }
+  let loginTenantId = getTenantId();
  userStore.setTenant(currentTenantId);
-  //切换租户后要刷新首页
-  window.location.reload();
+
+  //update-begin---author:wangshuai---date:2023-11-07---for:【QQYUN-7005】退租户，判断退出的租户ID与当前租户ID一致，再刷新---
+  //租户为空，说明没有租户了，需要刷新页面。或者当前租户和退出的租户一致则需要刷新浏览器
+  if(!currentTenantId || tenantId == loginTenantId){
+    window.location.reload();
+  }
+  //update-end---author:wangshuai---date:2023-11-07---for:【QQYUN-7005】退租户，判断退出的租户ID与当前租户ID一致，再刷新---
 }

 /**
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -142,7 +142,7 @@ const transform: AxiosTransform = {
    let tenantId: string | number = getTenantId();
    if (token && (config as Recordable)?.requestOptions?.withToken !== false) {
      // jwt token
-      config.headers.Authorization = options.authenticationScheme ? `${options.authenticationScheme} ${token}` : token;
+      config.headers.Authorization = options.authenticationScheme ? `${options.authenticationScheme} ${token}` : 'Bearer ' + token;
      config.headers[ConfigEnum.TOKEN] = token;
      //--update-begin--author:liusq---date:20210831---for:将签名和时间戳，添加在请求接口 Header

@@ -245,6 +245,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
        // authentication schemes，e.g: Bearer
        // authenticationScheme: 'Bearer',
        authenticationScheme: '',
+        //接口超时设置
        timeout: 10 * 1000,
        // 基础接口地址
        // baseURL: globSetting.apiUrl,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
JEECG	feb04114ef	Merge pull request #1269 from EightMonth/sas sas兼容shiro处理	2024-06-20 16:09:05 +08:00
EightMonth	74c955924f	sas兼容shiro处理	2024-05-23 10:49:37 +08:00
EightMonth	37a2093a87	sas兼容shiro处理	2024-05-22 18:43:06 +08:00
JEECG	21e156278f	Merge pull request #1016 from EightMonth/sas 基于sas打通三方登录	2024-01-17 13:56:40 +08:00
EightMonth	59fb423d36	打通三方登录	2024-01-16 19:50:33 +08:00
JEECG	10cfcd42c9	Merge pull request #998 from EightMonth/sas 切换为spring authorization server 登录，对应jeecg-boot springboot3_sas分支	2024-01-12 09:43:22 +08:00
EightMonth	52534d92c2	Merge branch 'master' into sas	2024-01-12 09:38:58 +08:00
EightMonth	4ed8270e7d	修改手机登录接口	2024-01-12 09:28:12 +08:00
zhangdaiscott	ffc79bc469	【issues/936】表格操作栏删除当接口失败时，气泡确认框不会消失	2024-01-09 19:14:50 +08:00
zhangdaiscott	77cb17b7c3	升级antd4 table页码同步3.x页面效果	2024-01-09 19:13:36 +08:00
JEECG	27239be92c	Merge pull request #975 from EightMonth/sas sas认证升级	2024-01-07 22:56:06 +08:00
zhangdaiscott	4d1e2c4711	修改几个bug	2024-01-07 17:11:30 +08:00
zhangdaiscott	511f7b782f	Vite性能优化之分包策略	2024-01-04 17:28:56 +08:00
zhangdaiscott	1f68872767	升级依赖	2024-01-04 17:02:19 +08:00
zhangdaiscott	0bb5027962	新版build编译访问报错	2024-01-04 16:28:10 +08:00
zhangdaiscott	0c368fac03	解决表格禁用勾选后，点击全选还是会选中 #5466 【发现vue 3.4.0系列导致此问题，暂时先固定版本】	2024-01-04 16:12:09 +08:00
EightMonth	0ff3188e5f	sas认证升级	2024-01-04 11:06:52 +08:00
zhangdaiscott	0b48bbdc15	2024年首版本发布（antd4和仪表盘大升级）	2024-01-03 19:44:11 +08:00
zhangdaiscott	458b6bfabe	Merge branch 'antd4'	2024-01-03 19:16:08 +08:00
zhangdaiscott	e0e91f348f	2024年首版本发布（antd4大升级）	2024-01-03 13:32:16 +08:00
zhangdaiscott	c82f06efa8	升级antd4的online lib	2024-01-02 21:46:01 +08:00
zhangdaiscott	c15fd703fe	删除无用依赖html2canvas	2023-12-31 17:02:52 +08:00
zhangdaiscott	0dbdd9a77f	新版本发布	2023-12-29 21:41:57 +08:00
zhangdaiscott	313e5a4e53	antd4改造	2023-12-29 21:41:35 +08:00
zhangdaiscott	a72dcdf0ec	修复bug	2023-12-29 21:24:32 +08:00
zhangdaiscott	21e5143937	删除前端仪表盘	2023-12-29 21:24:15 +08:00
zhangdaiscott	d4f134b2b5	升级富文本	2023-12-29 21:24:03 +08:00
zhangdaiscott	308326a5f9	小修改	2023-12-29 21:23:56 +08:00
zhangdaiscott	a588da907d	企业微信支持改造	2023-12-29 21:23:37 +08:00
zhangdaiscott	81381f3b64	UI组件示例代码	2023-12-29 21:22:25 +08:00