diff --git a/src/App.vue b/src/App.vue index 745205a8..67d51272 100644 --- a/src/App.vue +++ b/src/App.vue @@ -13,7 +13,7 @@ import moment from 'moment'; import 'moment/dist/locale/zh-cn'; - import { getConfigProvider, initAppConfigStore } from '/@/setup/Application'; + import { getConfigProvider, initAppConfigStore } from '/@/setup/App'; import { useLockPage } from '/@/hooks/web/useLockPage'; moment.locale('zh-cn'); diff --git a/src/components/Form/src/componentMap.ts b/src/components/Form/src/componentMap.ts index 9c23cb3f..6972134c 100644 --- a/src/components/Form/src/componentMap.ts +++ b/src/components/Form/src/componentMap.ts @@ -1,4 +1,6 @@ import { Component } from 'vue'; +import type { ComponentType } from './types/index'; + /** * Component list, register here to use it in the form */ @@ -17,8 +19,6 @@ import { } from 'ant-design-vue'; import RadioButtonGroup from './components/RadioButtonGroup.vue'; -import { ComponentType } from './types/index'; - const componentMap = new Map(); componentMap.set('Input', Input); diff --git a/src/components/Form/src/types/index.ts b/src/components/Form/src/types/index.ts index c742beb7..3a460f78 100644 --- a/src/components/Form/src/types/index.ts +++ b/src/components/Form/src/types/index.ts @@ -108,4 +108,5 @@ export type ComponentType = | 'ImageUpload' | 'Switch' | 'StrengthMeter' + | 'Upload' | 'Render'; diff --git a/src/components/Upload/index.ts b/src/components/Upload/index.ts index 468dfe39..24feb311 100644 --- a/src/components/Upload/index.ts +++ b/src/components/Upload/index.ts @@ -1,2 +1,8 @@ -export { default as BasicUpload } from './src/BasicUpload.vue'; -// export * from './src/types'; +import type { App } from 'vue'; +import BasicUpload from './src/BasicUpload.vue'; + +export default (app: App): void => { + app.component(BasicUpload.name, BasicUpload); +}; + +export { BasicUpload }; diff --git a/src/components/Upload/src/BasicUpload.vue b/src/components/Upload/src/BasicUpload.vue index 7535013f..d28f69f0 100644 --- a/src/components/Upload/src/BasicUpload.vue +++ b/src/components/Upload/src/BasicUpload.vue @@ -41,6 +41,7 @@ import { omit } from 'lodash-es'; export default defineComponent({ + name: 'BasicUpload', components: { UploadModal, UploadPreviewModal, Icon, Tooltip }, props: uploadContainerProps, setup(props, { emit, attrs }) { diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts index dff21cc8..8ce339ee 100644 --- a/src/components/registerGlobComp.ts +++ b/src/components/registerGlobComp.ts @@ -33,7 +33,7 @@ import { Result, Empty, } from 'ant-design-vue'; -import { getApp } from '/@/setup/Application'; +import { getApp } from '/@/setup/App'; const compList = [Icon, Button, AntButton.Group, AppFooter]; diff --git a/src/main.ts b/src/main.ts index 9c2b372d..6b9296a5 100644 --- a/src/main.ts +++ b/src/main.ts @@ -7,7 +7,7 @@ import { setupErrorHandle } from '/@/setup/error-handle'; import { setupGlobDirectives } from '/@/setup/directives'; import { setupProdMockServer } from '../mock/_createProductionServer'; -import { setApp } from '/@/setup/Application'; +import { setApp } from '/@/setup/App'; import App from './App.vue'; diff --git a/src/setup/Application.ts b/src/setup/App.ts similarity index 100% rename from src/setup/Application.ts rename to src/setup/App.ts diff --git a/src/setup/application.ts b/src/setup/application.ts deleted file mode 100644 index 71477ce4..00000000 --- a/src/setup/application.ts +++ /dev/null @@ -1,86 +0,0 @@ -/** - * Application configuration - */ - -import type { ProjectConfig } from '/@/types/config'; -import type { App } from 'vue'; -import { computed, ref } from 'vue'; - -import { ThemeModeEnum } from '/@/enums/appEnum'; -import { PROJ_CFG_KEY } from '/@/enums/cacheEnum'; - -import projectSetting from '/@/settings/projectSetting'; -import { getLocal } from '/@/utils/helper/persistent'; -import { isUnDef, isNull } from '/@/utils/is'; -import { - updateGrayMode, - updateColorWeak, - updateHeaderBgColor, - updateSidebarBgColor, -} from '/@/setup/theme'; - -import { appStore } from '/@/store/modules/app'; - -// Used to share global app instances -let app: App; - -export function setApp(_app: App): void { - app = _app; -} - -export function getApp(): App { - return app; -} - -// TODO Theme switching -export function useThemeMode(mode: ThemeModeEnum) { - const modeRef = ref(mode); - const html = document.documentElement; - const clsList = html.classList; - - const change = () => { - clsList.contains(mode) ? clsList.remove(mode) : clsList.add(mode); - }; - return { - runChangeThemeMode: change, - mode: computed(() => modeRef.value), - }; -} - -// Initial project configuration -export function initAppConfigStore() { - let projCfg: ProjectConfig = getLocal(PROJ_CFG_KEY) as ProjectConfig; - if (!projCfg) { - projCfg = projectSetting; - } - const { colorWeak, grayMode, headerBgColor, menuBgColor } = projCfg; - try { - // if ( - // themeColor !== primaryColor && - // themeColor && - // process.env.VUE_APP_USE_THEME_REPLACER !== 'TRUE' - // ) { - // updateTheme(themeColor); - // } - headerBgColor && updateHeaderBgColor(headerBgColor); - menuBgColor && updateSidebarBgColor(menuBgColor); - grayMode && updateGrayMode(grayMode); - colorWeak && updateColorWeak(colorWeak); - } catch (error) { - console.log(error); - } - appStore.commitProjectConfigState(projCfg); -} - -// antdv Config Provider -export function getConfigProvider() { - function transformCellText({ text }: { text: string }) { - if (isNull(text) || isUnDef(text)) { - return ' - '; - } - return text; - } - return { - transformCellText, - }; -}