diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index 605d637a..6745069c 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -16,6 +16,7 @@ - 修复表格换行问题 - 修复菜单外链不跳转 - 修复菜单顶部显示问题 +- 修复`modifyVars`配置失效问题 ## 2.0.0-rc.17 (2020-01-18) diff --git a/build/config/lessModifyVars.ts b/build/config/lessModifyVars.ts index 716b9308..3fad8935 100644 --- a/build/config/lessModifyVars.ts +++ b/build/config/lessModifyVars.ts @@ -7,23 +7,18 @@ const primaryColor = '#0084f4'; //{ const modifyVars = { 'primary-color': primaryColor, // Global dominant color - 'info-color': primaryColor, // Default color 'success-color': '#55D187', // Success color 'error-color': '#ED6F6F', // False color 'warning-color': '#EFBD47', // Warning color 'link-color': primaryColor, // Link color - 'disabled-color': '#C2C2CC', // Failure color + 'disabled-color': 'rgba(0, 0, 0, 0.25)', // Failure color 'heading-color': 'rgba(0, 0, 0, 0.85)', // Title color 'text-color': 'rgba(0, 0, 0, 0.85)', // Main text color - // 'heading-color': '#2C3A61', // Title color - // 'text-color': '#2C3A61', // Main text color - 'text-color-secondary ': '#606266', // Subtext color - 'background-color-base': '#f4f7f9', // background color + 'text-color-secondary ': 'rgba(0, 0, 0, 0.45)', // Subtext color 'font-size-base': '14px', // Main font size 'box-shadow-base': '0 2px 8px rgba(0, 0, 0, 0.15)', // Floating shadow - 'border-color-base': '#F0F0F0', // Border color, - 'border-color-split': '#F0F0F0', // Border color, - 'border-radius-base': '4px', // Component/float fillet + 'border-color-base': '#d9d9d9', // Border color, + 'border-radius-base': '2px', // Component/float fillet }; //} diff --git a/build/vite/plugin/styleImport.ts b/build/vite/plugin/styleImport.ts index a018c86a..12f648e1 100644 --- a/build/vite/plugin/styleImport.ts +++ b/build/vite/plugin/styleImport.ts @@ -7,7 +7,7 @@ export function configStyleImportConfig() { libraryName: 'ant-design-vue', esModule: true, resolveStyle: (name) => { - return `ant-design-vue/es/${name}/style/css`; + return `ant-design-vue/es/${name}/style/index`; }, }, ], diff --git a/src/design/color.less b/src/design/color.less index ea8cd4ff..3b4cb4ac 100644 --- a/src/design/color.less +++ b/src/design/color.less @@ -16,8 +16,6 @@ @content-bg: #f4f7f9; // @content-bg: #f0f2f5; -@info-color: @primary-color; - @basic-mask-color: fade(@white, 30%); // :export { // name: "less"; diff --git a/src/types/global.d.ts b/src/types/global.d.ts index de1e4028..bce07851 100644 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -39,12 +39,6 @@ declare type DeepPartial = { [P in keyof T]?: DeepPartial; }; -// type DeepPartial = T extends Function -// ? T -// : T extends object -// ? { [K in keyof T]?: DeepPartial } -// : T; - declare type LabelValueOptions = { label: string; value: any; diff --git a/src/types/module.d.ts b/src/types/module.d.ts index d0dc39e8..5eadc8e7 100644 --- a/src/types/module.d.ts +++ b/src/types/module.d.ts @@ -1,11 +1,3 @@ -declare module 'globby!/@/router/routes/modules/**/*.@(ts)'; - -declare module 'globby!/@/router/menus/modules/**/*.@(ts)'; - -declare module 'globby?locale!/@/locales/lang/**/*.@(ts)'; - -declare const React: string; - declare module 'ant-design-vue/es/locale/*' { import { Locale } from 'ant-design-vue/types/locale-provider'; const locale: Locale & ReadonlyRecordable; diff --git a/src/types/shim-tsx.d.ts b/src/types/shim-tsx.d.ts deleted file mode 100644 index 188f5886..00000000 --- a/src/types/shim-tsx.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { ComponentRenderProxy, VNode } from 'vue'; - -declare module '*.tsx' { - import { defineComponent } from 'vue'; - const component: ReturnType; - export default component; -} - -declare global { - namespace JSX { - // tslint:disable no-empty-interface - type Element = VNode; - // tslint:disable no-empty-interface - type ElementClass = ComponentRenderProxy; - interface ElementAttributesProperty { - $props: any; - } - interface IntrinsicElements { - [elem: string]: any; - } - interface IntrinsicAttributes { - [elem: string]: any; - } - } -} diff --git a/src/types/vue-app-env.d.ts b/src/types/vue-app-env.d.ts index 639ce143..87bc1fa5 100644 --- a/src/types/vue-app-env.d.ts +++ b/src/types/vue-app-env.d.ts @@ -3,23 +3,3 @@ declare module '*.vue' { const Component: ReturnType; export default Component; } - -declare namespace NodeJS { - interface Process { - env: ProcessEnv; - } - interface ProcessEnv { - /** - * By default, there are two modes in Vite: - * - * * `development` is used by vite and vite serve - * * `production` is used by vite build - * - * You can overwrite the default mode used for a command by passing the --mode option flag. - * - */ - readonly NODE_ENV: 'development' | 'production'; - } -} - -declare let process: NodeJS.Process; diff --git a/src/views/demo/table/tableData.tsx b/src/views/demo/table/tableData.tsx index 56296551..347f036e 100644 --- a/src/views/demo/table/tableData.tsx +++ b/src/views/demo/table/tableData.tsx @@ -308,17 +308,6 @@ export function getTreeTableData() { address: 'New York No. 1 Lake ParkNew York No. 1 Lake Park', beginTime: new Date().toLocaleString(), endTime: new Date().toLocaleString(), - children: [ - { - id: `l3-${index}`, - name: 'John Brown', - age: `1${index}`, - no: `${index + 10}`, - address: 'New York No. 1 Lake ParkNew York No. 1 Lake Park', - beginTime: new Date().toLocaleString(), - endTime: new Date().toLocaleString(), - }, - ], }, ], });