diff --git a/.github/workflows/sync-to-gitee.yml b/.github/workflows/sync-to-gitee.yml
index 85e865b5f..8e4c47aec 100644
--- a/.github/workflows/sync-to-gitee.yml
+++ b/.github/workflows/sync-to-gitee.yml
@@ -21,7 +21,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
- node-version: '16'
+ node-version: '18'
registry-url: https://registry.npmjs.com/
- name: Setup pnpm
diff --git a/src/components/basic/button/button.vue b/src/components/basic/button/button.vue
index b491247fe..b3582f960 100644
--- a/src/components/basic/button/button.vue
+++ b/src/components/basic/button/button.vue
@@ -1,15 +1,15 @@
-
+
-
+
-
+
-
-
diff --git a/src/components/core/dynamic-table/index.ts b/src/components/core/dynamic-table/index.ts
index f5ffbd2cd..602c6215d 100644
--- a/src/components/core/dynamic-table/index.ts
+++ b/src/components/core/dynamic-table/index.ts
@@ -1,6 +1,6 @@
import DynamicTable from './src/dynamic-table.vue';
-import type { DefineComponent, Ref } from 'vue';
-import type { DynamicTableInstance, DynamicTableProps } from './src/dynamic-table';
+import type { Ref } from 'vue';
+import type { DynamicTableInstance } from './src/dynamic-table';
export { DynamicTable };
export * from './src/types/';
@@ -9,5 +9,4 @@ export * from './src/dynamic-table';
export type DynamicTableRef = Ref;
-// TODO 暂时是为了解决ts error(如果你有解决方法 请务必联系我~): JSX element type 'DynamicTable' does not have any construct or call signatures.
-export default DynamicTable as unknown as DefineComponent>;
+export default DynamicTable;
diff --git a/src/components/core/dynamic-table/src/hooks/useColumns.tsx b/src/components/core/dynamic-table/src/hooks/useColumns.tsx
index dda1d852f..6b1f59c60 100644
--- a/src/components/core/dynamic-table/src/hooks/useColumns.tsx
+++ b/src/components/core/dynamic-table/src/hooks/useColumns.tsx
@@ -54,6 +54,7 @@ export const useColumns = ({ state, methods, props, tableAction }: UseTableColum
} as TableColumn);
}
+ // @ts-ignore
innerColumns.value = columns.map((item) => {
const customRender = item.customRender;
diff --git a/src/components/core/schema-form/index.ts b/src/components/core/schema-form/index.ts
index 2c85591a9..b8d606ec6 100644
--- a/src/components/core/schema-form/index.ts
+++ b/src/components/core/schema-form/index.ts
@@ -1,7 +1,5 @@
import SchemaForm from './src/schema-form.vue';
import SchemaFormItem from './src/schema-form-item.vue';
-import type { DefineComponent } from 'vue';
-import type { SchemaFormProps } from './src/schema-form';
export * from './src/types/';
export * from './src/schema-form';
@@ -11,5 +9,4 @@ export * from './src/components/';
export { SchemaForm, SchemaFormItem };
-// TODO 暂时是为了解决ts error(如果你有解决方法 请务必联系我~): JSX element type 'SchemaForm' does not have any construct or call signatures.
-export default SchemaForm as unknown as DefineComponent>;
+export default SchemaForm;
diff --git a/src/components/core/schema-form/src/hooks/useFormEvents.ts b/src/components/core/schema-form/src/hooks/useFormEvents.ts
index 5d30cd575..22f5882aa 100644
--- a/src/components/core/schema-form/src/hooks/useFormEvents.ts
+++ b/src/components/core/schema-form/src/hooks/useFormEvents.ts
@@ -129,6 +129,7 @@ export function useFormEvents(formActionContext: UseFormActionContext) {
* @description: 根据 field 删除 Schema
*/
async function removeSchemaByField(fields: string | string[]): Promise {
+ // @ts-ignore
const schemaList = cloneDeep(unref(formSchemasRef));
if (!fields) {
diff --git a/src/hooks/useModal/modal.tsx b/src/hooks/useModal/modal.tsx
index ee0b6a362..979412399 100644
--- a/src/hooks/useModal/modal.tsx
+++ b/src/hooks/useModal/modal.tsx
@@ -1,26 +1,21 @@
import { defineComponent, watch, ref, computed, unref } from 'vue';
import { omit } from 'lodash-es';
-import { ConfigProvider } from 'ant-design-vue';
import type { HookModalProps } from './types';
import { isFunction } from '@/utils/is';
import { DraggableModal } from '@/components/core/draggable-modal';
-import { useLocale } from '@/locales/useLocale';
export type MyModalInstance = InstanceType;
export const MyModal = defineComponent({
- components: { customModal: DraggableModal },
props: {
content: {
type: [String, Function] as PropType JSX.Element)>,
},
closeModal: Function,
open: Boolean,
- isAppChild: Boolean,
},
setup(props, { attrs, expose }) {
const confirmLoading = ref(false);
- const { getAntdLocale } = useLocale();
const propsRef = ref({ ...attrs, ...props });
@@ -32,7 +27,7 @@ export const MyModal = defineComponent({
const _props = unref(getProps);
return {
- ...omit(_props, ['onCancel', 'onOk', 'closeModal', 'isAppChild', 'content']),
+ ...omit(_props, ['onCancel', 'onOk', 'closeModal', 'content']),
open: _props.open,
confirmLoading: confirmLoading.value,
onCancel: handleCancel,
@@ -82,17 +77,11 @@ export const MyModal = defineComponent({
return () => {
const _props = unref(getProps);
- const { content, isAppChild } = _props;
+ const { content } = _props;
const Content = isFunction(content) ? content() : content;
- return isAppChild ? (
- {Content}
- ) : (
-
- {Content}
-
- );
+ return {Content};
};
},
});
diff --git a/src/views/account/about.vue b/src/views/account/about.vue
index 8e90445a1..246753f27 100644
--- a/src/views/account/about.vue
+++ b/src/views/account/about.vue
@@ -3,8 +3,8 @@
- 的前端项目是基于Vue3.x、Vue-CLI5.x、
- Ant-Design-Vue3.x 、TypeScript4.x开发,
+ 的前端项目是基于Vue3.x、Vite4.x、
+ Ant-Design-Vue4.x 、TypeScript5.x开发,
内置了动态路由、权限验证、并提供了常用的功能组件,帮助你快速搭建企业级中后台产品原型。
原则上不会限制任何代码用于商用。
diff --git a/vite.config.ts b/vite.config.ts
index fd638e429..3a29cd1e3 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -39,10 +39,6 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
},
resolve: {
alias: [
- {
- find: 'vue-i18n',
- replacement: 'vue-i18n/dist/vue-i18n.cjs.js',
- },
{
find: '@',
replacement: resolve(__dirname, './src'),