Merge branch 'antd4'

.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"]]
 

.gitignore

@@ -22,6 +22,7 @@ pnpm-debug.log*
 
 # Editor directories and files
 .idea
+.svn
 # .vscode
 *.suo
 *.ntvs*

LICENSE

@@ -32,4 +32,6 @@ SOFTWARE.
 	 违反此条款属于侵权行为，须赔偿侵权经济损失，同时立即停止著作权侵权行为。
 	 
    总结：在遵循Apache开源协议和开源协议补充条款下，允许商用使用，不会造成侵权行为！
-	 解释权归：http://www.jeecg.com
+	 解释权归：
+   http://www.jeecg.com
+   http://guojusoft.com

README.md

@@ -1,11 +1,11 @@
 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)
 

build/generate/generateModifyVars.ts

@@ -1,11 +1,21 @@
-import { generateAntColors, primaryColor } from '../config/themeConfig';
+import { primaryColor } from '../config/themeConfig';
-import { getThemeVariables } from 'ant-design-vue/dist/theme';
+// 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,

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());
 

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'),
       ],

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>

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,8 +21,7 @@
     "husky:install": "husky install"
   },
   "dependencies": {
-    "@jeecg/online": "3.6.0-beta",
+    "@jeecg/online": "3.6.2-beta",
-    "@qiaoqiaoyun/drag-free": "^1.1.4",
     "@iconify/iconify": "^3.1.1",
     "@ant-design/colors": "^7.0.0",
     "@ant-design/icons-vue": "^6.1.0",
@@ -32,8 +31,9 @@
     "@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.6",
     "axios": "^1.5.0",
     "china-area-data": "^5.0.1",
     "clipboard": "^2.0.11",
@@ -61,7 +61,7 @@
     "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-cropper": "^0.6.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",

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绘制的图片样式
+  // update-begin--author:liaozhiyang---date:20230803---for：【QQYUN-5839】windi会影响到html2canvas绘制的图片样式
-img{display:inline-block;}
+  img {
-// update-end--author:liaozhiyang---date:20230803---for：【QQYUN-5839】windi会影响到html2canvas绘制的图片样式
+    display: inline-block;
+  }
+  // update-end--author:liaozhiyang---date:20230803---for：【QQYUN-5839】windi会影响到html2canvas绘制的图片样式
 </style>

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;

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;

src/components/Button/src/PopConfirmButton.vue

@@ -30,13 +30,30 @@
 
       // get inherit binding value
       const getBindValues = computed(() => {
-        return Object.assign(
+        // update-begin--author:liaozhiyang---date:20231228---for：【issues/936】表格操作栏删除当接口失败时，气泡确认框不会消失
+        const result: any = Object.assign(
           {
             okText: t('common.okText'),
             cancelText: t('common.cancelText'),
           },
           { ...props, ...unref(attrs) }
         );
+        if (result.onConfirm) {
+          const confirm = result.confirm;
+          result.onConfirm = () => {
+            return new Promise<void>((resolve) => {
+              confirm()
+                ?.finally(() => {
+                  resolve();
+                })
+                .catch((err) => {
+                  console.log(err);
+                });
+            });
+          };
+        }
+        return result;
+        // update-end--author:liaozhiyang---date:20231228---for：【issues/936】表格操作栏删除当接口失败时，气泡确认框不会消失
       });
 
       return () => {

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() {

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>

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: {

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

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>) => {

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),

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;
+}
 
 /**
  * 时间字段

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

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'],

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(''),
       // 代码提示

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),

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>

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;
         });
       }
 

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 {

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;
           });

src/components/Form/src/jeecg/components/JSearchSelect.vue

@@ -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]下拉搜索框遮挡问题
@@ -288,7 +288,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的逻辑永远走不进去，把它挪到前面判断

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);
         }

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 }

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"

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'],

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,

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>
+          <div style="margin-left: 10px">
-            <a-checkbox v-model:checked="checkStatus[item.id]" />
+            <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: () => [],

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'],

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'],

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>
 
           <!-- 部门用户 -->

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;

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;

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,
           },

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评论区域样式*/

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,
     });

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 {
+        // update-begin--author:liaozhiyang---date:20231205---for：【QQYUN-7147】Model的高度设置不生效
-          minHeight: `${props.minHeight}px`,
+        if (props.fullScreen) {
-          [props.fullScreen ? 'height' : 'maxHeight']: `${unref(realHeightRef)}px`,
+          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(() => {

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>) => {

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;
     }

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 },
 });

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[];
 

src/components/SimpleMenu/src/components/SubMenuItem.vue

@@ -16,8 +16,8 @@
       placement="right"
       :overlayClassName="`${prefixCls}-menu-popover`"
       v-else
-      :visible="getIsOpend"
+      :open="getIsOpend"
-      @visibleChange="handleVisibleChange"
+      @openChange="handleVisibleChange"
       :overlayStyle="getOverlayStyle"
       :align="{ offset: [0, 0] }"
     >

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;

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;
+        // background-color: #323232;
-        border-color: #424242;
+        // border-color: #424242;
       }
     }
   }
