Merge branch 'main' into gavin/v4-dev-customrouter-merge

* main: (43 commits) fix(BasicForm): validate Form tip height (vbenjs#3286). close vbenjs#3281 perf(IconPicker): input trigger popover by click (vbenjs#3278) perf(breakpointEnum): 修改enum与breakpoint.less内一致 (vbenjs#3276) fix(DatePicker): zh-CN is not work in DatePicker (vbenjs#3273) perf(ImageUpload): 根据官方示例设置图片回显格式 (vbenjs#3252) chore(deps): bump ant-design-vue and typescript to latest version chore(demo->form): 增加ApiTransfer使用示例. close vbenjs#1760 feat(layout): move setting button to tabs when fold (vbenjs#3264) feat(MultipleTab): add tabs auto collapse interaction in fold mode and setting (vbenjs#3256) chore(i18n): resolve ts type error chore(demo->BasicTree): 增加获取当前tree数据示例. resolve vbenjs#3253 perf(BasicTree): 获取treeData改写成函数 feat(BasicTree): BasicTree组件暴露treeData数据 fix(dept): no parentDept can edit parentDept (vbenjs#3255) fix: validateFields await missing (vbenjs#3254) chore(demo): 自定义列的helpMessage增加tsx和h函数渲染的数据 feat(Table-> CustomerCell): helpMessage支持传递 tsx 和 h函数的数据 refactor: fix type check (vbenjs#3246) refactor: remove cipher old (vbenjs#3245) feat: pinia persist plugin custom serializer (vbenjs#3244) ... # Conflicts: # pnpm-lock.yaml # src/App.vue # src/hooks/web/useI18n.ts # src/layouts/default/header/MultipleHeader.vue # src/layouts/default/index.vue # src/locales/useLocale.ts # src/utils/cache/storageCache.ts
zyt520ham · Nov 15, 2023 · 4aa50c5 · 4aa50c5
2 parents 9ad13d1 + 100f3cf
commit 4aa50c5
Show file tree

Hide file tree

Showing 98 changed files with 1,660 additions and 1,370 deletions.
diff --git a/README.md b/README.md
@@ -164,13 +164,15 @@ Support modern browsers, not IE
 
 ## Maintainer
 
-[@Vben](https://github.com/anncwb)
-[@Jinmao](https://github.com/jinmao88)
+[@Vben](https://github.com/anncwb) [@Jinmao](https://github.com/jinmao88)
 
 ## Thanks
 
 <img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" alt="JetBrains Logo (Main) logo." height="120">
 
+## Star History Chart
+
+[![Star History Chart](https://api.star-history.com/svg?repos=vbenjs/vue-vben-admin&type=Date)](https://star-history.com/#vbenjs/vue-vben-admin&Date)
 
 ## License
 

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -169,10 +169,10 @@ docker run --name vue-vben-admin -d -p 6666:80  -e VG_BASE_URL=http://localhost:
 
 ## 维护者
 
-[@Vben](https://github.com/anncwb)
-[@Jinmao](https://github.com/jinmao88)
+[@Vben](https://github.com/anncwb) [@Jinmao](https://github.com/jinmao88)
 
 ## 感谢
+
 <img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" alt="JetBrains Logo (Main) logo." height='120'>
 
 ## 交流
@@ -181,6 +181,10 @@ docker run --name vue-vben-admin -d -p 6666:80  -e VG_BASE_URL=http://localhost:
 
 - QQ 群 `569291866`
 
+## Star 历史
+
+[![Star History Chart](https://api.star-history.com/svg?repos=vbenjs/vue-vben-admin&type=Date)](https://star-history.com/#vbenjs/vue-vben-admin&Date)
+
 ## License
 
 [MIT © Vben-2020](./LICENSE)
diff --git a/package.json b/package.json
@@ -88,7 +88,7 @@
     "tinymce": "^5.10.7",
     "vditor": "^3.9.4",
     "vue": "^3.3.4",
-    "vue-i18n": "^9.2.2",
+    "vue-i18n": "^9.6.4",
     "vue-json-pretty": "^2.2.4",
     "vue-router": "^4.2.3",
     "vue-types": "^5.1.0",
@@ -133,7 +133,7 @@
     "prettier-plugin-packagejson": "^2.4.4",
     "rimraf": "^5.0.1",
     "turbo": "^1.10.7",
-    "typescript": "^5.1.6",
+    "typescript": "^5.2.2",
     "unbuild": "^1.2.1",
     "vite": "^4.4.0",
     "vite-plugin-mock": "^2.9.6",

diff --git a/src/App.vue b/src/App.vue
@@ -1,30 +1,47 @@
 <template>
-  <ConfigProvider :locale="getAntdLocale" :theme="isDark ? darkTheme : {}">
+  <ConfigProvider :locale="getAntdLocale" :theme="themeConfig">
     <contextHolder />
     <AppProvider>
-            <RouterView />
-<!--      <TestSelectedView />-->
+      <RouterView />
+      <!--      <TestSelectedView />-->
     </AppProvider>
   </ConfigProvider>
 </template>
 
 <script lang="ts" setup>
-  import { ConfigProvider } from 'ant-design-vue';
+  import { computed } from 'vue';
   import { AppProvider } from '@/components/Application';
   import { useTitle } from '@/hooks/web/useTitle';
   import { useLocale } from '@/locales/useLocale';
+  import { ConfigProvider } from 'ant-design-vue';
 
-  import 'dayjs/locale/zh-cn';
   import { useDarkModeTheme } from '@/hooks/setting/useDarkModeTheme';
+
   import { useMessage } from '@/hooks/web/useMessage';
   import TestSelectedView from '@/views/test/TestSelectedView.vue';
 
+  import 'dayjs/locale/zh-cn';
+
   const { contextHolder } = useMessage();
   // support Multi-language
   const { getAntdLocale } = useLocale();
 
   const { isDark, darkTheme } = useDarkModeTheme();
 
+  const themeConfig = computed(() =>
+    Object.assign(
+      {
+        token: {
+          colorPrimary: '#0960bd',
+          colorSuccess: '#55D187',
+          colorWarning: '#EFBD47',
+          colorError: '#ED6F6F',
+          colorInfo: '#0960bd',
+        },
+      },
+      isDark.value ? darkTheme : {},
+    ),
+  );
   // Listening to page changes and dynamically changing site titles
   useTitle();
 </script>
diff --git a/src/api/demo/model/systemModel.ts b/src/api/demo/model/systemModel.ts
@@ -3,6 +3,7 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
 export type AccountParams = BasicPageParams & {
   account?: string;
   nickname?: string;
+  [key: string]: any;
 };
 
 export type RoleParams = {

diff --git a/src/components/Application/src/AppDarkModeToggle.vue b/src/components/Application/src/AppDarkModeToggle.vue
@@ -8,18 +8,11 @@
 <script lang="ts" setup>
   import { computed, unref } from 'vue';
   import { SvgIcon } from '/@/components/Icon';
-  import { useDesign } from '/@/hooks/web/useDesign';
+  import { ThemeEnum } from '/@/enums/appEnum';
   import { useRootSetting } from '/@/hooks/setting/useRootSetting';
-  import {
-    updateTextColor,
-    updateBorderColor,
-    updateHeaderBgColor,
-    updateSidebarBgColor,
-    updateComponentBgColor,
-    updateAppContentBgColor,
-  } from '/@/logics/theme/updateBackground';
+  import { useDesign } from '/@/hooks/web/useDesign';
   import { updateDarkTheme } from '/@/logics/theme/dark';
-  import { ThemeEnum } from '/@/enums/appEnum';
+  import { updateHeaderBgColor, updateSidebarBgColor } from '/@/logics/theme/updateBackground';
 
   const { prefixCls } = useDesign('dark-switch');
   const { getDarkMode, setDarkMode, getShowDarkModeToggle } = useRootSetting();
@@ -37,12 +30,8 @@
     const darkMode = getDarkMode.value === ThemeEnum.DARK ? ThemeEnum.LIGHT : ThemeEnum.DARK;
     setDarkMode(darkMode);
     updateDarkTheme(darkMode);
-    updateTextColor();
-    updateBorderColor();
     updateHeaderBgColor();
     updateSidebarBgColor();
-    updateComponentBgColor();
-    updateAppContentBgColor();
   }
 </script>
 <style lang="less" scoped>
@@ -72,9 +61,7 @@
       z-index: 1;
       width: 18px;
       height: 18px;
-      transition:
-        transform 0.5s,
-        background-color 0.5s;
+      transition: transform 0.5s, background-color 0.5s;
       border-radius: 50%;
       background-color: #fff;
       will-change: transform;

diff --git a/src/components/Basic/src/BasicHelp.vue b/src/components/Basic/src/BasicHelp.vue
@@ -1,5 +1,5 @@
 <script lang="tsx">
-  import type { CSSProperties, PropType } from 'vue';
+  import type { CSSProperties, PropType, VNodeChild } from 'vue';
   import { defineComponent, computed, unref } from 'vue';
   import { Tooltip } from 'ant-design-vue';
   import { InfoCircleOutlined } from '@ant-design/icons-vue';
@@ -36,7 +36,9 @@
     /**
      * Help text list
      */
-    text: { type: [Array, String] as PropType<string[] | string> },
+    text: {
+      type: [Array, String, Object] as PropType<string[] | string | VNodeChild | JSX.Element>,
+    },
   };
 
   export default defineComponent({
@@ -71,7 +73,7 @@
             );
           });
         }
-        return null;
+        return <div>{textList}</div>;
       }
 
       return () => {

diff --git a/src/components/Form/index.ts b/src/components/Form/index.ts
@@ -15,6 +15,5 @@ export { default as ApiRadioGroup } from './src/components/ApiRadioGroup.vue';
 export { default as ApiCascader } from './src/components/ApiCascader.vue';
 export { default as ApiCascaderV1 } from './src/components/ApiCascaderV1.vue';
 export { default as ApiTransfer } from './src/components/ApiTransfer.vue';
-export { default as ImageUpload } from './src/components/ImageUpload.vue';
 
 export { BasicForm };
diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue
@@ -341,13 +341,13 @@
         margin: 0 6px 0 2px;
       }
 
-      &-with-help {
-        margin-bottom: 0;
-      }
+      // &-with-help {
+      //   margin-bottom: 0;
+      // }
 
-      &:not(.ant-form-item-with-help) {
-        margin-bottom: 20px;
-      }
+      // &:not(.ant-form-item-with-help) {
+      //   margin-bottom: 20px;
+      // }
 
       &.suffix-item {
         .ant-form-item-children {

diff --git a/src/components/Form/src/componentMap.ts b/src/components/Form/src/componentMap.ts
@@ -27,8 +27,7 @@ import ApiTree from './components/ApiTree.vue';
 import ApiTreeSelect from './components/ApiTreeSelect.vue';
 import ApiCascader from './components/ApiCascader.vue';
 import ApiTransfer from './components/ApiTransfer.vue';
-import ImageUpload from './components/ImageUpload.vue';
-import { BasicUpload } from '/@/components/Upload';
+import { BasicUpload, ImageUpload } from '/@/components/Upload';
 import { StrengthMeter } from '/@/components/StrengthMeter';
 import { IconPicker } from '/@/components/Icon';
 import { CountdownInput } from '/@/components/CountDown';

diff --git a/src/components/Form/src/components/ApiSelect.vue b/src/components/Form/src/components/ApiSelect.vue
@@ -32,7 +32,7 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import { propTypes } from '/@/utils/propTypes';
 
-  type OptionsItem = { label: string; value: string; disabled?: boolean };
+  type OptionsItem = { label?: string; value?: string; disabled?: boolean; [name: string]: any };
 
   export default defineComponent({
     name: 'ApiSelect',
@@ -127,6 +127,8 @@
           console.warn(error);
         } finally {
           loading.value = false;
+          // reset status
+          isFirstLoaded.value = false;
         }
       }
 

diff --git a/src/components/Form/src/components/FormItem.vue b/src/components/Form/src/components/FormItem.vue
@@ -277,7 +277,6 @@
         const { autoSetPlaceHolder, size } = props.formProps;
         const propsData: Recordable<any> = {
           allowClear: true,
-          getPopupContainer: (trigger: Element) => trigger.parentNode,
           size,
           ...unref(getComponentsProps),
           disabled: unref(getDisable),