Kaynağa Gözat

😎调整命名拼写错误

zuohuaijun 1 yıl önce
ebeveyn
işleme
305faac924

+ 0 - 1
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm

@@ -244,4 +244,3 @@ if(@column.EffectType == "ApiTreeSelect" && !definedObjects.ContainsKey("@(@colu
 }
 
 }
-

+ 7 - 7
Web/src/App.vue

@@ -2,7 +2,7 @@
 	<el-config-provider :size="getGlobalComponentSize" :locale="getGlobalI18n">
 		<router-view v-show="setLockScreen" />
 		<LockScreen v-if="themeConfig.isLockScreen" />
-		<Setings ref="setingsRef" v-show="setLockScreen" />
+		<Settings ref="settingsRef" v-show="setLockScreen" />
 		<CloseFull v-if="!themeConfig.isLockScreen" />
 		<!-- <Upgrade v-if="needUpdate" /> -->
 		<!-- <Sponsors /> -->
@@ -20,20 +20,20 @@ import other from '/@/utils/other';
 import { Local, Session } from '/@/utils/storage';
 import mittBus from '/@/utils/mitt';
 import setIntroduction from '/@/utils/setIconfont';
-import Watermark from '/@/utils/watermark';
+// import Watermark from '/@/utils/watermark';
 import { SysConfigApi } from '/@/api-services';
 import { getAPI } from '/@/utils/axios-utils';
 
 // 引入组件
 const LockScreen = defineAsyncComponent(() => import('/@/layout/lockScreen/index.vue'));
-const Setings = defineAsyncComponent(() => import('/@/layout/navBars/topBar/setings.vue'));
+const Settings = defineAsyncComponent(() => import('/@/layout/navBars/topBar/settings.vue'));
 const CloseFull = defineAsyncComponent(() => import('/@/layout/navBars/topBar/closeFull.vue'));
 // const Upgrade = defineAsyncComponent(() => import('/@/layout/upgrade/index.vue'));
 // const Sponsors = defineAsyncComponent(() => import('/@/layout/sponsors/index.vue'));
 
 // 定义变量内容
 const { messages, locale } = useI18n();
-const setingsRef = ref();
+const settingsRef = ref();
 const route = useRoute();
 const stores = useTagsViewRoutes();
 const storesThemeConfig = useThemeConfig();
@@ -80,8 +80,8 @@ onBeforeMount(() => {
 onMounted(() => {
 	nextTick(() => {
 		// 监听布局配'置弹窗点击打开
-		mittBus.on('openSetingsDrawer', () => {
-			setingsRef.value.openDrawer();
+		mittBus.on('openSettingsDrawer', () => {
+			settingsRef.value.openDrawer();
 		});
 		// 获取缓存中的布局配置
 		if (Local.get('themeConfig')) {
@@ -96,7 +96,7 @@ onMounted(() => {
 });
 // 页面销毁时,关闭监听布局配置/i18n监听
 onUnmounted(() => {
-	mittBus.off('openSetingsDrawer', () => {});
+	mittBus.off('openSettingsDrawer', () => {});
 });
 // 监听路由的变化,设置网站标题
 watch(

+ 0 - 0
Web/src/layout/navBars/topBar/setings.vue → Web/src/layout/navBars/topBar/settings.vue


+ 1 - 1
Web/src/layout/navBars/topBar/user.vue

@@ -149,7 +149,7 @@ const onScreenfullClick = () => {
 };
 // 布局配置 icon 点击时
 const onLayoutSetingClick = () => {
-	mittBus.emit('openSetingsDrawer');
+	mittBus.emit('openSettingsDrawer');
 };
 // 下拉菜单点击时
 const onHandleCommandClick = (path: string) => {

+ 1 - 1
Web/src/stores/themeConfig.ts

@@ -119,7 +119,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 
 			/**
 			 * 布局切换
-			 * 注意:为了演示,切换布局时,颜色会被还原成默认,代码位置:/@/layout/navBars/topBar/setings.vue
+			 * 注意:为了演示,切换布局时,颜色会被还原成默认,代码位置:/@/layout/navBars/topBar/settings.vue
 			 * 中的 `initSetLayoutChange(设置布局切换,重置主题样式)` 方法
 			 */
 			// 布局切换:可选值"<defaults|classic|transverse|columns>",默认 defaults

+ 2 - 2
Web/src/types/mitt.d.ts

@@ -1,7 +1,7 @@
 /**
  * mitt 事件类型定义
  *
- * @method openSetingsDrawer 打开布局设置弹窗
+ * @method openSettingsDrawer 打开布局设置弹窗
  * @method restoreDefault 分栏布局,鼠标移入、移出数据显示
  * @method setSendColumnsChildren 分栏布局,鼠标移入、移出菜单数据传入到 navMenu 下的菜单中
  * @method setSendClassicChildren 经典布局,开启切割菜单时,菜单数据传入到 navMenu 下的菜单中
@@ -13,7 +13,7 @@
  * @method onCurrentContextmenuClick tagsview 右键菜单每项点击时
  */
 declare type MittType<T = any> = {
-	openSetingsDrawer?: string;
+	openSettingsDrawer?: string;
 	restoreDefault?: string;
 	setSendColumnsChildren: T;
 	setSendClassicChildren: T;

+ 1 - 1
Web/src/views/system/codeGen/component/previewDialog.vue

@@ -17,7 +17,7 @@
 					</template>
 				</el-segmented>
 			</div>
-			<div ref="monacoEditorRef" style="width: 100%; height: 660px; margin-top: 6px"></div>
+			<div ref="monacoEditorRef" style="width: 100%; height: 700px;"></div>
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button icon="ele-Close" @click="cancel">关 闭</el-button>