@@ -523,8 +527,8 @@
     //表格选择工具栏样式
     .alert {
       height: 38px;
-      background-color: #e6f7ff;
+      // background-color: #e6f7ff;
-      border-color: #91d5ff;
+      // border-color: #91d5ff;
     }
     &--inset {
       .ant-table-wrapper {

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 };

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>

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 } : {}),
     },
     {

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;
       });

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) {

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;

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;

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/models/dom';
-  import 'tinymce/plugins/anchor';
+
-  import 'tinymce/plugins/autolink';
+  // tinymce插件可按自己的需要进行导入
-  import 'tinymce/plugins/autosave';
+  // 更多插件参考：https://www.tiny.cloud/docs/plugins/
-  import 'tinymce/plugins/code';
-  import 'tinymce/plugins/codesample';
-  import 'tinymce/plugins/directionality';
   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[]>,
+      type: [Array as PropType<string[]>, String],
-      default: plugins,
+      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

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 = {

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>

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"

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>
 

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 行编辑升级

src/components/jeecg/OnLine/hooks/usePopBiz.ts

@@ -206,7 +206,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
             },
           });
         }
@@ -777,7 +783,7 @@ export function usePopBiz(ob, tableRef?) {
       title: '',
       okText: '关闭',
       width: '100%',
-      visible: false,
+      open: false,
       destroyOnClose: true,
       style: dialogStyle,
       // dialogStyle: dialogStyle,
@@ -791,8 +797,8 @@ export function usePopBiz(ob, tableRef?) {
       cancelButtonProps: { style: { display: 'none' } },
     },
     on: {
-      ok: () => (hrefComponent.value.model.visible = false),
+      ok: () => (hrefComponent.value.model.open = false),
-      cancel: () => (hrefComponent.value.model.visible = false),
+      cancel: () => (hrefComponent.value.model.open = false),
     },
     is: <any>null,
     params: {},
@@ -816,7 +822,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)));
   }

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;
       }
     }
   }

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>

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
+  app.use(Select)
-    .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组件完成！");
 }

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：【QQYUN-6374】UnoCSS替代windicss导致应用样式问题--
+//update-begin---author:scott ---date:2023-08-28  for<EFBFBD><EFBFBD><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：【QQYUN-6374】UnoCSS替代windicss导致应用样式问题--
+//update-end---author:scott ---date::2023-08-28  for<EFBFBD><EFBFBD><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,64 @@
   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

src/design/index.less

@@ -22,6 +22,8 @@ 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表单多了一个蓝色的边框

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>

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;
       }

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);
       }
     }

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>

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>

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>

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;

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%;

src/layouts/default/sider/index.vue

@@ -5,7 +5,7 @@
     :class="prefixCls"
     :width="getMenuWidth"
     :getContainer="null"
