diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index b4168fffc92a0dd09b5e01b12765477d72cb0f7c..399d982c73c0720738a31dde76478bcf1fd0e8c9 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -19,6 +19,7 @@ - 修复 tinymce 上传按钮全屏模式下消失问题 - 确保 title 在重新登录后正常改变 - 确保后台模式登录正常 +- 修复 TableAction 点击事件问题 ## 2.1.1 (2021-03-26) diff --git a/build/vite/plugin/theme.ts b/build/vite/plugin/theme.ts index a3a75894b43e7a8aa6647529bdfaf68a423fbb73..1472a931e562cd6bc4e4c4f2493f773c2c85b617 100644 --- a/build/vite/plugin/theme.ts +++ b/build/vite/plugin/theme.ts @@ -19,7 +19,6 @@ export function configThemePlugin(isBuild: boolean): Plugin[] { mixLighten, tinycolor, }); - const plugin = [ viteThemePlugin({ resolveSelector: (s) => `[data-theme] ${s}`, @@ -41,7 +40,8 @@ export function configThemePlugin(isBuild: boolean): Plugin[] { // black: '#0e1117', // #8b949e 'text-color-secondary': '#8b949e', - 'border-color-base': '#30363d', + // 'border-color-base': '#30363d', + // 'border-color-split': '#30363d', 'item-active-bg': '#111b26', }, }), diff --git a/src/components/Loading/src/createLoading.ts b/src/components/Loading/src/createLoading.ts index bb7fd08efcbb5065d45f9ce6a224b5c7bceaa516..d1ab8d3ea543040c71e2754444eb27a9f9dcc188 100644 --- a/src/components/Loading/src/createLoading.ts +++ b/src/components/Loading/src/createLoading.ts @@ -4,7 +4,7 @@ import type { LoadingProps } from './types'; import { createVNode, render, reactive, h } from 'vue'; import Loading from './index.vue'; -export function createLoading(props?: Partial, target?: HTMLElement) { +export function createLoading(props?: Partial, target?: HTMLElement, wait = false) { let vm: Nullable = null; const data = reactive({ tip: '', @@ -13,16 +13,21 @@ export function createLoading(props?: Partial, target?: HTMLElemen }); const LoadingWrap = defineComponent({ - setup() { - return () => { - return h(Loading, { ...data }); - }; + render() { + return h(Loading, { ...data }); }, }); vm = createVNode(LoadingWrap); - render(vm, document.createElement('div')); + // TODO fix https://github.com/anncwb/vue-vben-admin/issues/438 + if (wait) { + setTimeout(() => { + render(vm, document.createElement('div')); + }, 0); + } else { + render(vm, document.createElement('div')); + } function close() { if (vm?.el && vm.el.parentNode) { diff --git a/src/components/Loading/src/useLoading.ts b/src/components/Loading/src/useLoading.ts index 04d308470c86d3f3b5e713406bd89eecf95a9373..923513aaa8db02304ccf6baa7ec0a5d67422d9ba 100644 --- a/src/components/Loading/src/useLoading.ts +++ b/src/components/Loading/src/useLoading.ts @@ -27,7 +27,7 @@ export function useLoading(opt: Partial | Partial; } - const instance = createLoading(props); + const instance = createLoading(props, undefined, true); const open = (): void => { const t = unref(target); diff --git a/src/design/theme.less b/src/design/theme.less index d5d7652abd7bfcb455e400a1ad387e9e66b64135..ff03120c4c7c29e9e69ca1561509946327d47400 100644 --- a/src/design/theme.less +++ b/src/design/theme.less @@ -18,6 +18,11 @@ html[data-theme='dark'] { 0 9px 28px 8px rgb(0 0 0 / 20%); } + .ant-card-grid { + box-shadow: 1px 0 0 0 #434343, 0 1px 0 0 #434343, 1px 1px 0 0 #434343, 1px 0 0 0 #434343 inset, + 0 1px 0 0 #434343 inset; + } + .ant-alert-message, .ant-alert-with-description .ant-alert-message, .ant-alert-description { diff --git a/src/views/demo/comp/loading/index.vue b/src/views/demo/comp/loading/index.vue index 1630ecaf11b010fa7a240ff86d70fb4c3023a4b3..318d7139f8889d80d1b0a3c6ad6bb970d9b3090f 100644 --- a/src/views/demo/comp/loading/index.vue +++ b/src/views/demo/comp/loading/index.vue @@ -1,21 +1,25 @@