fix 更新相关依赖版本，后台管理页面及代码生成页面改为setup语法糖

package.json

@@ -4,66 +4,67 @@
   "description": "vue3 vite next admin template",
   "author": "lyt_20201208",
   "license": "MIT",
+  "type": "module",
   "scripts": {
-    "dev": "vite --force",
+    "dev": "vite",
     "build": "vite build",
     "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
   },
   "dependencies": {
     "@codemirror/lang-javascript": "^6.1.1",
     "@codemirror/theme-one-dark": "^6.1.0",
-    "@element-plus/icons-vue": "^2.1.0",
+    "@element-plus/icons-vue": "^2.3.1",
-    "axios": "^1.3.5",
+    "axios": "^1.6.8",
     "codemirror": "^6.0.1",
-    "countup.js": "^2.6.0",
+    "countup.js": "^2.8.0",
-    "cropperjs": "^1.5.13",
+    "cropperjs": "^1.6.0",
-    "echarts": "^5.4.2",
+    "echarts": "^5.5.0",
     "echarts-gl": "^2.0.9",
     "echarts-wordcloud": "^2.1.0",
     "element-plus": "^2.6.3",
-    "js-cookie": "^3.0.1",
+    "js-cookie": "^3.0.5",
     "jsplumb": "^2.15.6",
     "lodash": "^4.17.21",
-    "mitt": "^3.0.0",
+    "mitt": "^3.0.1",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.34",
+    "pinia": "^2.1.7",
     "print-js": "^1.6.0",
     "qrcodejs2-fixes": "^0.0.2",
-    "qs": "^6.11.1",
+    "qs": "^6.12.0",
     "screenfull": "^6.0.2",
-    "sortablejs": "^1.15.0",
+    "sortablejs": "^1.15.2",
     "spark-md5": "^3.0.2",
     "splitpanes": "^3.1.5",
-    "vue": "^3.2.47",
+    "vue": "^3.4.21",
     "vue-clipboard3": "^2.0.0",
     "vue-codemirror": "^6.1.1",
-    "vue-demi": "^0.13.11",
+    "vue-demi": "^0.14.7",
     "vue-grid-layout": "^3.0.0-beta1",
-    "vue-i18n": "^9.2.2",
+    "vue-i18n": "^9.10.2",
-    "vue-router": "^4.1.6",
+    "vue-router": "^4.3.0",
     "vue-simple-uploader": "^1.0.0-beta.5",
     "vue-ueditor-wrap": "^3.0.8"
   },
   "devDependencies": {
-    "@types/node": "^18.15.11",
+    "@types/node": "^20.11.28",
-    "@types/nprogress": "^0.2.0",
+    "@types/nprogress": "^0.2.3",
-    "@types/sortablejs": "^1.15.1",
+    "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^5.58.0",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^5.58.0",
+    "@typescript-eslint/parser": "^7.2.0",
-    "@vitejs/plugin-vue": "^4.1.0",
+    "@vitejs/plugin-vue": "^5.0.4",
-    "@vue/compiler-sfc": "^3.2.47",
+    "@vue/compiler-sfc": "^3.4.21",
     "dotenv": "^16.0.1",
-    "eslint": "^8.38.0",
+    "eslint": "^8.57.0",
-    "eslint-plugin-vue": "^9.10.0",
+    "eslint-plugin-vue": "^9.23.0",
-    "prettier": "^2.8.7",
+    "prettier": "^3.2.5",
-    "sass": "^1.61.0",
+    "sass": "^1.72.0",
     "sass-loader": "^13.0.2",
-    "typescript": "^5.0.4",
+    "typescript": "^5.4.2",
-    "vite": "^4.2.1",
+    "vite": "^5.1.6",
     "vite-plugin-cdn-import": "^0.3.5",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-vue-setup-extend-plus": "^0.1.0",
-    "vue-eslint-parser": "^9.1.1"
+    "vue-eslint-parser": "^9.4.1"
   },
   "browserslist": [
     "> 1%",

src/layout/component/aside.vue

@@ -9,7 +9,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { toRefs, reactive, computed, watch, getCurrentInstance, onBeforeMount, defineComponent } from 'vue';
 import { storeToRefs } from 'pinia';
 import pinia from '/@/stores/index';
@@ -18,11 +18,8 @@ import { useThemeConfig } from '/@/stores/themeConfig';
 import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 import Logo from '/@/layout/logo/index.vue';
 import Vertical from '/@/layout/navMenu/vertical.vue';
+defineOptions({ name: "layoutAside"})
 
-export default defineComponent({
-	name: 'layoutAside',
-	components: { Logo, Vertical },
-	setup() {
 const { proxy } = <any>getCurrentInstance();
 const stores = useRoutesList();
 const storesThemeConfig = useThemeConfig();
@@ -34,6 +31,7 @@ export default defineComponent({
   menuList: [],
   clientWidth: 0,
 });
+const { menuList } = toRefs(state);
 // 设置菜单展开/收起时的宽度
 const setCollapseStyle = computed(() => {
   const { layout, isCollapse, menuBar } = themeConfig.value;
@@ -151,13 +149,4 @@ export default defineComponent({
     closeLayoutAsideMobileMode();
   });
 });
-		return {
-			setCollapseStyle,
-			setShowLogo,
-			isTagsViewCurrenFull,
-			onAsideEnterLeave,
-			...toRefs(state),
-		};
-	},
-});
 </script>

src/layout/component/columnsAside.vue

@@ -44,7 +44,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { reactive, toRefs, ref, onMounted, nextTick, getCurrentInstance, watch, onUnmounted, defineComponent } from 'vue';
 import { useRoute, useRouter, onBeforeRouteUpdate, RouteRecordRaw } from 'vue-router';
 import { storeToRefs } from 'pinia';
@@ -62,10 +62,7 @@ interface ColumnsAsideState {
 	difference: number;
 	routeSplit: string[];
 }
-
+defineOptions({ name: "layoutColumnsAside"})
-export default defineComponent({
-	name: 'layoutColumnsAside',
-	setup() {
 const columnsAsideOffsetTopRefs: any = ref([]);
 const columnsAsideActiveRef = ref();
 const { proxy } = <any>getCurrentInstance();
@@ -84,6 +81,7 @@ export default defineComponent({
   difference: 0,
   routeSplit: [],
 });
+const { columnsAsideList, liIndex, liHoverIndex} = toRefs(state);
 // 设置菜单高亮位置移动
 const setColumnsAsideMove = (k: number) => {
   state.liIndex = k;
@@ -212,18 +210,6 @@ export default defineComponent({
   setColumnsMenuHighlight(to.path);
   proxy.mittBus.emit('setSendColumnsChildren', setSendChildren(to.path));
 });
-		return {
-			themeConfig,
-			columnsAsideOffsetTopRefs,
-			columnsAsideActiveRef,
-			onColumnsAsideDown,
-			onColumnsAsideMenuClick,
-			onColumnsAsideMenuMouseenter,
-			onColumnsAsideMenuMouseleave,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/layout/component/header.vue

@@ -4,17 +4,13 @@
 	</el-header>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { computed, defineComponent } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 import NavBarsIndex from '/@/layout/navBars/index.vue';
-
+defineOptions({ name: "layoutHeader"})
-export default defineComponent({
-	name: 'layoutHeader',
-	components: { NavBarsIndex },
-	setup() {
 const storesTagsViewRoutes = useTagsViewRoutes();
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
@@ -25,10 +21,4 @@ export default defineComponent({
   if (isTagsview && layout !== 'classic') return '84px';
   else return '50px';
 });
-		return {
-			setHeaderHeight,
-			isTagsViewCurrenFull,
-		};
-	},
-});
 </script>

src/layout/component/main.vue

@@ -19,8 +19,8 @@
 	</el-main>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
-import { defineComponent, toRefs, reactive, getCurrentInstance, watch, onMounted, computed } from 'vue';
+import { toRefs, reactive, getCurrentInstance, watch, onMounted, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
@@ -33,11 +33,7 @@ interface MainState {
 	headerHeight: string | number;
 	currentRouteMeta: any;
 }
-
+defineOptions({ name: "layoutMain"})
-export default defineComponent({
-	name: 'layoutMain',
-	components: { LayoutParentView, Footer },
-	setup() {
 const { proxy } = <any>getCurrentInstance();
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
@@ -46,6 +42,7 @@ export default defineComponent({
   headerHeight: '',
   currentRouteMeta: {},
 });
+const { currentRouteMeta } = toRefs(state);
 // 判断布局
 const isClassicOrTransverse = computed(() => {
   const { layout } = themeConfig.value;
@@ -91,11 +88,4 @@ export default defineComponent({
     deep: true,
   }
 );
-		return {
-			themeConfig,
-			isClassicOrTransverse,
-			...toRefs(state),
-		};
-	},
-});
 </script>

src/layout/footer/index.vue

@@ -7,30 +7,20 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
-import { toRefs, reactive, defineComponent } from 'vue';
+import {ref} from 'vue';
 import {onBeforeRouteUpdate} from 'vue-router';
-
+defineOptions({ name: "layoutFooter"})
-export default defineComponent({
+const isDelayFooter = ref(true)
-	name: 'layoutFooter',
-	setup() {
-		const state = reactive({
-			isDelayFooter: true,
-		});
 // 路由改变时，等主界面动画加载完毕再显示 footer
 onBeforeRouteUpdate(() => {
   setTimeout(() => {
-				state.isDelayFooter = false;
+    isDelayFooter.value = false;
     setTimeout(() => {
-					state.isDelayFooter = true;
+      isDelayFooter.value = true;
     }, 800);
   }, 0);
 });
-		return {
-			...toRefs(state),
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/layout/lockScreen/index.vue

@@ -59,7 +59,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { nextTick, onMounted, reactive, toRefs, ref, onUnmounted, getCurrentInstance, defineComponent } from 'vue';
 import { formatDate } from '/@/utils/formatTime';
 import { Local } from '/@/utils/storage';
@@ -84,10 +84,8 @@ interface LockScreenState {
 	isShowLockScreenIntervalTime: number;
 	lockScreenPassword: string;
 }
+defineOptions({ name: "layoutLockScreen"})
 
-export default defineComponent({
-	name: 'layoutLockScreen',
-	setup() {
 const { proxy } = <any>getCurrentInstance();
 const layoutLockScreenInputRef = ref();
 const storesThemeConfig = useThemeConfig();
@@ -109,6 +107,7 @@ export default defineComponent({
   isShowLockScreenIntervalTime: 0,
   lockScreenPassword: '',
 });
+const { isShowLockScreen, lockScreenPassword,isShowLoockLogin,time} = toRefs(state);
 // 鼠标按下
 const onDown = (down: any) => {
   state.isFlags = true;
@@ -203,16 +202,6 @@ export default defineComponent({
   window.clearInterval(state.setIntervalTime);
   window.clearInterval(state.isShowLockScreenIntervalTime);
 });
-		return {
-			layoutLockScreenInputRef,
-			onDown,
-			onMove,
-			onEnd,
-			onLockScreenSubmit,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/layout/logo/index.vue

@@ -8,16 +8,13 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { computed, defineComponent } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 
 import logoMini from '/@/assets/logo-mini.svg';
-
+defineOptions({ name: "layoutLogo"})
-export default defineComponent({
-	name: 'layoutLogo',
-	setup() {
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
 // 设置 logo 的显示。classic 经典布局默认显示 logo
@@ -30,14 +27,6 @@ export default defineComponent({
   if (themeConfig.value.layout === 'transverse') return false;
   themeConfig.value.isCollapse = !themeConfig.value.isCollapse;
 };
-		return {
-			logoMini,
-			setShowLogo,
-			themeConfig,
-			onThemeConfigChange,
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/layout/main/classic.vue

@@ -12,7 +12,7 @@
 	</el-container>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { defineComponent } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
@@ -20,16 +20,7 @@ import Aside from '/@/layout/component/aside.vue';
 import Header from '/@/layout/component/header.vue';
 import Main from '/@/layout/component/main.vue';
 import TagsView from '/@/layout/navBars/tagsView/tagsView.vue';
-
+defineOptions({ name: "layoutClassic"})
-export default defineComponent({
-	name: 'layoutClassic',
-	components: { Aside, Header, Main, TagsView },
-	setup() {
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
-		return {
-			themeConfig,
-		};
-	},
-});
 </script>

src/layout/main/columns.vue

@@ -15,7 +15,7 @@
 	</el-container>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { computed, defineComponent } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
@@ -23,19 +23,11 @@ import Aside from '/@/layout/component/aside.vue';
 import Header from '/@/layout/component/header.vue';
 import Main from '/@/layout/component/main.vue';
 import ColumnsAside from '/@/layout/component/columnsAside.vue';
-
+defineOptions({ name: "layoutColumns"})
-export default defineComponent({
-	name: 'layoutColumns',
-	components: { Aside, Header, Main, ColumnsAside },
-	setup() {
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
 const isFixedHeader = computed(() => {
   return themeConfig.value.isFixedHeader;
 });
-		return {
+
-			isFixedHeader,
-		};
-	},
-});
 </script>

src/layout/main/defaults.vue

@@ -12,7 +12,7 @@
   </el-container>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {computed, getCurrentInstance, watch, defineComponent, ref} from 'vue';
 import { useRoute } from 'vue-router';
 import { storeToRefs } from 'pinia';
@@ -20,11 +20,7 @@ import { useThemeConfig } from '/@/stores/themeConfig';
 import layoutAside from '/@/layout/component/aside.vue';
 import layoutHeader from '/@/layout/component/header.vue';
 import layoutMain from '/@/layout/component/main.vue';
-
+defineOptions({ name: "layoutDefaults"})
-export default defineComponent({
-  name: 'layoutDefaults',
-  components: { layoutAside, layoutHeader, layoutMain },
-  setup() {
 const route = useRoute();
 const layoutDefaultsScrollbarRef = ref()
 const storesThemeConfig = useThemeConfig();
@@ -39,10 +35,4 @@ export default defineComponent({
       layoutDefaultsScrollbarRef.value.wrapRef.scrollTop = 0;
     }
 );
-    return {
-      isFixedHeader,
-      layoutDefaultsScrollbarRef,
-    };
-  },
-});
 </script>

src/layout/main/transverse.vue

@@ -6,12 +6,8 @@
 	</el-container>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import Header from '/@/layout/component/header.vue';
 import Main from '/@/layout/component/main.vue';
-
+defineOptions({ name: "layoutTransverse"})
-export default {
-	name: 'layoutTransverse',
-	components: { Header, Main },
-};
 </script>

src/layout/navBars/breadcrumb/breadcrumb.vue

@@ -23,7 +23,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { toRefs, reactive, computed, onMounted, defineComponent } from 'vue';
 import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router';
 import { Local } from '/@/utils/storage';
@@ -31,7 +31,6 @@ import other from '/@/utils/other';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { useRoutesList } from '/@/stores/routesList';
-
 // 定义接口来定义对象的类型
 interface BreadcrumbState {
 	breadcrumbList: Array<any>;
@@ -40,9 +39,7 @@ interface BreadcrumbState {
 	routeSplitIndex: number;
 }
 
-export default defineComponent({
+defineOptions({ name: "layoutBreadcrumb"})
-	name: 'layoutBreadcrumb',
-	setup() {
 const stores = useRoutesList();
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
@@ -55,6 +52,7 @@ export default defineComponent({
   routeSplitFirst: '',
   routeSplitIndex: 1,
 });
+const {breadcrumbList}= toRefs(state);
 // 动态设置经典、横向布局不显示
 const isShowBreadcrumb = computed(() => {
   initRouteSplit(route.path);
@@ -111,15 +109,6 @@ export default defineComponent({
 onBeforeRouteUpdate((to) => {
   initRouteSplit(to.path);
 });
-		return {
-			onThemeConfigChange,
-			isShowBreadcrumb,
-			themeConfig,
-			onBreadcrumbClick,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/layout/navBars/breadcrumb/closeFull.vue

@@ -6,26 +6,17 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
-import { defineComponent } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
-
+defineOptions({ name: "layoutCloseFull"})
-export default defineComponent({
-	name: 'layoutCloseFull',
-	setup() {
 const stores = useTagsViewRoutes();
 const { isTagsViewCurrenFull } = storeToRefs(stores);
 // 关闭当前全屏
 const onCloseFullscreen = () => {
   stores.setCurrenFullscreen(false);
 };
-		return {
+
-			isTagsViewCurrenFull,
-			onCloseFullscreen,
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/layout/navBars/breadcrumb/index.vue

@@ -7,7 +7,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { computed, reactive, toRefs, onMounted, onUnmounted, getCurrentInstance, defineComponent } from 'vue';
 import { useRoute } from 'vue-router';
 import { storeToRefs } from 'pinia';
@@ -22,11 +22,7 @@ import Horizontal from '/@/layout/navMenu/horizontal.vue';
 interface IndexState {
 	menuList: object[];
 }
-
+defineOptions({ name: "layoutBreadcrumbIndex"})
-export default defineComponent({
-	name: 'layoutBreadcrumbIndex',
-	components: { Breadcrumb, User, Logo, Horizontal },
-	setup() {
 const { proxy } = <any>getCurrentInstance();
 const stores = useRoutesList();
 const storesThemeConfig = useThemeConfig();
@@ -36,6 +32,7 @@ export default defineComponent({
 const state = reactive<IndexState>({
   menuList: [],
 });
+const { menuList } = toRefs(state);
 // 设置 logo 显示/隐藏
 const setIsShowLogo = computed(() => {
   let { isShowLogo, layout } = themeConfig.value;
@@ -99,13 +96,6 @@ export default defineComponent({
 onUnmounted(() => {
   proxy.mittBus.off('getBreadcrumbIndexSetFilterRoutes', () => {});
 });
-		return {
-			setIsShowLogo,
-			isLayoutTransverse,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/layout/navBars/breadcrumb/search.vue

@@ -25,7 +25,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { reactive, toRefs, defineComponent, ref, nextTick } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
@@ -44,10 +44,7 @@ interface Restaurant {
 		title: string;
 	};
 }
-
+defineOptions({ name: "layoutBreadcrumbSearch"})
-export default defineComponent({
-	name: 'layoutBreadcrumbSearch',
-	setup() {
 const storesTagsViewRoutes = useTagsViewRoutes();
 const { tagsViewRoutes } = storeToRefs(storesTagsViewRoutes);
 const layoutMenuAutocompleteRef = ref();
@@ -58,6 +55,7 @@ export default defineComponent({
   menuQuery: '',
   tagsViewList: [],
 });
+const { isShowSearch, menuQuery} =toRefs(state)
 // 搜索弹窗打开
 const openSearch = () => {
   state.menuQuery = '';
@@ -107,17 +105,7 @@ export default defineComponent({
 const onSearchBlur = () => {
   closeSearch();
 };
-		return {
+
-			layoutMenuAutocompleteRef,
-			openSearch,
-			closeSearch,
-			menuSearch,
-			onHandleSelect,
-			onSearchBlur,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/layout/navBars/breadcrumb/setings.vue

@@ -407,8 +407,18 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
-import { nextTick, onUnmounted, onMounted, getCurrentInstance, defineComponent, computed, reactive, toRefs } from 'vue';
+import {
+  nextTick,
+  onUnmounted,
+  onMounted,
+  getCurrentInstance,
+  defineComponent,
+  computed,
+  reactive,
+  toRefs,
+  ref
+} from 'vue';
 import { ElMessage } from 'element-plus';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
@@ -418,17 +428,12 @@ import { Local } from '/@/utils/storage';
 import Watermark from '/@/utils/wartermark';
 import commonFunction from '/@/utils/commonFunction';
 import other from '/@/utils/other';
-
+defineOptions({ name: "layoutBreadcrumbSeting"})
-export default defineComponent({
-	name: 'layoutBreadcrumbSeting',
-	setup() {
 const { proxy } = <any>getCurrentInstance();
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
 const { copyText } = commonFunction();
-		const state = reactive({
+const isMobile = ref(false);
-			isMobile: false,
-		});
 // 获取布局配置信息
 const getThemeConfig = computed(() => {
   return themeConfig.value;
@@ -622,7 +627,7 @@ export default defineComponent({
       getThemeConfig.value.layout = res.layout;
       getThemeConfig.value.isDrawer = false;
       initLayoutChangeFun();
-					state.isMobile = other.isMobile();
+      isMobile.value = other.isMobile();
     });
     setTimeout(() => {
       // 默认样式
@@ -645,34 +650,6 @@ export default defineComponent({
 onUnmounted(() => {
   proxy.mittBus.off('layoutMobileResize', () => {});
 });
-		return {
-			openDrawer,
-			onColorPickerChange,
-			onBgColorPickerChange,
-			onTopBarGradualChange,
-			onMenuBarGradualChange,
-			onColumnsMenuBarGradualChange,
-			onThemeConfigChange,
-			onIsFixedHeaderChange,
-			onIsShowLogoChange,
-			getThemeConfig,
-			onDrawerClose,
-			onAddFilterChange,
-			onAddDarkChange,
-			onWartermarkChange,
-			onWartermarkTextInput,
-			onSetLayout,
-			setLocalThemeConfig,
-			onClassicSplitMenuChange,
-			onIsBreadcrumbChange,
-			onSortableTagsViewChange,
-			onShareTagsViewChange,
-			onCopyConfigClick,
-			onResetConfigClick,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/layout/navBars/breadcrumb/user.vue

@@ -79,7 +79,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {ref, getCurrentInstance, computed, reactive, toRefs, onMounted, defineComponent, watch} from 'vue';
 import { useRoute,useRouter } from 'vue-router';
 import {ElMessageBox, ElMessage, ElNotification} from 'element-plus';
@@ -96,11 +96,7 @@ import {logout} from "/@/api/login";
 import {removeCache} from "/@/api/system/cache";
 import {noticeStore} from "/@/stores/noticeStore";
 
-
+defineOptions({ name: "layoutBreadcrumbUser"})
-export default defineComponent({
-	name: 'layoutBreadcrumbUser',
-	components: { UserNews, Search },
-	setup() {
 const { t } = useI18n();
 const { proxy } = <any>getCurrentInstance();
 const router = useRouter();
@@ -116,6 +112,7 @@ export default defineComponent({
   disabledI18n: 'zh-cn',
   disabledSize: 'large',
 });
+const {isScreenfull, disabledI18n, disabledSize} = toRefs(state)
 // 设置分割样式
 const layoutUserFlexNum = computed(() => {
   let num: string | number = '';
@@ -287,22 +284,6 @@ export default defineComponent({
     }
   })
 }
-		return {
-			userInfos,
-			onLayoutSetingClick,
-			onHandleCommandClick,
-			onScreenfullClick,
-			onSearchClick,
-			onComponentSizeChange,
-			onLanguageChange,
-      removeCacheClick,
-      hideNews,
-			searchRef,
-			layoutUserFlexNum,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/layout/navBars/breadcrumb/userNews.vue

@@ -88,23 +88,23 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
-import {reactive, toRefs, defineComponent, computed, watch} from 'vue';
+import {reactive, toRefs, onMounted} from 'vue';
 import {
   listShowNotice,
    unReadCount,
 } from "/@/api/system/notice/sysNotice";
-import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
 import {readNotice} from "/@/api/system/notice/sysNoticeRead";
 import {SysNoticeInfoData} from "/@/views/system/sysNotice/list/component/model";
 import {useRouter} from "vue-router";
-export default defineComponent({
+defineOptions({ name: "layoutBreadcrumbUserNews"})
-  name: 'layoutBreadcrumbUserNews',
+
-  created() {
+onMounted(()=>{
-    this.getUnReadCount()
+  getUnReadCount()
-    this.getData(1)
+  getData(1)
-  },
+})
-  setup() {
+
 const router = useRouter();
 const state = reactive({
   type1Num: 0,
@@ -120,7 +120,7 @@ export default defineComponent({
   isShowDialog: false,
   barName: "通知"
 });
-
+const { tabsActive, activeInfo, isShowDialog, count, noticeList} = toRefs(state)
 /** 改变tab*/
 const handleTabChange = (tabName: number) => {
   if (tabName === 1) {
@@ -226,21 +226,6 @@ export default defineComponent({
     ElMessage.success("已读");
   })
 }
-    return {
-      getData,
-      readAllItem,
-      onAllReadClick,
-      onGoToGiteeClick,
-      hendleClear,
-      hendleAllread,
-      hendleShowMore,
-      getUnReadCount,
-      handleRead,
-      ...toRefs(state),
-      handleTabChange
-    };
-  },
-});
 </script>
 
 <style scoped lang="scss">

src/layout/navBars/index.vue

@@ -5,17 +5,13 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { computed, defineComponent } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import BreadcrumbIndex from '/@/layout/navBars/breadcrumb/index.vue';
 import TagsView from '/@/layout/navBars/tagsView/tagsView.vue';
-
+defineOptions({ name: "layoutNavBars"})
-export default defineComponent({
-	name: 'layoutNavBars',
-	components: { BreadcrumbIndex, TagsView },
-	setup() {
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
 // 是否显示 tagsView
@@ -23,11 +19,6 @@ export default defineComponent({
   let { layout, isTagsview } = themeConfig.value;
   return layout !== 'classic' && isTagsview;
 });
-		return {
-			setShowTagsView,
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/layout/navBars/tagsView/contextmenu.vue

@@ -29,12 +29,10 @@
 	</transition>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { computed, defineComponent, reactive, toRefs, onMounted, onUnmounted, watch } from 'vue';
-
+defineOptions({ name: "layoutTagsViewContextmenu"})
-export default defineComponent({
+const props = defineProps({
-	name: 'layoutTagsViewContextmenu',
-	props: {
   dropdown: {
     type: Object,
     default: () => {
@@ -43,9 +41,9 @@ export default defineComponent({
         y: 0,
       };
     },
-		},
+  }
-	},
+});
-	setup(props, { emit }) {
+const emit = defineEmits(['currentContextmenuClick']);
 const state = reactive({
   isShow: false,
   dropdownList: [
@@ -63,6 +61,7 @@ export default defineComponent({
   item: {},
   arrowLeft: 10,
 });
+const { isShow, dropdownList, arrowLeft}=toRefs(state);
 // 父级传过来的坐标 x,y 值
 const dropdowns = computed(() => {
   // 117 为 `Dropdown 下拉菜单` 的宽度
@@ -111,15 +110,7 @@ export default defineComponent({
     deep: true,
   }
 );
-		return {
+defineExpose({openContextmenu})
-			dropdowns,
-			openContextmenu,
-			closeContextmenu,
-			onCurrentContextmenuClick,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/layout/navBars/tagsView/tagsView.vue

@@ -23,7 +23,7 @@
             <SvgIcon
                 name="ele-RefreshRight"
                 class="ml5 layout-navbars-tagsview-ul-li-refresh"
-                @click.stop="refreshCurrentTagsView($route.fullPath)"
+                @click.stop="refreshCurrentTagsView(getThemeConfig.isShareTagsView ? v.path : v.url)"
             />
             <SvgIcon
                 name="ele-Close"
@@ -45,7 +45,7 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {
   toRefs,
   reactive,
@@ -101,11 +101,7 @@ interface CurrentContextmenu {
   path: string;
   contextMenuClickId: string | number;
 }
-
+defineOptions({ name: "layoutTagsView"})
-export default defineComponent({
-  name: 'layoutTagsView',
-  components: { Contextmenu },
-  setup() {
     const { proxy } = <any>getCurrentInstance();
     const tagsRefs = ref<any[]>([]);
     const scrollbarRef = ref();
@@ -128,6 +124,7 @@ export default defineComponent({
       tagsViewList: [],
       tagsViewRoutesList: [],
     });
+    const { tagsViewList, dropdown} = toRefs(state)
     // 动态设置 tagsView 风格样式
     const setTagsStyle = computed(() => {
       return themeConfig.value.tagsStyle;
@@ -367,7 +364,7 @@ export default defineComponent({
           // 刷新当前
           if (meta.isDynamic) await router.push({ name, params });
           else await router.push({ path, query });
-          refreshCurrentTagsView(route.fullPath);
+          refreshCurrentTagsView(getThemeConfig.value.isShareTagsView ? path : url);
           break;
         case 1:
           // 关闭当前
@@ -580,25 +577,6 @@ export default defineComponent({
           deep: true,
         }
     );
-    return {
-      isActive,
-      onContextmenu,
-      onTagsClick,
-      tagsRefs,
-      contextmenuRef,
-      scrollbarRef,
-      tagsUlRef,
-      onHandleScroll,
-      getThemeConfig,
-      setTagsStyle,
-      setTagsViewNameI18n,
-      refreshCurrentTagsView,
-      closeCurrentTagsView,
-      onCurrentContextmenuClick,
-      ...toRefs(state),
-    };
-  },
-});
 </script>
 
 <style scoped lang="scss">

src/router/route.ts

@@ -65,7 +65,6 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 				path: '/bigUpload',
 				name: 'bigUpload',
 				component: () => import('/@/layout/routerView/parent.vue'),
-				redirect: '/bigUpload',
 				meta:{
 					title: '大文件上传',
 					isLink: '',
@@ -78,8 +77,8 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 				},
 				children:[
 					{
-						path: '/bigUpload',
+						path: '/bigUpload/list',
-						name: 'bigUpload',
+						name: 'bigUploadList',
 						component: () => import('/@/views/bigUpload/index.vue'),
 						meta: {
 							title: '大文件上传',
@@ -574,6 +573,7 @@ export const demoRoutes:Array<RouteRecordRaw> = [
 							icon: 'ele-Sunny',
 						},
 					},
+
 					{
 						path: '/demo/pages/iocnfont',
 						name: 'pagesIocnfont',
@@ -589,6 +589,7 @@ export const demoRoutes:Array<RouteRecordRaw> = [
 							icon: 'ele-Present',
 						},
 					},
+
 					{
 						path: '/demo/pages/element',
 						name: 'pagesElement',
@@ -813,22 +814,7 @@ export const demoRoutes:Array<RouteRecordRaw> = [
 							roles: ['admin'],
 							icon: 'iconfont icon-diannao',
 						},
-					},
+					}
-					{
-						path: '/demo/pages/workflow',
-						name: 'pagesWorkflow',
-						component: () => import('/@/views/pages/workflow/index.vue'),
-						meta: {
-							title: 'message.router.pagesWorkflow',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin'],
-							icon: 'ele-Connection',
-						},
-					},
 				],
 			},
 			{

src/views/bigUpload/component/editBigUpload.vue

@@ -18,16 +18,13 @@
   </el-dialog>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {ref, reactive, defineComponent} from 'vue';
 import {getBigFile, editBigFile} from "/@/api/system/bigFile";
 
 import {ElMessage} from "element-plus";
-export default defineComponent({
+defineOptions({ name: "editBigUpload"})
-  name: "editBigUpload",
+const emit = defineEmits(["success"])
-  props:{},
-  emits: ["success"],
-  setup(prop, {emit}) {
 const formRef = ref<HTMLElement | null>(null);
 const isShowDialog = ref<boolean>(false)
 const ruleForm = reactive<any>({id:0, name:"", describe:""})
@@ -49,6 +46,9 @@ export default defineComponent({
   isShowDialog.value = false
 }
 
+defineExpose({
+  openDialog
+})
 
 const resetForm = () => {
   ruleForm.id = 0
@@ -73,19 +73,6 @@ export default defineComponent({
     }
   });
 }
-
-    return {
-      openDialog,
-      closeDialog,
-      isShowDialog,
-      ruleForm,
-      rules,
-      onSubmit,
-      formRef,
-      resetForm
-    }
-  }
-})
 </script>
 
 <style scoped>

src/views/bigUpload/index.vue

@@ -73,7 +73,7 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 
 import { onMounted, ref, defineComponent, getCurrentInstance} from 'vue';
 import getTableData from '/@/views/bigUpload/tableData'
@@ -81,14 +81,7 @@ import {addBigFile, deleteBigFile} from "/@/api/system/bigFile";
 import {ElMessage, ElMessageBox} from "element-plus";
 import EditBigUpload from '/@/views/bigUpload/component/editBigUpload.vue'
 
-
+defineOptions({ name: "bigUpload"})
-export default defineComponent({
-  name: "bigUpload",
-  components:{
-    EditBigUpload
-  },
-  setup() {
-
     const {
       total,
       queryParams,
@@ -98,20 +91,13 @@ export default defineComponent({
       getBigFileList,
       resetBigFileList
     } = getTableData()
-
-
     const editBigUploadRef = ref();
-
-
     const {proxy} = <any>getCurrentInstance();
-
     const selected = ref<number[]>([])
-
     // 文件上传
     const uploadHandle = function () {
       proxy.mittBus.emit("bigUploader.uploadFile")
     }
-
     onMounted(()=> {
       proxy.mittBus.on("bigUploader.uploadFileSuccess", (res:any) => {
         //console.log(res)
@@ -182,26 +168,6 @@ export default defineComponent({
         return ""
       }
     }
-
-
-    return {
-      total,
-      queryParams,
-      tableData,
-      queryRef,
-      resetQuery,
-      getBigFileList,
-      resetBigFileList,
-      uploadHandle,
-      handleSelectionChange,
-      byteText,
-      edit,
-      del,
-      delMult,
-      editBigUploadRef
-    }
-  }
-})
 </script>
 
 <style scoped lang="scss">

src/views/chart/head.vue

@@ -80,15 +80,6 @@ export default defineComponent({
 		animation: masked-animation-data-v-b02d8052 4s linear infinite;
 		-webkit-box-reflect: below -2px -webkit-gradient(linear, left top, left bottom, from(transparent), to(hsla(0, 0%, 100%, 0.1)));
 		position: relative;
-		@keyframes masked-animation {
-			0% {
-				background-position: 0 0;
-			}
-			100% {
-				background-position: -100% 0;
-			}
-		}
-		position: relative;
 		&::after {
 			content: '';
 			width: 250px;
@@ -104,4 +95,12 @@ export default defineComponent({
 		}
 	}
 }
+@keyframes masked-animation {
+  0% {
+    background-position: 0 0;
+  }
+  100% {
+    background-position: -100% 0;
+  }
+}
 </style>

src/views/home/index.vue

@@ -65,7 +65,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { toRefs, reactive, defineComponent, onMounted, ref, watch, nextTick, onActivated } from 'vue';
 import * as echarts from 'echarts';
 import { storeToRefs } from 'pinia';
@@ -78,10 +78,8 @@ let global: any = {
 	homeCharThree: null,
 	dispose: [null, '', undefined],
 };
+defineOptions({ name: "home"})
 
-export default defineComponent({
-	name: 'home',
-	setup() {
 const homeLineRef = ref();
 const homePieRef = ref();
 const homeBarRef = ref();
@@ -191,6 +189,7 @@ export default defineComponent({
     color: '#303133',
   },
 });
+const { homeOne,homeThree } = toRefs(state);
 // 折线图
 const initLineChart = () => {
   if (!global.dispose.some((b: any) => b === global.homeChartOne)) global.homeChartOne.dispose();
@@ -542,14 +541,6 @@ export default defineComponent({
     immediate: true,
   }
 );
-		return {
-			homeLineRef,
-			homePieRef,
-			homeBarRef,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/views/login/component/account.vue

@@ -80,7 +80,7 @@
   </el-form>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {
   toRefs,
   reactive,
@@ -103,10 +103,7 @@ import { formatAxis } from '/@/utils/formatTime';
 import { NextLoading } from '/@/utils/loading';
 import {captcha, login} from "/@/api/login";
 import GoCaptchaBtn from "/@/components/goCaptcha/GoCaptchaBtn.vue";
-export default defineComponent({
+defineOptions({ name: "loginAccount"})
-	name: 'loginAccount',
-  components: {GoCaptchaBtn},
-	setup() {
 const { t } = useI18n();
 const {proxy} = <any>getCurrentInstance();
 const storesThemeConfig = useThemeConfig();
@@ -137,6 +134,7 @@ export default defineComponent({
   },
   captchaSrc:'',
 });
+const { isShowPassword,ruleForm,formRules,loading,captchaSrc} = toRefs(state);
 onMounted(() => {
   getCaptcha();
 });
@@ -224,18 +222,6 @@ export default defineComponent({
   state.ruleForm.verifyCode = data.dots
   state.ruleForm.verifyKey = data.key
 }
-
-		return {
-			onSignIn,
-      getCaptcha,
-      checkCaptchaResult,
-      handleVerifyCodeConfirm,
-      loginForm,
-      verifyStatus,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 
 

src/views/login/component/mobile.vue

@@ -29,8 +29,8 @@
 	</el-form>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
-import { toRefs, reactive, defineComponent } from 'vue';
+import {ref} from 'vue';
 
 // 定义接口来定义对象的类型
 interface LoginMobileState {
@@ -39,20 +39,11 @@ interface LoginMobileState {
 }
 
 // 定义对象与类型
-const ruleForm: LoginMobileState = {
+const ruleForm = ref<LoginMobileState>({
 	userName: '',
 	code: '',
-};
-
-export default defineComponent({
-	name: 'loginMobile',
-	setup() {
-		const state = reactive({ ruleForm });
-		return {
-			...toRefs(state),
-		};
-	},
 });
+defineOptions({ name: "loginMobile"})
 </script>
 
 <style scoped lang="scss">

src/views/login/component/scan.vue

@@ -5,19 +5,16 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { ref, defineComponent, onMounted } from 'vue';
 import QRCode from 'qrcodejs2-fixes';
-
+defineOptions({ name: "loginScan"})
-export default defineComponent({
-	name: 'loginScan',
-	setup() {
 const qrcodeRef = ref<HTMLElement | null>(null);
 // 初始化生成二维码
 const initQrcode = () => {
   (qrcodeRef.value as HTMLElement).innerHTML = '';
   new QRCode(qrcodeRef.value, {
-				text: `https://qm.qq.com/cgi-bin/qm/qr?k=RdUY97Vx0T0vZ_1OOu-X1yFNkWgDwbjC&jump_from=webapi`,
+    text: `https://qm.qq.com/cgi-bin/qm/qr?k=CDO9yYdygFMKdQihlUXj4-Y0RDEhPTsh&authKey=vw/uQT5H4L/Kb0zT1gj7dd0PVtUDm9RdWqz4cztJb/QmPaSdyS/yeRHhjZaUj43v&noverify=0`,
     width: 260,
     height: 260,
     colorDark: '#000000',
@@ -28,9 +25,6 @@ export default defineComponent({
 onMounted(() => {
   initQrcode();
 });
-		return { qrcodeRef };
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/views/login/index.vue

@@ -38,7 +38,7 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { toRefs, reactive, computed, defineComponent, onMounted } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
@@ -54,17 +54,14 @@ interface LoginState {
 	tabsActiveName: string;
 	isScan: boolean;
 }
-
+defineOptions({ name: "loginIndex"})
-export default defineComponent({
-	name: 'loginIndex',
-	components: { Account, Mobile, Scan },
-	setup() {
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
 const state = reactive<LoginState>({
   tabsActiveName: 'account',
   isScan: false,
 });
+const { tabsActiveName,isScan } = toRefs(state);
 // 获取布局配置信息
 const getThemeConfig = computed(() => {
   return themeConfig.value;
@@ -73,14 +70,6 @@ export default defineComponent({
 onMounted(() => {
   NextLoading.done();
 });
-		return {
-			logoMini,
-			loginIconTwo,
-			getThemeConfig,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 
 

src/views/system/config/component/editConfig.vue

@@ -34,7 +34,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { reactive, toRefs, defineComponent,ref, unref } from 'vue';
 import {ElMessage} from "element-plus";
 import {addConfig, editConfig, getConfig} from "/@/api/system/config";
@@ -51,16 +51,14 @@ interface DicState {
 	ruleForm: RuleFormState;
   rules:{}
 }
-
+defineOptions({ name: "apiV1SystemConfigEdit"})
-export default defineComponent({
+const props = defineProps({
-	name: 'systemEditDicData',
-  props:{
   sysYesNoOptions:{
     type:Array,
     default:()=>[]
   }
-  },
+})
-	setup(prop,{emit}) {
+const emit = defineEmits(['dataList'])
 const formRef = ref<HTMLElement | null>(null);
 const state = reactive<DicState>({
   isShowDialog: false,
@@ -84,6 +82,7 @@ export default defineComponent({
     ]
   }
 });
+const { isShowDialog,ruleForm,rules } = toRefs(state);
 // 打开弹窗
 const openDialog = (row: RuleFormState|null) => {
   resetForm();
@@ -97,6 +96,7 @@ export default defineComponent({
   }
   state.isShowDialog = true;
 };
+defineExpose({ openDialog})
 const resetForm = ()=>{
   state.ruleForm = {
     configId: 0,
@@ -139,14 +139,4 @@ export default defineComponent({
     }
   });
 };
-		return {
-			openDialog,
-			closeDialog,
-			onCancel,
-			onSubmit,
-      formRef,
-			...toRefs(state),
-		};
-	},
-});
 </script>

src/views/system/config/index.vue

@@ -8,7 +8,6 @@
                 v-model="tableData.param.configName"
                 placeholder="请输入参数名称"
                 clearable
-                size="default"
                 @keyup.enter.native="dataList"
             />
           </el-form-item>
@@ -17,7 +16,6 @@
                 v-model="tableData.param.configKey"
                 placeholder="请输入参数键名"
                 clearable
-                size="default"
                 @keyup.enter.native="dataList"
             />
           </el-form-item>
@@ -26,7 +24,6 @@
                 v-model="tableData.param.configType"
                 placeholder="系统内置"
                 clearable
-                size="default"
                 style="width: 240px"
             >
               <el-option v-for="dict in sys_yes_no"
@@ -38,7 +35,6 @@
           <el-form-item label="创建时间" prop="dateRange">
             <el-date-picker
                 v-model="tableData.param.dateRange"
-                size="default"
                 style="width: 240px"
                 value-format="YYYY-MM-DD"
                 type="daterange"
@@ -103,7 +99,7 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {toRefs,reactive,onMounted,ref,defineComponent,unref,getCurrentInstance} from 'vue';
 import { ElMessageBox, ElMessage,FormInstance} from 'element-plus';
 import EditConfig from '/@/views/system/config/component/editConfig.vue';
@@ -135,11 +131,7 @@ interface TableDataState {
     };
   };
 }
-
+defineOptions({ name: "apiV1SystemConfigList"})
-export default defineComponent({
-  name: 'apiV1SystemDictDataList',
-  components: { EditConfig },
-  setup() {
 const {proxy} = getCurrentInstance() as any;
 const addDicRef = ref();
 const editDicRef = ref();
@@ -161,6 +153,7 @@ export default defineComponent({
     },
   },
 });
+const { tableData } = toRefs(state);
 // 初始化表格数据
 const initTableData = () => {
   dataList()
@@ -180,7 +173,7 @@ export default defineComponent({
   editDicRef.value.openDialog(row);
 };
 // 删除字典
-    const onRowDel = (row: TableDataRow) => {
+const onRowDel = (row: TableDataRow|null) => {
   let msg = '你确定要删除所选数据？';
   let ids:number[] = [] ;
   if(row){
@@ -224,20 +217,4 @@ export default defineComponent({
 const typeFormat=(row:TableDataRow) => {
   return proxy.selectDictLabel(unref(sys_yes_no), row.configType);
 };
-    return {
-      addDicRef,
-      editDicRef,
-      queryRef,
-      sys_yes_no,
-      onOpenAddDic,
-      onOpenEditDic,
-      onRowDel,
-      dataList,
-      resetQuery,
-      handleSelectionChange,
-      typeFormat,
-      ...toRefs(state),
-    };
-  },
-});
 </script>

src/views/system/dept/component/editDept.vue

@@ -71,7 +71,7 @@
   <select-user   ref="selectUserRef"    @selectUser="confirmUser" :selectedUsers="deptUser"></select-user>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {reactive, toRefs, defineComponent, getCurrentInstance,ref,unref} from 'vue';
 import {addDept,editDept, getDeptList} from "/@/api/system/dept";
 import {getUserByIds} from '/@/api/system/user';
@@ -101,14 +101,8 @@ interface DeptSate {
 	deptData: Array<TableDataRow>;
   rules: object;
 }
-
+defineOptions({ name: "systemEditDept"})
-export default defineComponent({
+const emit = defineEmits(['deptList'])
-	name: 'systemEditDept',
-  components:{
-    selectUser,
-  },
-  emits:['deptList'],
-	setup(prop,{emit}) {
 const {proxy} = getCurrentInstance() as any;
 const formRef = ref<HTMLElement | null>(null);
 const selectUserRef = ref();
@@ -132,6 +126,7 @@ export default defineComponent({
     ]
   }
 });
+const { isShowDialog, ruleForm, deptData,rules } = toRefs(state);
 // 打开弹窗
 const openDialog = (row?: RuleFormState|number) => {
   resetForm()
@@ -161,6 +156,7 @@ export default defineComponent({
   }
   state.isShowDialog = true;
 };
+defineExpose({openDialog})
 // 关闭弹窗
 const closeDialog = () => {
   state.isShowDialog = false;
@@ -230,21 +226,6 @@ export default defineComponent({
 const  handleSelectUser = () =>{
   selectUserRef.value.openDialog()
 };
-		return {
-			openDialog,
-			closeDialog,
-			onCancel,
-			onSubmit,
-      selectUserRef,
-      formRef,
-      deptUser,
-      confirmUser,
-      handleClose,
-      handleSelectUser,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 <style>
 .u-m-r-10{

src/views/system/dept/index.vue

@@ -57,7 +57,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { ref, toRefs, reactive, onMounted, defineComponent,getCurrentInstance } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import EditDept from '/@/views/system/dept/component/editDept.vue';
@@ -86,11 +86,7 @@ interface TableDataState {
 		};
 	};
 }
-
+defineOptions({ name: "systemDept"})
-export default defineComponent({
-	name: 'systemDept',
-	components: { EditDept },
-	setup() {
 const {proxy} = getCurrentInstance() as any;
 const editDeptRef = ref();
 const state = reactive<TableDataState>({
@@ -105,6 +101,7 @@ export default defineComponent({
     },
   },
 });
+const { tableData } = toRefs(state);
 // 初始化表格数据
 const initTableData = () => {
   deptList();
@@ -142,14 +139,4 @@ export default defineComponent({
 onMounted(() => {
   initTableData();
 });
-		return {
-			editDeptRef,
-      deptList,
-			onOpenAddDept,
-			onOpenEditDept,
-			onTabelRowDel,
-			...toRefs(state),
-		};
-	},
-});
 </script>

src/views/system/dict/component/editDic.vue

@@ -10,8 +10,8 @@
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="ruleForm.status">
-            <el-radio :label="1" >启用</el-radio>
+            <el-radio :value="1" >启用</el-radio>
-            <el-radio :label="0" >禁用</el-radio>
+            <el-radio :value="0" >禁用</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -28,7 +28,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { reactive, toRefs, defineComponent,ref, unref } from 'vue';
 import { getType,addType,editType } from '/@/api/system/dict/type';
 import {ElMessage} from "element-plus";
@@ -44,10 +44,8 @@ interface DicState {
 	ruleForm: RuleFormState;
   rules:{}
 }
-
+defineOptions({ name: "systemEditDic"})
-export default defineComponent({
+const emit = defineEmits(['typeList']);
-	name: 'systemEditDic',
-	setup(prop,{emit}) {
 const formRef = ref<HTMLElement | null>(null);
 const state = reactive<DicState>({
   isShowDialog: false,
@@ -67,6 +65,7 @@ export default defineComponent({
     ]
   }
 });
+const { isShowDialog,ruleForm,rules } = toRefs(state);
 // 打开弹窗
 const openDialog = (row: RuleFormState|null) => {
   resetForm();
@@ -78,6 +77,7 @@ export default defineComponent({
   }
   state.isShowDialog = true;
 };
+defineExpose({ openDialog})
 const resetForm = ()=>{
   state.ruleForm = {
     dictId:0,
@@ -120,15 +120,4 @@ export default defineComponent({
   });
 };
 
-
-		return {
-			openDialog,
-			closeDialog,
-			onCancel,
-			onSubmit,
-      formRef,
-			...toRefs(state),
-		};
-	},
-});
 </script>

src/views/system/dict/component/editDicData.vue

@@ -26,8 +26,8 @@
 
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="ruleForm.status">
-            <el-radio :label="1" >启用</el-radio>
+            <el-radio :value="1" >启用</el-radio>
-            <el-radio :label="0" >禁用</el-radio>
+            <el-radio :value="0" >禁用</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -44,7 +44,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { reactive, toRefs, defineComponent,ref, unref } from 'vue';
 import { getData,addData,editData } from '/@/api/system/dict/data';
 import {ElMessage} from "element-plus";
@@ -63,16 +63,14 @@ interface DicState {
 	ruleForm: RuleFormState;
   rules:{}
 }
-
+defineOptions({ name: "systemEditDicData"})
-export default defineComponent({
+const prop = defineProps({
-	name: 'systemEditDicData',
-  props:{
   dictType:{
     type:String,
-      default:()=>''
+    default:''
   }
-  },
+})
-	setup(prop,{emit}) {
+const emit = defineEmits(['dataList']);
 const formRef = ref<HTMLElement | null>(null);
 const state = reactive<DicState>({
   isShowDialog: false,
@@ -98,6 +96,7 @@ export default defineComponent({
     ]
   }
 });
+const { isShowDialog,ruleForm,rules } = toRefs(state);
 // 打开弹窗
 const openDialog = (row: RuleFormState|null) => {
   resetForm();
@@ -109,6 +108,7 @@ export default defineComponent({
   }
   state.isShowDialog = true;
 };
+defineExpose({ openDialog})
 const resetForm = ()=>{
   state.ruleForm = {
     dictCode: 0,
@@ -153,14 +153,4 @@ export default defineComponent({
     }
   });
 };
-		return {
-			openDialog,
-			closeDialog,
-			onCancel,
-			onSubmit,
-      formRef,
-			...toRefs(state),
-		};
-	},
-});
 </script>

src/views/system/dict/dataList.vue

@@ -91,15 +91,13 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
 import { ElMessageBox, ElMessage,FormInstance} from 'element-plus';
 import EditDic from '/@/views/system/dict/component/editDicData.vue';
 import {getDataList,deleteData} from "/@/api/system/dict/data";
 import { useRoute } from 'vue-router';
 
-
-
 // 定义接口来定义对象的类型
 interface TableDataRow {
   dictCode: number;
@@ -126,11 +124,7 @@ interface TableDataState {
     };
   };
 }
-
+defineOptions({ name: "apiV1SystemDictDataList"})
-export default defineComponent({
-  name: 'apiV1SystemDictDataList',
-  components: { EditDic },
-  setup() {
 const route = useRoute();
 const addDicRef = ref();
 const editDicRef = ref();
@@ -150,6 +144,7 @@ export default defineComponent({
     },
   },
 });
+const { tableData } = toRefs(state);
 // 初始化表格数据
 const initTableData = () => {
   dataList()
@@ -169,7 +164,7 @@ export default defineComponent({
   editDicRef.value.openDialog(row);
 };
 // 删除字典
-    const onRowDel = (row: TableDataRow) => {
+const onRowDel = (row: TableDataRow|null) => {
   let msg = '你确定要删除所选数据？';
   let ids:number[] = [] ;
   if(row){
@@ -211,18 +206,4 @@ export default defineComponent({
 const handleSelectionChange = (selection:TableDataRow[])=> {
   state.ids = selection.map(item => item.dictCode)
 };
-    return {
-      addDicRef,
-      editDicRef,
-      queryRef,
-      onOpenAddDic,
-      onOpenEditDic,
-      onRowDel,
-      dataList,
-      resetQuery,
-      handleSelectionChange,
-      ...toRefs(state),
-    };
-  },
-});
 </script>

src/views/system/dict/index.vue

@@ -109,7 +109,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
 import { ElMessageBox, ElMessage,FormInstance} from 'element-plus';
 import EditDic from '/@/views/system/dict/component/editDic.vue';
@@ -141,11 +141,7 @@ interface TableDataState {
 		};
 	};
 }
-
+defineOptions({ name: "systemDic"})
-export default defineComponent({
-	name: 'systemDic',
-	components: { EditDic },
-	setup() {
 const addDicRef = ref();
 const editDicRef = ref();
 const queryRef = ref();
@@ -165,6 +161,7 @@ export default defineComponent({
     },
   },
 });
+const { tableData } = toRefs(state);
 // 初始化表格数据
 const initTableData = () => {
   typeList()
@@ -184,7 +181,7 @@ export default defineComponent({
   editDicRef.value.openDialog(row);
 };
 // 删除字典
-		const onRowDel = (row: TableDataRow) => {
+const onRowDel = (row: TableDataRow|null) => {
   let msg = '你确定要删除所选数据？';
   let ids:number[] = [] ;
   if(row){
@@ -224,18 +221,5 @@ export default defineComponent({
 const handleSelectionChange = (selection:TableDataRow[])=> {
   state.ids = selection.map(item => item.dictId)
 };
-		return {
+
-			addDicRef,
-			editDicRef,
-      queryRef,
-			onOpenAddDic,
-			onOpenEditDic,
-			onRowDel,
-      typeList,
-      resetQuery,
-      handleSelectionChange,
-			...toRefs(state),
-		};
-	},
-});
 </script>

src/views/system/menu/component/editMenu.vue

@@ -25,9 +25,9 @@
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" >
 						<el-form-item label="菜单类型" prop="menuType">
 							<el-radio-group v-model="ruleForm.menuType">
-                <el-radio label="0">目录</el-radio>
+                <el-radio value="0">目录</el-radio>
-                <el-radio label="1">菜单</el-radio>
+                <el-radio value="1">菜单</el-radio>
-                <el-radio label="2">按钮</el-radio>
+                <el-radio value="2">按钮</el-radio>
 							</el-radio-group>
 						</el-form-item>
 					</el-col>
@@ -98,7 +98,7 @@
                   <el-radio
                       v-for="dict in visibleOptions"
                       :key="dict.value"
-                      :label="dict.value"
+                      :value="dict.value"
                   >{{ dict.label }}</el-radio>
 								</el-radio-group>
 							</el-form-item>
@@ -106,32 +106,32 @@
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" >
 							<el-form-item label="页面缓存">
 								<el-radio-group v-model="ruleForm.isKeepAlive">
-									<el-radio :label="1">缓存</el-radio>
+									<el-radio :value="1">缓存</el-radio>
-									<el-radio :label="0">不缓存</el-radio>
+									<el-radio :value="0">不缓存</el-radio>
 								</el-radio-group>
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" >
 							<el-form-item label="是否固定">
 								<el-radio-group v-model="ruleForm.isAffix">
-									<el-radio :label="1">固定</el-radio>
+									<el-radio :value="1">固定</el-radio>
-									<el-radio :label="0">不固定</el-radio>
+									<el-radio :value="0">不固定</el-radio>
 								</el-radio-group>
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" >
 							<el-form-item label="是否外链">
 								<el-radio-group v-model="ruleForm.isLink" :disabled="ruleForm.isIframe===1">
-									<el-radio :label="1">是</el-radio>
+									<el-radio :value="1">是</el-radio>
-									<el-radio :label="0">否</el-radio>
+									<el-radio :value="0">否</el-radio>
 								</el-radio-group>
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" >
 							<el-form-item label="是否内嵌">
 								<el-radio-group v-model="ruleForm.isIframe" @change="onSelectIframeChange">
-									<el-radio :label="1">是</el-radio>
+									<el-radio :value="1">是</el-radio>
-									<el-radio :label="0">否</el-radio>
+									<el-radio :value="0">否</el-radio>
 								</el-radio-group>
 							</el-form-item>
 						</el-col>
@@ -148,18 +148,14 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { reactive, toRefs, defineComponent,ref,unref,getCurrentInstance,nextTick } from 'vue';
 import IconSelector from '/@/components/iconSelector/index.vue';
 import { refreshBackEndControlRoutes } from "/@/router/backEnd";
 import {getMenuParams, addMenu, getMenuInfo, updateMenu} from "/@/api/system/menu";
 import {ElMessage} from "element-plus"
-
+defineOptions({ name: "systemEditMenu"})
-
+const props = defineProps({
-export default defineComponent({
-	name: 'systemEditMenu',
-	components: { IconSelector },
-  props:{
   visibleOptions:{
     type:Array,
     default:()=>[],
@@ -168,8 +164,8 @@ export default defineComponent({
     type:String,
     default:()=>'add'
   }
-  },
+})
-	setup(props,{emit}) {
+const emit = defineEmits(['menuList']);
 const ruleFormRef = ref<HTMLElement | null>(null);
 const {proxy} = getCurrentInstance() as any;
 const state = reactive({
@@ -216,7 +212,7 @@ export default defineComponent({
   },
   menuData: [], // 上级菜单数据
 });
-
+const {ruleForm, rules, menuData, loading, isShowDialog, roles} = toRefs(state);
 // 打开弹窗
 const openDialog = (row: any) => {
   initForm();
@@ -330,16 +326,5 @@ export default defineComponent({
     isIframe: 0, // 是否内嵌，开启条件，`1、isIframe:true 2、链接地址不为空`
   }
 };
-		return {
+defineExpose({ openDialog, resetMenuSession})
-      ruleFormRef,
-			openDialog,
-			closeDialog,
-			onSelectIframeChange,
-			onCancel,
-			onSubmit,
-      resetMenuSession,
-			...toRefs(state),
-		};
-	},
-});
 </script>

src/views/system/menu/index.vue

@@ -80,15 +80,12 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {ref, toRefs, reactive, onBeforeMount, defineComponent, getCurrentInstance, unref} from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import EditMenu from '/@/views/system/menu/component/editMenu.vue';
 import {delMenu, getMenuList} from "/@/api/system/menu";
-export default defineComponent({
+defineOptions({ name: "apiV1SystemAuthMenuList"})
-	name: 'apiV1SystemAuthMenuList',
-	components: { EditMenu },
-	setup() {
 const editMenuRef = ref();
 const state = reactive({
   queryParams:{
@@ -97,6 +94,7 @@ export default defineComponent({
   },
   menuTableData:[],
 });
+const {queryParams,menuTableData} = toRefs(state);
 const {proxy} = getCurrentInstance() as any;
 const {sys_show_hide} = proxy.useDict('sys_show_hide')
 const acType = ref('add')
@@ -140,18 +138,4 @@ export default defineComponent({
     state.menuTableData = proxy.handleTree(res.data.rules??[], "id","pid");
   })
 };
-		return {
-			editMenuRef,
-			onOpenAddMenu,
-			onOpenEditMenu,
-			onTabelRowDel,
-      formatIsHide,
-      menuList,
-      handleQuery,
-			...toRefs(state),
-      sys_show_hide,
-      acType
-		};
-	},
-});
 </script>

src/views/system/monitor/loginLog/index.vue

@@ -9,7 +9,6 @@
                 placeholder="请输入登录地址"
                 clearable
                 style="width: 180px;"
-                size="default"
                 @keyup.enter.native="dataList"
             />
           </el-form-item>
@@ -20,7 +19,6 @@
                 placeholder="请输入登录地点"
                 clearable
                 style="width: 180px;"
-                size="default"
                 @keyup.enter.native="dataList"
             />
           </el-form-item>
@@ -31,7 +29,6 @@
                 placeholder="请输入用户名称"
                 clearable
                 style="width: 180px;"
-                size="default"
                 @keyup.enter.native="dataList"
             />
           </el-form-item>
@@ -41,7 +38,6 @@
                 v-model="tableData.param.status"
                 placeholder="登录状态"
                 clearable
-                size="default"
                 style="width: 180px"
             >
               <el-option
@@ -56,7 +52,6 @@
           <el-form-item label="登录时间" prop="dateRange">
             <el-date-picker
                 v-model="tableData.param.dateRange"
-                size="default"
                 style="width: 240px"
                 value-format="YYYY-MM-DD"
                 type="daterange"
@@ -117,7 +112,7 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { toRefs, reactive, onMounted, ref, defineComponent,getCurrentInstance,unref } from 'vue';
 import { ElMessageBox, ElMessage,FormInstance} from 'element-plus';
 import { logList,deleteLog,clearLog } from '/@/api/system/monitor/loginLog';
@@ -152,10 +147,7 @@ interface TableDataState {
     };
   };
 }
-
+defineOptions({ name: "apiV1SystemLoginLogList"})
-export default defineComponent({
-  name: 'apiV1SystemLoginLogList',
-  setup() {
 const {proxy} = getCurrentInstance() as any;
 const queryRef = ref();
 const {admin_login_status} = proxy.useDict('admin_login_status')
@@ -176,6 +168,7 @@ export default defineComponent({
     },
   },
 });
+const { tableData } = toRefs(state);
 // 初始化表格数据
 const initTableData = () => {
   dataList()
@@ -187,7 +180,7 @@ export default defineComponent({
   });
 };
 // 删除日志
-    const onRowDel = (row: TableDataRow) => {
+const onRowDel = (row: TableDataRow|null) => {
   let msg = '你确定要删除所选数据？';
   let ids:number[] = [] ;
   if(row){
@@ -246,17 +239,4 @@ export default defineComponent({
 const statusFormat = (row:TableDataRow) => {
   return proxy.selectDictLabel(unref(admin_login_status), row.status);
 };
-    return {
-      queryRef,
-      onRowDel,
-      dataList,
-      resetQuery,
-      handleSelectionChange,
-      statusFormat,
-      onRowClear,
-      admin_login_status,
-      ...toRefs(state),
-    };
-  },
-});
 </script>

src/views/system/monitor/operLog/component/detail.vue

@@ -48,7 +48,7 @@
     </el-drawer>
   </div>
 </template>
-<script lang="ts">
+<script setup lang="ts">
 import { reactive, toRefs, defineComponent,ref,getCurrentInstance,computed } from 'vue';
 import {
   getSysOperLog
@@ -57,17 +57,14 @@ import {
   SysOperLogInfoData,
   SysOperLogEditState,
 } from "/@/views/system/monitor/operLog/component/model"
-export default defineComponent({
+defineOptions({ name: "apiV1SystemSysOperLogDetail"})
-  name:"apiV1SystemSysOperLogDetail",
+const props = defineProps({
-  components:{
-  },
-  props:{
   requestMethodOptions:{
     type:Array,
     default:()=>[]
   },
-  },
+})
-  setup(props,{emit}) {
+const emit = defineEmits(['getSysDeptItemsDeptName'])
 const {proxy} = <any>getCurrentInstance()
 const formRef = ref<HTMLElement | null>(null);
 const menuRef = ref();
@@ -112,6 +109,7 @@ export default defineComponent({
     ],
   }
 });
+const {isShowDialog,formData} = toRefs(state);
 // 打开弹窗
 const openDialog = (row?: SysOperLogInfoData) => {
   resetForm();
@@ -123,6 +121,7 @@ export default defineComponent({
   }
   state.isShowDialog = true;
 };
+defineExpose({ openDialog})
 // 关闭弹窗
 const closeDialog = () => {
   state.isShowDialog = false;
@@ -159,18 +158,6 @@ export default defineComponent({
 const getSysDeptItemsDeptName = () => {
   emit("getSysDeptItemsDeptName")
 }
-    return {
-      proxy,
-      openDialog,
-      closeDialog,
-      onCancel,
-      menuRef,
-      formRef,
-      getSysDeptItemsDeptName,
-      ...toRefs(state),
-    };
-  }
-})
 </script>
 <style scoped>
 .system-sysOperLog-detail :deep(.el-form-item--large .el-form-item__label){

src/views/system/monitor/operLog/index.vue

@@ -43,7 +43,6 @@
                     v-model="tableData.param.operName"
                     placeholder="请输入操作人员"
                     clearable
-                    size="small"
                     @keyup.enter.native="sysOperLogList"
                 />
               </el-form-item>
@@ -165,7 +164,7 @@
     ></apiV1SystemSysOperLogDetail>
   </div>
 </template>
-<script lang="ts">
+<script setup lang="ts">
 import {ItemOptions} from "/@/api/items";
 import {toRefs, reactive, onMounted, ref, defineComponent, computed,getCurrentInstance,toRaw} from 'vue';
 import {ElMessageBox, ElMessage, FormInstance} from 'element-plus';
@@ -180,12 +179,7 @@ import {
   SysOperLogTableDataState,
 } from "/@/views/system/monitor/operLog/component/model"
 import apiV1SystemSysOperLogDetail from "/@/views/system/monitor/operLog/component/detail.vue"
-export default defineComponent({
+defineOptions({ name: "apiV1SystemSysOperLogList"})
-  name: "apiV1SystemSysOperLogList",
-  components:{
-    apiV1SystemSysOperLogDetail
-  },
-  setup() {
 const {proxy} = <any>getCurrentInstance()
 const loading = ref(false)
 const queryRef = ref()
@@ -230,6 +224,7 @@ export default defineComponent({
     },
   },
 });
+const { tableData } = toRefs(state);
 // 页面加载时
 onMounted(() => {
   initTableData();
@@ -278,7 +273,7 @@ export default defineComponent({
   }
   editRef.value.openDialog(toRaw(row));
 };
-    const handleDelete = (row: SysOperLogTableColumns) => {
+const handleDelete = (row: SysOperLogTableColumns|null) => {
   let msg = '你确定要删除所选数据？';
   let ids:number[] = [] ;
   if(row){
@@ -322,33 +317,6 @@ export default defineComponent({
 const handleView = (row:SysOperLogTableColumns)=>{
   detailRef.value.openDialog(toRaw(row));
 }
-    return {
-      proxy,
-      editRef,
-      detailRef,
-      showAll,
-      loading,
-      single,
-      multiple,
-      word,
-      queryRef,
-      resetQuery,
-      sysOperLogList,
-      toggleSearch,
-      requestMethodFormat,
-      sys_oper_log_type,
-      //关联表数据选项
-      deptNameOptions,
-      handleSelectionChange,
-      handleAdd,
-      handleUpdate,
-      handleDelete,
-      handleView,
-      onRowClear,
-      ...toRefs(state),
-    }
-  }
-})
 </script>
 <style lang="scss" scoped>
 .colBlock {

src/views/system/monitor/server/index.vue

@@ -318,10 +318,8 @@
 							detail: {
 								valueAnimation: true,
 								formatter: '{value}%',
-								textStyle: {
                 fontSize: 36,
                 color: 'red',
-								},
 								offsetCenter: ['0', '80%'],    //表盘数据(30%)位置
 							},
 							// data: [
@@ -369,10 +367,8 @@
 							detail: {
 								valueAnimation: true,
 								formatter: '{value}%',
-								textStyle: {
                 fontSize: 36,
                 color: 'red',
-								},
 								offsetCenter: ['0', '80%'],    //表盘数据(30%)位置
 							},
 							// data: [

src/views/system/monitor/userOnline/index.vue

@@ -4,10 +4,10 @@
       <div class="system-user-search mb15">
         <el-form :model="tableData.param" ref="queryRef" :inline="true">
           <el-form-item label="登录IP" prop="ipaddr">
-            <el-input size="default" v-model="tableData.param.ipaddr" placeholder="请输入登录IP" class="w-50 m-2" clearable/>
+            <el-input v-model="tableData.param.ipaddr" placeholder="请输入登录IP" class="w-50 m-2" clearable/>
           </el-form-item>
           <el-form-item label="用户名称" prop="userName">
-            <el-input size="default" v-model="tableData.param.userName" placeholder="请输入登录名称" class="w-50 m-2" clearable/>
+            <el-input v-model="tableData.param.userName" placeholder="请输入登录名称" class="w-50 m-2" clearable/>
           </el-form-item>
           <el-form-item>
             <el-button size="default" type="primary" class="ml10" @click="getList">
@@ -57,7 +57,7 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {toRefs, reactive, onMounted, defineComponent, ref} from 'vue';
 import {ElMessageBox, ElMessage, FormInstance} from 'element-plus';
 import { forceLogout, listSysUserOnline} from "/@/api/system/monitor/userOnline";
@@ -86,10 +86,7 @@ interface TableDataState {
     };
   };
 }
-
+defineOptions({ name: "apiV1SystemOnlineList"})
-export default defineComponent({
-  name: 'apiV1SystemOnlineList',
-  setup() {
 const queryRef = ref();
 const state = reactive<TableDataState>({
   ids:[],
@@ -105,6 +102,7 @@ export default defineComponent({
     },
   },
 });
+const { tableData} =toRefs(state)
 // 初始化表格数据
 const initTableData = () => {
   getList()
@@ -122,7 +120,7 @@ export default defineComponent({
   getList()
 };
 // 删除岗位
-    const onRowDel = (row: TableData) => {
+const onRowDel = (row: TableData|null) => {
   let msg = '你确定要强制退出用户登录？';
   let ids:number[] = [] ;
   if(row){
@@ -164,16 +162,4 @@ export default defineComponent({
 const handleSelectionChange = (selection:Array<TableData>)=> {
   state.ids = selection.map(item => item.id)
 };
-    return {
-      queryRef,
-      onRowDel,
-      onHandleSizeChange,
-      onHandleCurrentChange,
-      getList,
-      handleSelectionChange,
-      resetQuery,
-      ...toRefs(state),
-    };
-  },
-});
 </script>

src/views/system/personal/index.vue

@@ -203,7 +203,7 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { toRefs, reactive, computed, defineComponent,getCurrentInstance,onMounted } from 'vue';
 import { formatAxis } from '/@/utils/formatTime';
 import { storeToRefs } from 'pinia';
@@ -224,10 +224,8 @@ interface PersonalState {
   newsInfoList: any;
   recommendList: any;
 }
+defineOptions({ name: "personals"})
 
-export default defineComponent({
-  name: 'personals',
-  setup() {
 const baseURL:string|undefined|boolean = import.meta.env.VITE_API_URL
 const {proxy} = <any>getCurrentInstance();
 const stores = useUserInfo();
@@ -254,7 +252,7 @@ export default defineComponent({
   },
 });
 
-    // const  handleUpload =
+const { deptName,roles,imageUrl,personalForm} = toRefs(state);
 const handleUpload = () => {
   // console.log(state.personalForm)
   editPersonal(state.personalForm).then((res:any)=>{
@@ -325,19 +323,7 @@ export default defineComponent({
 onMounted(() => {
   initUserInfo();
 });
-    return {
+
-      proxy,
-      baseURL,
-      userInfos,
-      currentTime,
-      handleUpload,
-      handleEditPass,
-      handleAvatarSuccess,
-      dataParam,
-      ...toRefs(state),
-    };
-  },
-});
 </script>
 
 <style scoped lang="scss">

src/views/system/post/component/editPost.vue

@@ -31,7 +31,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { reactive, toRefs, defineComponent,ref,unref } from 'vue';
 import {addPost, editPost} from "/@/api/system/post";
 import {ElMessage} from "element-plus";
@@ -57,10 +57,8 @@ interface PostState {
 	};
   rules: object;
 }
-
+defineOptions({ name: "systemEditPost"})
-export default defineComponent({
+const emit = defineEmits(['getPostList']);
-	name: 'systemEditPost',
-	setup(props,{emit}) {
 const formRef = ref<HTMLElement | null>(null);
 const menuRef = ref();
 const state = reactive<PostState>({
@@ -94,6 +92,7 @@ export default defineComponent({
     label: 'title',
   },
 });
+const {isShowDialog,formData,loading,rules} = toRefs(state);
 // 打开弹窗
 const openDialog = (row?: DialogRow) => {
   resetForm();
@@ -102,6 +101,7 @@ export default defineComponent({
   }
   state.isShowDialog = true;
 };
+defineExpose({ openDialog})
 // 关闭弹窗
 const closeDialog = () => {
   state.isShowDialog = false;
@@ -152,18 +152,6 @@ export default defineComponent({
     remark:'',
   }
 };
-
-		return {
-			openDialog,
-			closeDialog,
-			onCancel,
-			onSubmit,
-      menuRef,
-      formRef,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/views/system/post/index.vue

@@ -70,7 +70,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {toRefs, reactive, onMounted, ref, defineComponent, toRaw} from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import EditPost from '/@/views/system/post/component/editPost.vue';
@@ -100,11 +100,7 @@ interface TableDataState {
 		};
 	};
 }
-
+defineOptions({ name: "apiV1SystemPostList"})
-export default defineComponent({
-	name: 'apiV1SystemPostList',
-	components: {EditPost},
-	setup() {
 const addPostRef = ref();
 const editPostRef = ref();
 const state = reactive<TableDataState>({
@@ -122,6 +118,7 @@ export default defineComponent({
     },
   },
 });
+const { tableData } = toRefs(state);
 // 初始化表格数据
 const initTableData = () => {
   postList()
@@ -183,18 +180,4 @@ export default defineComponent({
 const handleSelectionChange = (selection:Array<TableData>)=> {
   state.ids = selection.map(item => item.postId)
 };
-		return {
-			addPostRef,
-			editPostRef,
-			onOpenAddPost,
-			onOpenEditPost,
-			onRowDel,
-			onHandleSizeChange,
-			onHandleCurrentChange,
-      postList,
-      handleSelectionChange,
-			...toRefs(state),
-		};
-	},
-});
 </script>

src/views/system/role/component/dataScope.vue

@@ -33,7 +33,7 @@
           <template #header>
               <el-radio-group v-model="optionsActionValue" @change="setOptionsActionValueHandle">
                 <template v-for="item in dataScopeOptions" :key="item.value">
-                  <el-radio v-if="item.value!='2'" :value="item.value" >{{item.label}}</el-radio>
+                  <el-radio v-if="item.value.toString()!='2'" :value="item.value" >{{item.label}}</el-radio>
                 </template>
               </el-radio-group>
           </template>
@@ -42,7 +42,7 @@
               <el-radio-group v-model="menuAuthData[scope.row.id]">
                 <template v-for="item in dataScopeOptions" :key="item.value">
                   <el-radio :value="item.value" @change="setOptionsItemHandle(item.value,scope.row.id)">
-                    <el-badge v-if="item.value=='2' && menuAuthData[scope.row.id]=='2'" type="success" :value="getDeptLen(scope.row.id)" :max="99" class="item" :show-zero="false">{{item.label}}</el-badge>
+                    <el-badge v-if="item.value.toString()=='2' && menuAuthData[scope.row.id]=='2'" type="success" :value="getDeptLen(scope.row.id)" :max="99" class="item" :show-zero="false">{{item.label}}</el-badge>
                     <span v-else>{{item.label}}</span>
                   </el-radio>
                 </template>
@@ -91,21 +91,12 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
-import {defineComponent, getCurrentInstance, nextTick, reactive, ref} from "vue";
+import {getCurrentInstance, nextTick, reactive, ref} from "vue";
 import {dataScope, getRole, roleDeptTreeSelect, roleMenuTreeSelect} from "/@/api/system/role";
 import {ElMessage} from "element-plus/es";
-import {findChildrenByPid, flattenTree} from "/@/utils/gfast";
+defineOptions({ name: "dataScope"})
-import * as events from "events";
+const emit = defineEmits(["getRoleList"])
-
-export default defineComponent({
-  name: "dataScope",
-  computed: {
-    events() {
-      return events
-    }
-  },
-  setup(props,{emit}){
 const tableRef = ref()
 const openSelDept = ref(false);
 const {proxy} = getCurrentInstance() as any;
@@ -236,6 +227,7 @@ export default defineComponent({
     getMenuTreeselect(row.id)
   }
 };
+defineExpose({ openDialog})
 /** 根据角色ID查询部门树结构 */
 const getRoleDeptTreeselect = (menuId:any) =>{
   nextTick(()=>{
@@ -274,6 +266,7 @@ export default defineComponent({
     }
   })
 }
+
 // 关闭弹窗
 const closeDialog = () => {
   openDataScope.value = false;
@@ -330,42 +323,7 @@ export default defineComponent({
   }
   return 0
 }
-    return {
+
-      tableRef,
-      openSelDept,
-      openDialog,
-      dataScopeOptions,
-      deptExpand,
-      openDataScope,
-      deptNodeAll,
-      deptOptions,
-      deptCheckStrictly,
-      deptProps,
-      menuOptions,
-      deptRef,
-      formRef,
-      optionsActionValue,
-      cancelDataScope,
-      submitDataScope,
-      handleCheckedTreeExpand,
-      handleCheckedTreeNodeAll,
-      handleCheckedTreeConnect,
-      menuTableData,
-      handleSelectionChange,
-      setOptionsActionValueHandle,
-      menuAuthData,
-      setOptionsItemHandle,
-      openSelDeptHandler,
-      cancelDept,
-      submitDept,
-      submitSonMenuDept,
-      deptAuthData,
-      setDeptId,
-      getDeptLen,
-      form
-    }
-  }
-})
 </script>
 
 <style scoped lang="scss">

src/views/system/role/component/editRole.vue

@@ -43,22 +43,22 @@
           <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" >
             <el-form-item label="有效时间">
               <el-radio-group v-model="formData.effectiveType">
-                <el-radio :label="0">不设置</el-radio>
+                <el-radio :value="0">不设置</el-radio>
-                <el-radio :label="1">按起止日期</el-radio>
+                <el-radio :value="1">按起止日期</el-radio>
-                <el-radio :label="2">按时间段</el-radio>
+                <el-radio :value="2">按时间段</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" v-show="formData.effectiveType===2">
             <el-form-item label="每周">
               <el-checkbox-group v-model="formData.weekDay">
-                <el-checkbox :label="1" >周一</el-checkbox>
+                <el-checkbox :value="1" >周一</el-checkbox>
-                <el-checkbox :label="2" >周二</el-checkbox>
+                <el-checkbox :value="2" >周二</el-checkbox>
-                <el-checkbox :label="3" >周三</el-checkbox>
+                <el-checkbox :value="3" >周三</el-checkbox>
-                <el-checkbox :label="4" >周四</el-checkbox>
+                <el-checkbox :value="4" >周四</el-checkbox>
-                <el-checkbox :label="5" >周五</el-checkbox>
+                <el-checkbox :value="5" >周五</el-checkbox>
-                <el-checkbox :label="6" >周六</el-checkbox>
+                <el-checkbox :value="6" >周六</el-checkbox>
-                <el-checkbox :label="0" >周日</el-checkbox>
+                <el-checkbox :value="0" >周日</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
           </el-col>
@@ -120,7 +120,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { reactive, toRefs, defineComponent,ref,getCurrentInstance,unref } from 'vue';
 import {addRole, editRole, getRole, getRoleParams} from "/@/api/system/role";
 import {ElMessage} from "element-plus";
@@ -162,16 +162,14 @@ interface RoleState {
 	};
   rules: object;
 }
-
+defineOptions({ name: "systemEditRole"})
-export default defineComponent({
+const props = defineProps({
-	name: 'systemEditRole',
-  props:{
   roleData:{
     type:Array,
     default:()=>[]
   }
-  },
+})
-	setup(props,{emit}) {
+const emit = defineEmits(['getRoleList']);
 const {proxy} = getCurrentInstance() as any;
 const formRef = ref<HTMLElement | null>(null);
 const menuRef = ref();
@@ -227,6 +225,7 @@ export default defineComponent({
   }
   state.isShowDialog = true;
 };
+defineExpose({ openDialog})
 // 关闭弹窗
 const closeDialog = () => {
   state.isShowDialog = false;
@@ -299,6 +298,7 @@ export default defineComponent({
     dateRange:[]
   }
 };
+const {formData, menuData,menuExpand,menuNodeAll,menuCheckStrictly,menuProps,rules,loading,isShowDialog} = toRefs(state)
 /** 树权限（展开/折叠）*/
 const handleCheckedTreeExpand = (value:any) => {
   let treeList = state.menuData;
@@ -331,21 +331,6 @@ export default defineComponent({
 const resetMenuSession = () => {
   refreshBackEndControlRoutes();
 };
-		return {
-			openDialog,
-			closeDialog,
-			onCancel,
-			onSubmit,
-      menuRef,
-      formRef,
-      handleCheckedTreeExpand,
-      handleCheckedTreeNodeAll,
-      handleCheckedTreeConnect,
-      resetMenuSession,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 
 <style scoped lang="scss">

src/views/system/role/index.vue

@@ -77,7 +77,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {toRefs, reactive, onMounted, ref, defineComponent, toRaw,getCurrentInstance} from 'vue';
 import { ElMessageBox, ElMessage,ElLoading } from 'element-plus';
 import EditRole from '/@/views/system/role/component/editRole.vue';
@@ -118,11 +118,7 @@ interface TableDataState {
 		};
 	};
 }
-
+defineOptions({ name: "apiV1SystemRoleList"})
-export default defineComponent({
-	name: 'apiV1SystemRoleList',
-	components: {selectUser, EditRole,DataScope,UserList},
-	setup() {
 const selectUserRef = ref()
 const {proxy} = getCurrentInstance() as any;
 const {sys_user_sex} = proxy.useDict('sys_user_sex')
@@ -152,6 +148,7 @@ export default defineComponent({
     },
   },
 });
+const { tableData,selectRow,deptData,userListParam,isShowDialog} = toRefs(state);
 // 初始化表格数据
 const initTableData = () => {
   roleList()
@@ -285,30 +282,6 @@ export default defineComponent({
     roleList()
   })
 }
-		return {
-			addRoleRef,
-			editRoleRef,
-      dataScopeRef,
-      sys_user_sex,
-      selectUserRef,
-			userList,
-			onOpenUserList,
-			onOpenAddRole,
-			onOpenEditRole,
-			onRowDel,
-			onHandleSizeChange,
-			onHandleCurrentChange,
-      roleList,
-      handleDataScope,
-      handleUserScope,
-      handleCommand,
-      roleUsers,
-      confirmUser,
-      setRoleUser,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 <style scoped lang="scss">
 .auth-action{

src/views/system/sysJob/list/component/detail.vue

@@ -76,7 +76,7 @@
     </el-drawer>
   </div>
 </template>
-<script lang="ts">
+<script setup lang="ts">
 import { reactive, toRefs, defineComponent,ref,unref,getCurrentInstance,computed } from 'vue';
 import {ElMessageBox, ElMessage, FormInstance,UploadProps} from 'element-plus';
 import {
@@ -93,11 +93,8 @@
   SysJobTableDataState,
   SysJobEditState, SysJobLog, SysJobLogData,
 } from "/@/views/system/sysJob/list/component/model"
-  export default defineComponent({
+defineOptions({ name: "apiV1SystemSysJobDetail"})
-    name:"apiV1SystemSysJobDetail",
+const props = defineProps({
-    components:{
-    },
-    props:{
   jobGroupOptions:{
     type:Array,
     default:()=>[]
@@ -110,8 +107,7 @@
     type:Array,
     default:()=>[]
   },
-    },
+})
-    setup(props,{emit}) {
 const {proxy} = <any>getCurrentInstance()
 const formRef = ref<HTMLElement | null>(null);
 const menuRef = ref();
@@ -152,6 +148,7 @@
   // 表单校验
   rules: {}
 });
+const { isShowDialog,formData} = toRefs(state)
 // 打开弹窗
 const openDialog = (row?: SysJobInfoData) => {
 resetForm();
@@ -164,6 +161,7 @@
 }
 state.isShowDialog = true;
 };
+defineExpose({openDialog})
 const getLogList = (invokeTarget:string)=>{
   logList.param.targetName=invokeTarget
   getJobLogs(logList.param).then((res:any)=>{
@@ -234,22 +232,6 @@
       })
       .catch(() => {});
 }
-        return {
-          proxy,
-          openDialog,
-          closeDialog,
-          onCancel,
-          menuRef,
-          formRef,
-          logList,
-          getLogList,
-          handleSelectionChange,
-          multiple,
-          handleDelete,
-          ...toRefs(state),
-        };
-      }
-  })
 </script>
 <style scoped>
   .system-sysJob-detail :deep(.el-form-item--large .el-form-item__label){

src/views/system/sysJob/list/component/edit.vue

@@ -56,7 +56,7 @@
             <el-radio
               v-for="dict in misfirePolicyOptions"
               :key="dict.value"
-              :label="dict.value"
+              :value="dict.value"
             >{{dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -65,7 +65,7 @@
             <el-radio
               v-for="dict in statusOptions"
               :key="dict.value"
-              :label="dict.value"
+              :value="dict.value"
             >{{dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -82,7 +82,7 @@
     </el-dialog>
   </div>
 </template>
-<script lang="ts">
+<script setup lang="ts">
 import { reactive, toRefs, defineComponent,ref,unref,getCurrentInstance } from 'vue';
 import {ElMessageBox, ElMessage, FormInstance,UploadProps} from 'element-plus';
 import {
@@ -99,11 +99,8 @@ import {
   SysJobTableDataState,
   SysJobEditState,
 } from "/@/views/system/sysJob/list/component/model"
-export default defineComponent({
+defineOptions({ name: "apiV1SystemSysJobEdit"})
-  name:"apiV1SystemSysJobEdit",
+const props = defineProps({
-  components:{
-  },
-  props:{
   jobGroupOptions:{
     type:Array,
     default:()=>[]
@@ -116,8 +113,8 @@ export default defineComponent({
     type:Array,
     default:()=>[]
   },
-  },
+})
-  setup(props,{emit}) {
+const emit = defineEmits(['sysJobList'])
 const {proxy} = <any>getCurrentInstance()
 const formRef = ref<HTMLElement | null>(null);
 const menuRef = ref();
@@ -139,6 +136,8 @@ export default defineComponent({
     remark: undefined,
     createdAt: undefined,
     updatedAt: undefined,
+    createdUser:{userNickname:''},
+    updatedUser:{userNickname:''}
   },
   // 表单校验
   rules: {
@@ -156,6 +155,7 @@ export default defineComponent({
     ],
   }
 });
+const {isShowDialog,formData,rules} = toRefs(state);
 // 打开弹窗
 const openDialog = (row?: SysJobInfoData) => {
   resetForm();
@@ -170,6 +170,7 @@ export default defineComponent({
 }
   state.isShowDialog = true;
 };
+defineExpose({openDialog})
 // 关闭弹窗
 const closeDialog = () => {
   state.isShowDialog = false;
@@ -223,20 +224,10 @@ export default defineComponent({
     remark: undefined,
     createdAt: undefined,
     updatedAt: undefined,
+    createdUser:{userNickname:''},
+    updatedUser:{userNickname:''}
   }
 };
-    return {
-      proxy,
-      openDialog,
-      closeDialog,
-      onCancel,
-      onSubmit,
-      menuRef,
-      formRef,
-      ...toRefs(state),
-    };
-  }
-})
 </script>
 <style scoped lang="scss">
 .cronExpression-rule{

src/views/system/sysJob/list/index.vue

@@ -127,7 +127,7 @@
 		></apiV1SystemSysJobDetail>
 	</div>
 </template>
-<script lang="ts">
+<script setup lang="ts">
 import { ItemOptions } from '/@/api/items';
 import { toRefs, reactive, onMounted, ref, defineComponent, computed, getCurrentInstance, toRaw } from 'vue';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
@@ -135,13 +135,7 @@ import { listSysJob, getSysJob, delSysJob, addSysJob, updateSysJob, getUserList,
 import { SysJobTableColumns, SysJobInfoData, SysJobTableDataState } from '/@/views/system/sysJob/list/component/model';
 import apiV1SystemSysJobEdit from '/@/views/system/sysJob/list/component/edit.vue';
 import apiV1SystemSysJobDetail from '/@/views/system/sysJob/list/component/detail.vue';
-export default defineComponent({
+defineOptions({ name: "apiV1SystemSysJobList"})
-	name: 'apiV1SystemSysJobList',
-	components: {
-		apiV1SystemSysJobEdit,
-		apiV1SystemSysJobDetail,
-	},
-	setup() {
 const { proxy } = <any>getCurrentInstance();
 const loading = ref(false);
 const queryRef = ref();
@@ -178,6 +172,7 @@ export default defineComponent({
     },
   },
 });
+const { tableData } = toRefs(state);
 // 页面加载时
 onMounted(() => {
   initTableData();
@@ -226,7 +221,7 @@ export default defineComponent({
 const handleAdd = () => {
   editRef.value.openDialog();
 };
-		const handleUpdate = (row: SysJobTableColumns) => {
+const handleUpdate = (row: SysJobTableColumns|null) => {
   if (!row) {
     row = state.tableData.data.find((item: SysJobTableColumns) => {
       return item.jobId === state.jobIds[0];
@@ -250,7 +245,7 @@ export default defineComponent({
     })
     .catch(function () {});
 };
-		const handleDelete = (row: SysJobTableColumns) => {
+const handleDelete = (row: SysJobTableColumns|null) => {
   let msg = '你确定要删除所选数据？';
   let jobId: number[] = [];
   if (row) {
@@ -301,36 +296,6 @@ export default defineComponent({
       row.status = row.status === 0 ? 1 : 0;
     });
 };
-		return {
-			proxy,
-			editRef,
-			detailRef,
-			showAll,
-			loading,
-			single,
-			multiple,
-			word,
-			queryRef,
-			resetQuery,
-			sysJobList,
-			toggleSearch,
-			jobGroupFormat,
-			sys_job_group,
-			misfirePolicyFormat,
-			sys_job_policy,
-			statusFormat,
-			sys_job_status,
-			handleSelectionChange,
-			handleAdd,
-			handleUpdate,
-			handleDelete,
-			handleView,
-			handleJobRun,
-			handleStatusChange,
-			...toRefs(state),
-		};
-	},
-});
 </script>
 <style lang="scss" scoped>
 .colBlock {

src/views/system/sysNotice/list/component/NoticeMessageEdit.vue

@@ -82,7 +82,7 @@
     </el-dialog>
   </div>
 </template>
-<script lang="ts">
+<script setup lang="ts">
 import {reactive, onMounted, toRefs, defineComponent, ref, unref, getCurrentInstance} from 'vue';
 import { ElMessage} from 'element-plus';
 import {
@@ -95,19 +95,14 @@ import {
   SysNoticeInfoData,
   SysNoticeEditState
 } from "/@/views/system/sysNotice/list/component/model"
-
+defineOptions({ name: "NoticeMessageEdit"})
-export default defineComponent({
+const props = defineProps({
-  name: "NoticeMessageEdit",
-  components: {
-    GfUeditor,
-  },
-  props: {
   tagOptions: {
     type: Array,
     default: () => []
   },
-  },
+})
-  setup(props, {emit}) {
+const emit = defineEmits(["sysNoticeList"]);
 const {proxy} = <any>getCurrentInstance()
 const formRef = ref<HTMLElement | null>(null);
 const menuRef = ref();
@@ -152,6 +147,7 @@ export default defineComponent({
     ],
   }
 });
+const { isShowDialog,formData,loading,userListOptions,rules,title} = toRefs(state)
 onMounted(() => {
   remoteUserMethod("");
 });
@@ -176,7 +172,6 @@ export default defineComponent({
   }
   state.isShowDialog = true;
 };
-
 const remoteUserMethod = (query: string) => {
   //console.log("remoteMethod", query)
   state.userListOptions = []
@@ -267,22 +262,7 @@ export default defineComponent({
 const setContentEditContent = (data: string) => {
   state.formData.content = data
 }
-    return {
+defineExpose({openDialog,setType})
-      proxy,
-      openDialog,
-      setType,
-      closeDialog,
-      onCancel,
-      onSubmit,
-      remoteUserMethod,
-      menuRef,
-      formRef,
-      //富文本编辑器内容
-      setContentEditContent,
-      ...toRefs(state),
-    };
-  }
-})
 </script>
 <style scoped>
 .kv-label {

src/views/system/sysNotice/list/index.vue

@@ -16,7 +16,7 @@
             </el-col>
             <el-col :span="5" class="colBlock">
               <el-form-item label="状态" prop="status">
-                <el-select v-model="tableData.param.status" placeholder="请选择状态" clearable style="width: 160px;">
+                <el-select v-model="tableData.param.status" placeholder="请选择状态" clearable style="width: 160px">
                   <el-option label="正常" :value="1"/>
                   <el-option label="停用" :value="0"/>
                 </el-select>
@@ -24,7 +24,7 @@
             </el-col>
             <el-col :span="5" class="colBlock">
               <el-form-item label="类型" prop="type">
-                <el-select v-model="tableData.param.type" placeholder="请选择类型" clearable style="width: 160px;">
+                <el-select v-model="tableData.param.type" placeholder="请选择类型" clearable style="width: 160px">
                   <el-option label="通知" value="1"/>
                   <el-option label="公告" value="2"/>
                 </el-select>
@@ -32,7 +32,7 @@
             </el-col>
             <el-col :span="5" class="colBlock">
               <el-form-item label="标签" prop="tag">
-                <el-select v-model="tableData.param.tag" placeholder="请选择标签" clearable style="width: 160px;">
+                <el-select v-model="tableData.param.tag" placeholder="请选择标签" clearable style="width: 160px">
                   <el-option
                       v-for="dict in notice_tag"
                       :key="dict.value"
@@ -193,26 +193,21 @@
 
   </div>
 </template>
-<script lang="ts">
+<script setup lang="ts">
 
 import {toRefs, reactive, onMounted, ref, defineComponent, computed, getCurrentInstance, toRaw} from 'vue';
 import {ElMessageBox, ElMessage, FormInstance} from 'element-plus';
 import {
   listSysNotice,
   delSysNotice,
-} from "/src/api/system/notice/sysNotice";
+} from "/@/api/system/notice/sysNotice";
 import {
   SysNoticeTableColumns,
   SysNoticeInfoData,
   SysNoticeTableDataState,
 } from "/@/views/system/sysNotice/list/component/model"
 import NoticeMessageEdit from "/@/views/system/sysNotice/list/component/NoticeMessageEdit.vue"
-export default defineComponent({
+defineOptions({ name: "apiV1SystemSysNoticeList"})
-  name: "apiV1SystemSysNoticeList",
-  components: {
-    NoticeMessageEdit
-  },
-  setup() {
 const {proxy} = <any>getCurrentInstance()
 const loading = ref(false)
 const queryRef = ref()
@@ -257,6 +252,7 @@ export default defineComponent({
     },
   },
 });
+const { tableData} = toRefs(state)
 // 页面加载时
 onMounted(() => {
   initTableData();
@@ -302,7 +298,7 @@ export default defineComponent({
   editRef.value.openDialog()
   editRef.value.setType(type)
 }
-    const handleUpdate = (row: SysNoticeTableColumns) => {
+const handleUpdate = (row: SysNoticeTableColumns|null) => {
   if (!row) {
     row = state.tableData.data.find((item: SysNoticeTableColumns) => {
       return item.id === state.ids[0]
@@ -310,7 +306,7 @@ export default defineComponent({
   }
   editRef.value.openDialog(toRaw(row));
 };
-    const handleDelete = (row: SysNoticeTableColumns) => {
+const handleDelete = (row: SysNoticeTableColumns|null) => {
   let msg = '你确定要删除所选数据？';
   let id: number[] = [];
   if (row) {
@@ -337,28 +333,6 @@ export default defineComponent({
       .catch(() => {
       });
 }
-    return {
-      proxy,
-      editRef,
-      showAll,
-      loading,
-      single,
-      multiple,
-      word,
-      queryRef,
-      resetQuery,
-      sysNoticeList,
-      toggleSearch,
-      tagFormat,
-      notice_tag,
-      handleSelectionChange,
-      handleAdd,
-      handleUpdate,
-      handleDelete,
-      ...toRefs(state),
-    }
-  }
-})
 </script>
 <style lang="scss" scoped>
 .colBlock {

src/views/system/sysNotice/show/index.vue

@@ -90,7 +90,7 @@
 
   </div>
 </template>
-<script lang="ts">
+<script setup lang="ts">
 import {useRoute} from "vue-router";
 import {toRefs, reactive, onMounted, ref, defineComponent, getCurrentInstance} from 'vue';
 import {ElMessageBox, ElMessage, FormInstance} from 'element-plus';
@@ -102,11 +102,7 @@ import {
   SysNoticeTableDataState,
 } from "/@/views/system/sysNotice/list/component/model"
 import {readNotice} from "/@/api/system/notice/sysNoticeRead";
-
+defineOptions({ name: "apiV1SystemSysNoticeShow"})
-export default defineComponent({
-  name: "",
-  components: {},
-  setup() {
 const route = useRoute();
 const {proxy} = <any>getCurrentInstance()
 const loading = ref(false)
@@ -129,6 +125,7 @@ export default defineComponent({
     },
   },
 });
+const { tableData}= toRefs(state)
 // 页面加载时
 onMounted(() => {
   if (route.query.type){
@@ -206,18 +203,6 @@ export default defineComponent({
     ElMessage.success("已读");
   })
 }
-    return {
-      proxy,
-      loading,
-      resetQuery,
-      sysNoticeList,
-      handleTabsClick,
-      handleDelete,
-      handleRead,
-      ...toRefs(state),
-    }
-  }
-})
 </script>
 <style lang="scss" scoped>
 .el_icon {

src/views/system/tools/gen/component/basicInfo.vue

@@ -104,15 +104,13 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
-import { defineComponent, inject, reactive, ref, unref } from 'vue';
+import { inject, reactive, ref, unref } from 'vue';
 import type { FormInstance, FormRules } from 'element-plus';
 import type { TableDataInfo } from '/@/views/system/tools/gen/component/model';
 import { ElMessage } from 'element-plus';
-export default defineComponent({
+defineOptions({ name: "toolsBasicInfoForm"})
-	name: 'toolsBasicInfoForm',
+const emit = defineEmits(['goNext','close']);
-	emits: ['goNext','close'],
-	setup(props, { emit }) {
 const basicInfoFormRef = ref<FormInstance>();
 const overwriteOptions = ref([
   {key:"api",name:"覆盖api"},
@@ -165,17 +163,6 @@ export default defineComponent({
   sortColumn: [{ required: true, message: '请选择排序字段', trigger: 'blur' }],
   sortType: [{ required: true, message: '请选择排序类型', trigger: 'blur' }],
 });
-		return {
-			basicInfoFormRef,
-			info,
-			rules,
-      overwriteOptions,
-			nextTip,
-      overwriteChange,
-      close
-		};
-	},
-});
 </script>
 
 <style scoped>

src/views/system/tools/gen/component/edit.vue

@@ -23,9 +23,9 @@
 					<el-col :span="4"></el-col>
 				</el-row>
 			</div>
-			<tools-basic-info-form ref="toolsBasicInfoForm" v-show="active === 1" @goNext="goNext" @close="close"></tools-basic-info-form>
+			<toolsBasicInfoForm ref="toolsBasicInfoFormRef" v-show="active === 1" @goNext="goNext" @close="close"></toolsBasicInfoForm>
-			<gen-info-form ref="genInfoForm" v-show="active === 2" @goNext="goNext" @close="close"></gen-info-form>
+			<genInfoForm ref="genInfoFormRef" v-show="active === 2" @goNext="goNext" @close="close"></genInfoForm>
-      <gen-table-columns ref="tableColumns" v-show="active === 3"></gen-table-columns>
+      <genTableColumns ref="tableColumnsRef" v-show="active === 3"></genTableColumns>
 			<div class="tools-footer" v-show="active === 3">
 				<el-button size="default" @click="close">关 闭</el-button>
 				<el-button type="primary" @click="onSubmit" size="default">保 存</el-button>
@@ -34,8 +34,8 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
-import {defineComponent, onBeforeMount, ref, provide, getCurrentInstance} from 'vue';
+import {onBeforeMount, ref, provide, getCurrentInstance} from 'vue';
 import { useRoute } from 'vue-router';
 import toolsBasicInfoForm from '/@/views/system/tools/gen/component/basicInfo.vue';
 import { TableColumns, TableDataInfo } from '/@/views/system/tools/gen/component/model';
@@ -43,15 +43,12 @@ import { ElMessage } from 'element-plus/es';
 import {getGenTable, saveEdit} from '/@/api/system/tools/gen';
 import genInfoForm from '/@/views/system/tools/gen/component/genInfoForm.vue';
 import genTableColumns from '/@/views/system/tools/gen/component/tableColumns.vue';
-export default defineComponent({
+defineOptions({ name: "apiV1SystemToolsGenColumnEdit"})
-	name: 'apiV1SystemToolsGenColumnList',
-	components: { toolsBasicInfoForm, genInfoForm,genTableColumns },
-	setup() {
 const { proxy } = getCurrentInstance() as any;
 const route = useRoute();
-		const toolsBasicInfoForm = ref();
+const toolsBasicInfoFormRef = ref();
-		const genInfoForm = ref();
+const genInfoFormRef = ref();
-    const tableColumns = ref()
+const tableColumnsRef = ref()
 const active = ref(1);
 
 const changeSteps = (args: number) => {
@@ -59,7 +56,7 @@ export default defineComponent({
     switch (args) {
       case 2:
         //验证基本信息表单
-						if (toolsBasicInfoForm.value.nextTip()) {
+        if (toolsBasicInfoFormRef.value.nextTip()) {
           active.value = args;
         }
         break;
@@ -67,12 +64,12 @@ export default defineComponent({
         //验证生成信息表单
         if (active.value==1){
           //验证基本信息表单
-              if (toolsBasicInfoForm.value.nextTip()) {
+          if (toolsBasicInfoFormRef.value.nextTip()) {
             active.value = args;
           }
         }else{
           //验证生成信息表单
-              if (genInfoForm.value.nextTip()) {
+          if (genInfoFormRef.value.nextTip()) {
             active.value = args;
           }
         }
@@ -148,8 +145,8 @@ export default defineComponent({
 };
 const onSubmit = () => {
   Promise.all([
-        formRulesValidate('toolsBasicInfoForm', 'basicInfoFormRef'),
+    formRulesValidate('toolsBasicInfoFormRef', 'basicInfoFormRef'),
-        formRulesValidate('genInfoForm', 'genInfoFormRef'),
+    formRulesValidate('genInfoFormRef', 'genInfoFormRef'),
   ]).then(() => {
     saveEdit(info.value).then(()=>{
       ElMessage.success('保存成功');
@@ -170,19 +167,6 @@ export default defineComponent({
 const close = ()=>{
   proxy.mittBus.emit('onCurrentContextmenuClick', Object.assign({}, { contextMenuClickId: 1, ...route }));
 }
-		return {
-			toolsBasicInfoForm,
-			genInfoForm,
-      tableColumns,
-			active,
-			changeSteps,
-			info,
-			onSubmit,
-			goNext,
-      close
-		};
-	},
-});
 </script>
 
 <style scoped>

src/views/system/tools/gen/component/genInfoForm.vue

@@ -150,16 +150,14 @@
 	</el-card>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {defineComponent, inject, reactive, ref, unref} from 'vue';
 import type { FormInstance, FormRules } from 'element-plus';
 import { TableDataInfo } from '/@/views/system/tools/gen/component/model';
 import {ElMessage} from "element-plus";
 import {Ref, UnwrapRef} from "@vue/reactivity";
-export default defineComponent({
+defineOptions({ name: "genInfoForm"})
-	name: 'genInfoForm',
+const emit = defineEmits(['goNext','close']);
-  emits:['goNext','close'],
-	setup(props,{emit}) {
 const genInfoFormRef = ref<FormInstance>();
 const info = inject<Ref<UnwrapRef<TableDataInfo>>>('tableData') as Ref<UnwrapRef<TableDataInfo>>;
 const rules = reactive<FormRules>({
@@ -198,16 +196,7 @@ export default defineComponent({
 const setModuleName = (value:string)=>{
   info.value.moduleName = getLastSubstring(value)
 }
-		return {
+defineExpose({nextTip})
-      genInfoFormRef,
-			info,
-			rules,
-      setModuleName,
-      nextTip,
-      close
-		};
-	},
-});
 </script>
 
 <style scoped>

src/views/system/tools/gen/component/importTable.vue

@@ -48,15 +48,13 @@
   </el-dialog>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {defineComponent, reactive, ref, toRefs} from "vue";
 import {ImportTableDataState,TableData} from "/@/views/system/tools/gen/component/model"
 import {getImportTableList, importTable} from "/@/api/system/tools/gen";
 import {ElMessage} from "element-plus/es";
-export default defineComponent({
+defineOptions({ name: "importTable"})
-  name: "importTable",
+const emit = defineEmits(['ok'])
-  emits:['ok'],
-  setup(prop,{emit}) {
 const queryFormRef = ref()
 const tableRef = ref()
 const visible = ref(false)
@@ -75,6 +73,7 @@ export default defineComponent({
     },
   }
 })
+const {tableData} = toRefs(state)
 const getList = ()=>{
   getImportTableList(state.tableData.param).then(res=>{
     state.tableData.data = res.data.list??[]
@@ -112,21 +111,6 @@ export default defineComponent({
   getList()
   visible.value = true
 }
-    return {
-      queryFormRef,
-      tableRef,
-      visible,
-      getList,
-      handleQuery,
-      resetQuery,
-      clickRow,
-      handleSelectionChange,
-      handleImportTable,
-      openDialog,
-      ...toRefs(state),
-    };
-  }
-})
 </script>
 
 <style scoped>

src/views/system/tools/gen/component/preview.vue

@@ -25,16 +25,13 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {defineComponent, reactive, toRefs, ref, onBeforeMount, onMounted} from "vue";
 import {previewState} from "/@/views/system/tools/gen/component/model";
 import {showPreview} from "/@/api/system/tools/gen";
 import MyCodeMirror from "/@/components/myCodeMirror/index.vue";
 import { ElLoading } from 'element-plus'
-export default defineComponent({
+defineOptions({ name: "genCodePreview"})
-  name: "genCodePreview",
-  components: {MyCodeMirror},
-  setup(){
 const height = ref(400)
 // 预览参数
 const preview:previewState = reactive({
@@ -45,6 +42,7 @@ export default defineComponent({
   data: {},
   activeName: "api"
 })
+const { data, activeName, fullscreen, open, title}=toRefs(preview)
 const getWindowInfo = () => {
   height.value = document.getElementsByTagName('body')[0].clientHeight-130;
 };
@@ -68,13 +66,7 @@ export default defineComponent({
 onBeforeMount(()=>{
   window.addEventListener('resize', getWindowInfo);
 })
-    return {
+defineExpose({showView})
-      showView,
-      height,
-      ...toRefs(preview)
-    }
-  },
-})
 </script>
 
 <style lang="scss" scoped>

src/views/system/tools/gen/component/relationTable.vue

@@ -66,15 +66,13 @@
   </el-dialog>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {defineComponent, reactive, ref, toRefs} from "vue";
 import {ImportTableDataState, TableColumns, TableData} from "/@/views/system/tools/gen/component/model"
 import {getRelationTable, importTable} from "/@/api/system/tools/gen";
 import {ElMessage} from "element-plus/es";
-export default defineComponent({
+defineOptions({ name: "relationTable"})
-  name: "relationTable",
+const emit = defineEmits(['ok'])
-  emits:['ok'],
-  setup(prop,{emit}) {
 const queryFormRef = ref()
 const tableRef = ref()
 const visible = ref(false)
@@ -92,6 +90,7 @@ export default defineComponent({
     },
   }
 })
+const { tableData} = toRefs(state)
 const getList = ()=>{
   getRelationTable(state.tableData.param).then((res:any)=>{
     state.tableData.data = res.data.data??[]
@@ -132,20 +131,7 @@ export default defineComponent({
   getList()
   visible.value = true
 }
-    return {
+defineExpose({openDialog})
-      queryFormRef,
-      tableRef,
-      visible,
-      getList,
-      handleQuery,
-      resetQuery,
-      clickRow,
-      handleImportTable,
-      openDialog,
-      ...toRefs(state),
-    };
-  }
-})
 </script>
 
 <style scoped lang="scss">

src/views/system/tools/gen/component/tableColumns.vue

@@ -158,16 +158,11 @@
             <textarea class="el-textarea__inner" v-model.lazy="scope.row.minWidth" ></textarea>
           </template>
         </el-table-column>
-        <el-table-column label="详情占列" width="70">
+        <el-table-column label="详情占列" width="100">
           <template #default="scope">
             <textarea class="el-textarea__inner" v-model.lazy="scope.row.colSpan" ></textarea>
           </template>
         </el-table-column>
-        <el-table-column label="详情起新行" width="50">
-          <template #default="scope">
-            <el-checkbox true-value="1" v-model="scope.row.isRowStart"></el-checkbox>
-          </template>
-        </el-table-column>
         <el-table-column label="字典类型" width="160">
           <template #default="scope">
             <el-select v-model="scope.row.dictType" clearable filterable placeholder="请选择">
@@ -202,21 +197,17 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
-import {defineComponent, inject, nextTick, onBeforeMount, ref} from 'vue';
+import { inject, onBeforeMount, ref} from 'vue';
 import type { FormInstance } from 'element-plus';
 import {DictOpt, TableColumns, TableDataInfo} from '/@/views/system/tools/gen/component/model';
 import {optionselect} from "/@/api/system/dict/type";
 import RelationTable from "/@/views/system/tools/gen/component/relationTable.vue";
-import importTable from "/@/views/system/tools/gen/component/importTable.vue";
 import _ from "lodash";
-export default defineComponent({
+defineOptions({ name: "genTableColumns"})
-	name: 'genTableColumns',
-  components: {importTable, RelationTable},
-	setup() {
 const relationTableRef = ref();
 const tableColumnsRef = ref<FormInstance>();
-		const info = inject<TableDataInfo>('tableData') as TableDataInfo;
+const info = inject<any>('tableData');
 // 表格的高度
 const tableHeight = ref(document.documentElement.scrollHeight - 300 + 'px');
 const dictOptions = ref(<DictOpt[]>[])
@@ -251,18 +242,6 @@ export default defineComponent({
     }
   })
 }
-		return {
-      relationTableRef,
-			tableColumnsRef,
-      info,
-			tableHeight,
-      dictOptions,
-      handleChangeConfig,
-      setRelationTable,
-      handleRemoveRelation
-		};
-	},
-});
 </script>
 
 <style scoped>

src/views/system/tools/gen/index.vue

@@ -100,7 +100,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {toRefs, reactive, onMounted, ref, defineComponent} from 'vue';
 import {ElMessageBox, ElMessage, FormInstance} from 'element-plus';
 import {getTableList, deleteTables, batchGenCode, syncTable} from "/@/api/system/tools/gen";
@@ -109,10 +109,7 @@ import importTable from "/@/views/system/tools/gen/component/importTable.vue";
 import { useRouter } from 'vue-router';
 import genCodePreview from '/@/views/system/tools/gen/component/preview.vue'
 import {refreshBackEndControlRoutes} from "/@/router/backEnd";
-export default defineComponent({
+defineOptions({ name: "apiV1SystemToolsGenTableList"})
-	name: 'apiV1SystemToolsGenTableList',
-	components: {importTable,genCodePreview},
-	setup() {
 const router =  useRouter()
 const addPostRef = ref()
 const editPostRef = ref()
@@ -139,6 +136,7 @@ export default defineComponent({
     },
   },
 });
+const {single,multiple, tableData}=toRefs(state)
 // 初始化表格数据
 const initTableData = () => {
   tableList()
@@ -156,7 +154,7 @@ export default defineComponent({
   tableList()
 };
 // 删除导入的表
-		const onRowDel = (row: TableData) => {
+const onRowDel = (row: TableData|null) => {
   let msg = '你确定要删除所选数据？';
   let ids:number[] = [] ;
   if(row){
@@ -202,7 +200,7 @@ export default defineComponent({
   state.single = selection.length != 1
   state.tableNames = selection.map(item=>item.tableName)
 };
-    const handleGenTable=(row: TableData)=>{
+const handleGenTable=(row: TableData|null)=>{
   let msg = '你确定要生成？';
   let ids:number[] = [] ;
   if(row){
@@ -241,7 +239,7 @@ export default defineComponent({
 const handlePreview = (row:TableData)=>{
   genCodePreviewRef.value.showView(row.tableId);
 }
-    const handleEditTable=(row:TableData)=>{
+const handleEditTable=(row:TableData|null)=>{
   const tableId = row?.tableId || state.ids[0];
   router.push({ path: "/system/tools/gen/edit", query: { tableId: tableId } });
 }
@@ -253,25 +251,4 @@ export default defineComponent({
         }
     })
 })
-		return {
-			addPostRef,
-			editPostRef,
-      queryRef,
-      importRef,
-      genCodePreviewRef,
-			onRowDel,
-			onHandleSizeChange,
-			onHandleCurrentChange,
-      tableList,
-      resetQuery,
-      handleSelectionChange,
-      handleGenTable,
-      openImportTable,
-      handleEditTable,
-      handlePreview,
-      handleSyncTable,
-			...toRefs(state),
-		};
-	},
-});
 </script>

src/views/system/user/component/editUser.vue

@@ -94,10 +94,10 @@
             <el-form-item label="用户类型">
               <el-radio-group v-model="ruleForm.isAdmin">
                 <el-radio
-                    :label="1"
+                    :value="1"
                 >后台管理员</el-radio>
                 <el-radio
-                    :label="0"
+                    :value="0"
                 >前台用户</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -119,15 +119,13 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {reactive, toRefs, onMounted, defineComponent, ref, unref, getCurrentInstance} from 'vue';
 import {getParams, addUser, editUser, getEditUser} from "/@/api/system/user";
 import {ElMessage} from "element-plus";
 
-
+defineOptions({ name: "systemEditUser"})
-export default defineComponent({
+const props = defineProps({
-	name: 'systemEditUser',
-  props:{
   deptData:{
     type:Array,
     default:()=>[]
@@ -136,8 +134,8 @@ export default defineComponent({
     type:Array,
     default:()=>[]
   }
-  },
+})
-	setup(prop,{emit}) {
+const emit = defineEmits(['getUserList']);
 const {proxy} = getCurrentInstance() as any;
 const roleList = ref([]);
 const postList = ref([]);
@@ -190,6 +188,7 @@ export default defineComponent({
     ]
   }
 });
+const { ruleForm, isShowDialog, rules}=toRefs(state)
 // 打开弹窗
 const openDialog = (row?:any) => {
   resetForm()
@@ -283,16 +282,5 @@ export default defineComponent({
     isAdmin:0,
   }
 };
-		return {
+defineExpose({openDialog})
-			openDialog,
-			closeDialog,
-			onCancel,
-			onSubmit,
-      roleList,
-      postList,
-      formRef,
-			...toRefs(state),
-		};
-	},
-});
 </script>

src/views/system/user/component/userList.vue

@@ -45,7 +45,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {toRefs, reactive, onMounted, ref, defineComponent, getCurrentInstance} from 'vue';
 import {ElMessageBox, ElMessage} from 'element-plus';
 import EditUser from '/@/views/system/user/component/editUser.vue';
@@ -71,9 +71,8 @@ interface TableParam {
   keyWords:string;
   dateRange: string[];
 }
-export default defineComponent({
+defineOptions({ name: "systemUserList"})
-	name: 'systemUserList', 
+const props = defineProps({
-  props:{
   deptData:{
     type:Array,
     default:()=>[]
@@ -86,10 +85,8 @@ export default defineComponent({
     type:Array,
     default:()=>[]
   }
-  },
+ })
-	components: { EditUser },
+const {proxy} = <any>getCurrentInstance();
-	setup() {
-    const {proxy,props} = <any>getCurrentInstance();
 const {sys_user_sex} = proxy.useDict('sys_user_sex')
 const editUserRef = ref();
 const state = reactive<TableDataState>({
@@ -115,6 +112,7 @@ export default defineComponent({
     },
   },
 });
+const { tableData} = toRefs(state);
 // 初始化表格数据
 const initTableData = () => {
   userList();
@@ -199,18 +197,4 @@ export default defineComponent({
     row.userStatus =row.userStatus === 0 ?1 : 0;
   });
 };
-		return {
-			editUserRef,
-			onOpenAddUser,
-			onOpenEditUser,
-			onRowDel,
-      sys_user_sex,
-      userList,
-      handleSelectionChange,
-      handleResetPwd,
-      handleStatusChange,
-			...toRefs(state),
-		};
-	},
-});
 </script>

src/views/system/user/index.vue

@@ -5,7 +5,7 @@
         <el-card shadow="hover">
           <el-aside>
             <el-scrollbar>
-              <el-input :prefix-icon="search" v-model="filterText" placeholder="请输入部门名称" clearable size="default" style="width: 80%;"/>
+              <el-input :prefix-icon="search" v-model="filterText" placeholder="请输入部门名称" clearable style="width: 80%;"/>
               <el-tree
                   ref="treeRef"
                   class="filter-tree"
@@ -82,7 +82,7 @@
                   </el-icon>
                   新增用户
                 </el-button>
-                <el-button size="default" type="danger" class="ml10" @click="onRowDel(null)">
+                <el-button size="default" type="danger" class="ml10" @click="onRowDel()">
                   <el-icon>
                     <ele-Delete />
                   </el-icon>
@@ -99,7 +99,7 @@
 	</div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import {toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance} from 'vue';
 import {ElTree,FormInstance} from 'element-plus';
 import { Search } from '@element-plus/icons-vue'
@@ -118,11 +118,7 @@ interface QueryParam {
     dateRange: string[];
   };
 }
-
+defineOptions({ name: "systemUser"})
-export default defineComponent({
-	name: 'systemUser',
-	components: { UserList },
-	setup() {
 const {proxy} = <any>getCurrentInstance();
 const {sys_user_sex} = proxy.useDict('sys_user_sex')
 const userListRef = ref();
@@ -166,6 +162,7 @@ export default defineComponent({
     dateRange:[]
   },
 });
+const { deptData,deptProps,param}=toRefs(state)
 // 初始化表格数据
 const initTableData = () => {
   getDeptTree().then((res:any)=>{
@@ -205,21 +202,4 @@ export default defineComponent({
   formEl.resetFields()
   userList()
 };
-		return {
-      queryRef,
-			userListRef,
-			onOpenAddUser,
-			onRowDel,
-      deptFilterNode,
-      filterText,
-      treeRef,
-      search,
-      sys_user_sex,
-      userList,
-      handleNodeClick,
-      resetQuery,
-			...toRefs(state),
-		};
-	},
-});
 </script>

src/views/visualizing/demo2.vue

@@ -792,7 +792,7 @@ export default defineComponent({
 	height: 100%;
 	width: 100%;
 	overflow: hidden;
-	background: url(https://img-blog.csdnimg.cn/6267533849444025811bf0840f9366e3.png?x-oss-process=image/watermark,type_d3F5LXplbmhlaQ,shadow_50,text_Q1NETiBAbHl0LXRvcA==,size_20,color_FFFFFF,t_70,g_se,x_16);
+	background: url(/@/assets/board2.jpg);
 	background-size: 100% 100%;
 	display: flex;
 	flex-direction: column;
@@ -822,15 +822,6 @@ export default defineComponent({
 			background-size: 200% 100%;
 			animation: masked-animation 4s infinite linear;
 			-webkit-box-reflect: below -2px -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(rgba(255, 255, 255, 0.1)));
-			@keyframes masked-animation {
-				0% {
-					background-position: 0 0;
-				}
-				100% {
-					background-position: -100% 0;
-				}
-			}
-			position: relative;
 			&::after {
 				content: '';
 				width: 50%;
@@ -1341,4 +1332,12 @@ export default defineComponent({
 		}
 	}
 }
+@keyframes masked-animation {
+  0% {
+    background-position: 0 0;
+  }
+  100% {
+    background-position: -100% 0;
+  }
+}
 </style>

vite.config.ts

@@ -1,7 +1,6 @@
 import vue from '@vitejs/plugin-vue';
 import { resolve } from 'path';
 import { defineConfig, loadEnv, ConfigEnv } from 'vite';
-import vueSetupExtend from 'vite-plugin-vue-setup-extend-plus';
 import viteCompression from 'vite-plugin-compression';
 import { buildConfig } from './src/utils/build';
 
@@ -17,7 +16,7 @@ const alias: Record<string, string> = {
 const viteConfig = defineConfig((mode: ConfigEnv) => {
 	const env = loadEnv(mode.mode, process.cwd());
 	return {
-		plugins: [vue(), vueSetupExtend(), viteCompression({disable:true})],
+		plugins: [vue(), viteCompression({disable:true})],
 		root: process.cwd(),
 		resolve: { alias },
 		base: mode.command === 'serve' ? './' : env.VITE_PUBLIC_PATH,