-    :visible="!getCollapsed"
+    :open="!getCollapsed"
     @close="handleClose"
   >
     <Sider />

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;
         }
       }
 

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>

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,

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);

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直接静默登录】流程办理登录页面 中转跳转

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',

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';

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一致，再刷新---
 }
 
 /**

src/utils/http/axios/index.ts

@@ -245,6 +245,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
         // authentication schemes，e.g: Bearer
         // authenticationScheme: 'Bearer',
         authenticationScheme: '',
+        //接口超时设置
         timeout: 10 * 1000,
         // 基础接口地址
         // baseURL: globSetting.apiUrl,

src/views/demo/document/form/BasicFiledsLayotForm.vue

@@ -0,0 +1,81 @@
+<!-- 标题与字段布局 -->
+<template>
+  <!-- 自定义表单 -->
+  <BasicForm @register="registerForm" @submit="handleSubmit" style="margin: 20px auto"/>
+</template>
+
+<script lang="ts" setup>
+  //引入依赖
+  import { useForm, BasicForm, FormSchema } from '/@/components/Form';
+
+  //自定义表单字段
+  const formSchemas: FormSchema[] = [
+    {
+      label: '姓名',
+      field: 'name',
+      component: 'Input',
+    },
+    {
+      label: '年龄',
+      field: 'password',
+      component: 'InputNumber',
+    },
+    {
+      label: '生日',
+      field: 'birthday',
+      component: 'DatePicker',
+    },
+    {
+      label: '头像',
+      field: 'avatar',
+      component: 'JImageUpload',
+    },
+  ];
+
+  /**
+   * BasicForm绑定注册;
+   */
+  const [registerForm] = useForm({
+    //注册表单列
+    schemas: formSchemas,
+    showActionButtonGroup: false,
+    actionColOptions: { span: 12 },
+    //控制标题宽度占比
+    labelCol: {
+      xs: 2,
+      sm: 2,
+      md: 2,
+      lg: 9,
+      xl: 3,
+      xxl: 2,
+    },
+    //控制组件宽度占比
+    wrapperCol: {
+      xs: 15,
+      sm: 14,
+      md: 16,
+      lg: 17,
+      xl: 19,
+      xxl: 20,
+    },
+  });
+
+  /**
+   * 点击提交按钮的value值
+   * @param values
+   */
+  function handleSubmit(values: any) {
+    console.log('提交按钮数据::::', values);
+  }
+</script>
+
+<style scoped>
+  /** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-picker) {
+    width: 100%;
+  }
+</style>

src/views/demo/document/form/BasicFixedWidthForm.vue

@@ -0,0 +1,70 @@
+<!-- 固定label标题的宽度 -->
+<template>
+  <!-- 自定义表单 -->
+  <BasicForm @register="registerForm" @submit="handleSubmit" style="margin-top: 20px" />
+</template>
+
+<script lang="ts" setup>
+  //引入依赖
+  import { useForm, BasicForm, FormSchema } from '/@/components/Form';
+
+  //自定义表单字段
+  const formSchemas: FormSchema[] = [
+    {
+      label: '姓名',
+      field: 'name',
+      component: 'Input',
+    },
+    {
+      label: '年龄',
+      field: 'password',
+      component: 'InputNumber',
+    },
+    {
+      label: '生日',
+      field: 'birthday',
+      component: 'DatePicker',
+    },
+    {
+      label: '头像',
+      field: 'avatar',
+      component: 'JImageUpload',
+    },
+  ];
+
+  /**
+   * BasicForm绑定注册;
+   */
+  const [registerForm] = useForm({
+    //注册表单列
+    schemas: formSchemas,
+    showResetButton: false,
+    submitButtonOptions: { text: '提交', preIcon: '' },
+    actionColOptions: { span: 17 },
+    //使用labelWidth控制标题宽度
+    labelWidth: '150px',
+    //使用labelCol的样式属性来控制标题宽度
+    labelCol: { style: { width: '150px' } },
+    //标题对齐方式（left:左对齐，right：右对齐），默认右对齐
+    labelAlign: 'right',
+  });
+
+  /**
+   * 点击提交按钮的value值
+   * @param values
+   */
+  function handleSubmit(values: any) {
+    console.log('提交按钮数据::::', values);
+  }
+</script>
+
+<style scoped>
+  /** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-picker) {
+    width: 100%;
+  }
+</style>

src/views/demo/document/form/BasicFormAdd.vue

@@ -0,0 +1,143 @@
+<!-- 动态增减表单 -->
+<template>
+  <!-- 自定义表单 -->
+  <BasicForm @register="registerForm" style="margin-top: 20px;" @submit="handleSubmit">
+    <!--  添加input的插槽  -->
+    <template #addForm="{ field }">
+      <a-button v-if="Number(field) === 0" @click="addField" style="width: 50px">+</a-button>
+      <a-button v-if="Number(field) > 0" @click="delField(field)" style="width: 50px">-</a-button>
+    </template>
+  </BasicForm>
+  <!--  <div style="margin: 20px auto; text-align: center">
+    <a-button @click="addField">添加表单项</a-button>
+  </div>-->
+</template>
+
+<script lang="ts" setup>
+  //引入依赖
+  import { useForm, BasicForm, FormSchema } from '/@/components/Form';
+  import { CollapseContainer } from '/@/components/Container';
+  import { ref } from '@vue/runtime-core';
+
+  //自定义表单字段
+  const formSchemas: FormSchema[] = [
+    {
+      field: 'name1',
+      label: '姓名1',
+      component: 'Input',
+      // ifShow:false,
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      field: 'age1',
+      label: '年龄1',
+      component: 'InputNumber',
+      // ifShow:false,
+      colProps: {
+        span: 8,
+      },
+    },
+    {
+      field: '0',
+      component: 'Input',
+      // ifShow:false,
+      label: ' ',
+      colProps: {
+        span: 8,
+      },
+      slot: 'addForm',
+    },
+  ];
+
+  /**
+   * BasicForm绑定注册;
+   * appendSchemaByField:增加表单项（字段）
+   *
+   * removeSchemaByFiled:减少表单项（字段）
+   */
+  const [registerForm, { appendSchemaByField, removeSchemaByFiled }] = useForm({
+    schemas: formSchemas,
+    showResetButton: false,
+    labelWidth: '150px',
+    // showSubmitButton:false
+    submitButtonOptions: { text: '提交', preIcon: '' },
+    actionColOptions: { span: 17 },
+  });
+
+  //组件个数
+  let n = ref<number>(2);
+
+  /**
+   * 添加字段
+   * appendSchemaByField类型: ( schema: FormSchema, prefixField: string | undefined, first?: boolean | undefined ) => Promise<void>
+   * 说明: 插入到指定 filed 后面，如果没传指定 field，则插入到最后,当 first = true 时插入到第一个位置
+   */
+  async function addField() {
+    //添加表单字段，里面为schemas对应的属性，可自行配置
+    await appendSchemaByField(
+      {
+        field: `name${n.value}`,
+        component: 'Input',
+        label: '字段' + n.value,
+        colProps: {
+          span: 8,
+        },
+      },
+      ''
+    );
+    await appendSchemaByField(
+      {
+        field: `sex${n.value}`,
+        component: 'InputNumber',
+        label: '字段' + n.value,
+        colProps: {
+          span: 8,
+        },
+      },
+      ''
+    );
+
+    await appendSchemaByField(
+      {
+        field: `${n.value}`,
+        component: 'Input',
+        label: ' ',
+        colProps: {
+          span: 8,
+        },
+        slot: 'addForm',
+      },
+      ''
+    );
+    n.value++;
+  }
+
+  /**
+   * 删除字段
+   * 类型: (field: string | string[]) => Promise<void>
+   * 说明: 根据 field 删除 Schema
+   * @param field 当前字段名称
+   */
+  function delField(field) {
+    //移除指定字段
+    removeSchemaByFiled([`name${field}`, `sex${field}`, `${field}`]);
+    n.value--;
+  }
+
+  /**
+   * 点击提交按钮的value值
+   * @param values
+   */
+  function handleSubmit(values: any) {
+    console.log('提交按钮数据::::', values);
+  }
+</script>
+
+<style scoped>
+  /** 数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+</style>

src/views/demo/document/form/BasicFormBtn.vue

@@ -0,0 +1,66 @@
+<!-- 操作按钮 -->
+<template>
+  <div style="margin: 20px auto; text-align: center">
+    <!-- 通过setProps 可以设置 userForm 中的属性 -->
+    <!--  showActionButtonGroup 显示或者隐藏查询、重置按钮  -->
+    <a-button @click="setProps({ showActionButtonGroup: false })" class="mr-2"> 隐藏操作按钮 </a-button>
+    <a-button @click="setProps({ showActionButtonGroup: true })" class="mr-2"> 显示操作按钮 </a-button>
+    <!--  showActionButtonGroup 显示或者隐藏重置按钮  -->
+    <a-button @click="setProps({ showResetButton: false })" class="mr-2"> 隐藏重置按钮 </a-button>
+    <a-button @click="setProps({ showResetButton: true })" class="mr-2"> 显示重置按钮 </a-button>
+    <!--  showActionButtonGroup 显示或者隐藏查询按钮  -->
+    <a-button @click="setProps({ showSubmitButton: false })" class="mr-2"> 隐藏查询按钮 </a-button>
+    <a-button @click="setProps({ showSubmitButton: true })" class="mr-2"> 显示查询按钮 </a-button>
+  </div>
+  <!-- 自定义表单 -->
+  <BasicForm @register="registerForm" @submit="handleSubmit" style="margin-top: 50px; margin-left: 50px" />
+</template>
+
+<script lang="ts" setup>
+  //引入依赖
+  import { useForm, BasicForm, FormSchema } from '/@/components/Form';
+  import { CollapseContainer } from '/@/components/Container';
+
+  /**
+   * BasicForm绑定注册;
+   * setProps方法可以动态设置useForm中的属性
+   */
+  const [registerForm, { setProps }] = useForm({
+    //自定义查询按钮的文本和图标
+    submitButtonOptions: { text: '查询', preIcon: '' },
+    //自定义重置按钮的文本和图标
+    resetButtonOptions: { text: '重置', preIcon: '' },
+    //操作按钮的位置
+    actionColOptions: { span: 17 },
+    //提交按钮的自定义事件
+    submitFunc: customSubmitFunc,
+    //重置按钮的自定义时间
+    resetFunc: customSubmitFunc,
+    //显示操作按钮
+    showActionButtonGroup: true,
+  });
+
+  /**
+   * 查询按钮点击事件
+   */
+  async function customSubmitFunc() {
+    console.log('查询按钮点击事件，此处处理查询按钮的逻辑');
+  }
+
+  /**
+   * 重置按钮点击事件
+   */
+  async function customResetFunc() {
+    console.log('重置按钮点击事件，此处处理重置按钮的逻辑');
+  }
+
+  /**
+   * 点击提交按钮的value值
+   * @param values
+   */
+  function handleSubmit(values: any) {
+    console.log('提交按钮数据::::', values);
+  }
+</script>
+
+<style scoped></style>

src/views/demo/document/form/BasicFormCleanRule.vue

@@ -0,0 +1,95 @@
+<!-- 操作禁用表单 -->
+<template>
+  <div style="margin: 20px auto; text-align: center">
+    <!-- all 触发或清空所有验证，visitor 只触发或者清空来访人员验证 -->
+    <a-button @click="triggerFormRule('all')" class="mr-2"> 触发表单验证 </a-button>
+    <a-button @click="cancelFormRule('all')" class="mr-2"> 清空表单验证 </a-button>
+    <a-button @click="triggerFormRule('visitor')" class="mr-2"> 只验证来访人员 </a-button>
+    <a-button @click="cancelFormRule('visitor')" class="mr-2"> 只清空来访人员验证 </a-button>
+  </div>
+  <!-- 自定义表单 -->
+  <BasicForm @register="registerForm" style="margin-top: 20px;" />
+</template>
+
+<script lang="ts" setup>
+  //引入依赖
+  import { useForm, BasicForm, FormSchema } from '/@/components/Form';
+
+  //自定义表单字段
+  const formSchemas: FormSchema[] = [
+    {
+      field: 'visitor',
+      label: '来访人员',
+      component: 'Input',
+      required: true,
+    },
+    {
+      field: 'accessed',
+      label: '来访日期',
+      component: 'DatePicker',
+      required: true,
+    },
+    {
+      field: 'phone',
+      label: '来访人手机号',
+      component: 'Input',
+      required: true,
+    },
+  ];
+
+  /**
+   * BasicForm绑定注册;
+   * clearValidate 清除所有验证，支持取消验证其中几个字段 如 clearValidate(['visitor',...])
+   * validate 验证所有,支持验证其中几个字段，validate(['visitor',...])
+   * validateFields 只支持验证其中几个字段，如validateFields(['visitor',...])
+   */
+  const [registerForm, { clearValidate, validateFields, validate }] = useForm({
+    schemas: formSchemas,
+    labelWidth: '150px',
+    //隐藏操作按钮
+    showActionButtonGroup: false,
+    //默认聚焦第一个，只支持input
+    autoFocusFirstItem: true,
+  });
+
+  /**
+   * 触发表单验证
+   * @param type all 所有验证 visitor 只验证来访人员
+   */
+  async function triggerFormRule(type) {
+    if (type == 'all') {
+      //触发所有验证
+      await validate();
+    } else {
+      //触发来访人员验证
+      //visitor 来访人员的对应formSchemas field字段
+      await validateFields(['visitor']);
+    }
+  }
+
+  /**
+   * 触发表单验证
+   * @param type all 所有验证 visitor 只验证来访人员
+   */
+  async function cancelFormRule(type) {
+    if (type == 'all') {
+      //取消全部验证
+      await clearValidate();
+    } else {
+      //只取消来访人员的验证
+      //visitor 来访人员的对应formSchemas field字段
+      await clearValidate(['visitor']);
+    }
+  }
+</script>
+
+<style scoped>
+  /** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-picker) {
+    width: 100%;
+  }
+</style>

src/views/demo/document/form/BasicFormCompact.vue

@@ -0,0 +1,58 @@
+<!-- 操作禁用表单 -->
+<template>
+  <div style="margin: 20px auto; text-align: center">
+    <!-- 通过setProps 可以设置 userForm 中的属性 -->
+    <!-- 表单大小，默认为 default   -->
+    <a-button @click="setProps({ size: 'large' })" class="mr-2"> 更改大小为最大 </a-button>
+    <a-button @click="setProps({ size: 'default' })" class="mr-2"> 还原大小 </a-button>
+    <a-button @click="setProps({ size: 'small' })" class="mr-2"> 更改大小为最小 </a-button>
+    <!--  disabled表单禁用  -->
+    <a-button @click="setProps({ disabled: true })" class="mr-2"> 禁用表单 </a-button>
+    <a-button @click="setProps({ disabled: false })" class="mr-2"> 解除禁用 </a-button>
+    <!--  compact 是否为紧凑表单  -->
+    <a-button @click="setProps({ compact: true })" class="mr-2"> 紧凑表单 </a-button>
+    <a-button @click="setProps({ compact: false })" class="mr-2"> 还原正常间距 </a-button>
+  </div>
+  <!-- 自定义表单 -->
+  <BasicForm @register="registerForm" style="margin-top: 20px;" />
+</template>
+
+<script lang="ts" setup>
+  //引入依赖
+  import { useForm, BasicForm, FormSchema } from '/@/components/Form';
+  import { CollapseContainer } from '/@/components/Container';
+
+  //自定义表单字段
+  const formSchemas: FormSchema[] = [
+    {
+      field: 'visitor',
+      label: '来访人员',
+      component: 'Input',
+    },
+    {
+      field: 'accessed',
+      label: '来访日期',
+      component: 'DatePicker',
+    },
+    {
+      field: 'phone',
+      label: '来访人手机号',
+      component: 'Input',
+    },
+  ];
+
+  /**
+   * BasicForm绑定注册;
+   * setProps方法可以动态设置useForm中的属性
+   */
+  const [registerForm, { setProps }] = useForm({
+    schemas: formSchemas,
+    labelWidth: '150px',
+    //隐藏操作按钮
+    showActionButtonGroup: false,
+    //默认聚焦第一个，只支持input
+    autoFocusFirstItem: true,
+  });
+</script>
+
+<style scoped></style>

src/views/demo/document/form/BasicFormComponent.vue

@@ -0,0 +1,34 @@
+<!-- 操作表单值 -->
+<template>
+  <!-- 自定义表单 -->
+  <BasicForm @register="registerForm" style="margin-top: 20px;" />
+</template>
+
+<script lang="ts" setup>
+  //引入依赖
+  import { useForm, BasicForm, FormSchema } from '/@/components/Form';
+  import { schemas } from './example.data';
+
+  /**
+   * BasicForm绑定注册;
+   */
+  const [registerForm, { getFieldsValue, setFieldsValue, resetFields, validate }] = useForm({
+    schemas: schemas,
+    labelWidth: '150px',
+    //隐藏操作按钮
+    showActionButtonGroup: false,
+    //默认聚焦第一个，只支持input
+    autoFocusFirstItem: true,
+  });
+</script>
+
+<style scoped>
+  /** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-picker) {
+    width: 100%;
+  }
+</style>

src/views/demo/document/form/BasicFormConAttribute.vue

@@ -0,0 +1,63 @@
+<!-- 控件属性 -->
+<template>
+  <!-- 自定义表单 -->
+  <BasicForm @register="registerForm" style="margin-top: 20px" />
+</template>
+
+<script lang="ts" setup>
+  //引入依赖
+  import { useForm, BasicForm, FormSchema } from '/@/components/Form';
+
+  //自定义表单字段
+  const formSchemas: FormSchema[] = [
+    {
+      label: '员工姓名',
+      field: 'name',
+      component: 'Input',
+      componentProps: {
+        disabled: true,
+      },
+      defaultValue: '张三',
+    },
+    {
+      label: '性别',
+      field: 'sex',
+      component: 'Select',
+      //填写组件的属性
+      componentProps: {
+        options: [
+          { label: '男', value: 1 },
+          { label: '女', value: 2 },
+          { label: '未知', value: 3 },
+        ],
+      },
+      //默认值
+      defaultValue: 3,
+    },
+    {
+      label: '年龄',
+      field: 'age',
+      component: 'Input',
+    },
+    {
+      label: '入职时间',
+      subLabel: '( 选填 )',
+      field: 'entryTime',
+      component: 'TimePicker',
+    },
+  ];
+
+  /**
+   * BasicForm绑定注册;
+   */
+  const [registerForm] = useForm({
+    //注册表单列
+    schemas: formSchemas,
+    labelWidth: '150px',
+    showResetButton: false,
+    submitButtonOptions: { text: '提交', preIcon: '' },
+    actionColOptions: { span: 17 },
+  });
+</script>
+
+<style scoped></style>

src/views/demo/document/form/BasicFormCustom.vue

@@ -0,0 +1,32 @@
+<!-- 自定义组件 -->
+<template>
+  <!-- 自定义表单 -->
+  <BasicForm @register="registerForm" style="margin-top: 20px" />
+</template>
+
+<script lang="ts" setup>
+  //引入依赖
+  import { useForm, BasicForm, FormSchema } from '/@/components/Form';
+
+  //自定义表单字段
+  const formSchemas: FormSchema[] = [
+    {
+      field: 'custom',
+      label: '自定义组件',
+      //引入自定义组件
+      component: 'JInput',
+    },
+  ];
+
+  /**
+   * BasicForm绑定注册;
+   */
+  const [registerForm] = useForm({
+    //注册表单列
+    schemas: formSchemas,
+    labelWidth: '150px',
+    showActionButtonGroup: false,
+  });
+</script>
+
+<style scoped></style>

src/views/demo/document/form/BasicFormCustomComponent.vue

@@ -0,0 +1,32 @@
+<!-- 操作表单值 -->
+<template>
+  <!-- 自定义表单 -->
+  <BasicForm @register="registerForm" style="margin-top: 20px" />
+</template>
+
+<script lang="ts" setup>
+  //引入依赖
+  import { useForm, BasicForm, FormSchema } from '/@/components/Form';
+  import { schemas } from './exampleCustom.data';
+
+  /**
+   * BasicForm绑定注册;
+   */
+  const [registerForm, { getFieldsValue, setFieldsValue, resetFields, validate }] = useForm({
+    schemas: schemas,
+    labelWidth: '150px',
+    //隐藏操作按钮
+    showActionButtonGroup: false,
+  });
+</script>
+
+<style scoped>
+  /** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-picker) {
+    width: 100%;
+  }
+</style>

src/views/demo/document/form/BasicFormCustomSlots.vue

@@ -0,0 +1,64 @@
+<!-- 插槽 -->
+<template>
+  <!-- 自定义表单 -->
+  <BasicForm @register="registerForm" style="margin-top: 20px" @submit="handleSubmit">
+      <!--  #name对应的是formSchemas对应slot(name)插槽    -->
+      <template #name="{ model, field }">
+        <JInput v-model:value="model[field]" />
+      </template>
+  </BasicForm>
+</template>
+
+<script lang="ts" setup>
+  //引入依赖
+  import { useForm, BasicForm, FormSchema } from '/@/components/Form';
+  //引入CustomDemo自定义组件
+  import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+
+  //自定义表单字段
+  const formSchemas: FormSchema[] = [
+    {
+      field: 'name',
+      label: '姓名',
+      component: 'Input',
+      slot:'name'
+    },
+    {
+      field: 'phone',
+      label: '联系方式',
+      component: 'Input',
+    },
+    {
+      field: 'feedback',
+      label: '问题反馈',
+      component: 'InputTextArea',
+    },
+  ];
+
+  /**
+   * BasicForm绑定注册;
+   */
+  const [registerForm] = useForm({
+    //注册表单列
+    schemas: formSchemas,
+    showResetButton: false,
+    labelWidth: '150px',
+    submitButtonOptions: { text: '提交', preIcon: '' },
+    actionColOptions: { span: 17 },
+  });
+
+  /**
+   * 提交信息
+   */
+  function handleSubmit(values) {
+    console.log("values::",values);
+  }
+</script>
+
+<style scoped>
+  .font-color {
+    font-size: 13px;
+    color: #a1a1a1;
+    margin-bottom: 5px;
+  }
+</style>