Kezdőlap Felfedezés Súgó
Bejelentkezés
zhengnaiwen_citu
/
menduner
1
0
Másolás 0
Fájlok Problémák 0 Beolvasztási kérések 0 Wiki
Forráskód Böngészése

Merge remote-tracking branch 'origin/dev' into dev

YunaiV 2 éve
szülő
7c92735aff e6ccfbddb6
commit
6f8499c4d0
8 módosított fájl, 42 hozzáadás és 44 törlés
Osztott Nézet Diff Statisztika Mutatása
  1. 2 4
      build/vite/index.ts
  2. 2 2
      index.html
  3. 30 30
      package.json
  4. 1 1
      src/components/Descriptions/src/Descriptions.vue
  5. 1 1
      src/components/Editor/src/Editor.vue
  6. 2 2
      src/layout/components/Breadcrumb/src/Breadcrumb.vue
  7. 3 3
      src/views/infra/codegen/components/ImportTable.vue
  8. 1 1
      vite.config.ts

+ 2 - 4
build/vite/index.ts
Fájl Megtekintése 

@@ -15,7 +15,7 @@ import vueSetupExtend from 'vite-plugin-vue-setup-extend'
 
 import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'
 
 import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
 
 
-export function createVitePlugins(VITE_APP_TITLE: string) {
 
+export function createVitePlugins() {
 
   const root = process.cwd()
 
   // 路径查找
 
   function pathResolve(dir: string) {
 
@@ -95,8 +95,6 @@ export function createVitePlugins(VITE_APP_TITLE: string) {
 
       ext: '.gz', // 生成的压缩包后缀
 
       deleteOriginFile: false //压缩后是否删除源文件
 
     }),
 
-    ViteEjsPlugin({
 
-      title: VITE_APP_TITLE
 
-    })
 
+    ViteEjsPlugin()
 
   ]
 
 }

+ 2 - 2
index.html
Fájl Megtekintése 

@@ -13,7 +13,7 @@
 
       name="description"
 
       content="芋道管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
 
     />
 
-    <title><%= title %></title>
 
+    <title>%VITE_APP_TITLE%</title>
 
   </head>
 
   <body>
 
     <div id="app">
 
@@ -137,7 +137,7 @@
 
         <div class="app-loading-wrap">
 
           <div class="app-loading-title">
 
             <img src="/logo.gif" class="app-loading-logo" alt="Logo" />
 
-            <div class="app-loading-title"><%= title %></div>
 
+            <div class="app-loading-title">%VITE_APP_TITLE%</div>
 
           </div>
 
           <div class="app-loading-item">
 
             <div class="app-loading-outter"></div>

+ 30 - 30
package.json
Fájl Megtekintése 

@@ -1,6 +1,6 @@
 
 {
 
   "name": "yudao-ui-admin-vue3",
 
-  "version": "1.7.1-snapshot.1941",
 
+  "version": "1.7.1-snapshot.1961",
 
   "description": "基于vue3、vite4、element-plus、typesScript",
 
   "author": "xingyu",
 
   "private": false,
 
@@ -43,7 +43,7 @@
 
     "diagram-js": "^11.6.0",
 
     "echarts": "^5.4.1",
 
     "echarts-wordcloud": "^2.1.0",
 
-    "element-plus": "2.2.34",
 
+    "element-plus": "2.3.1",
 
     "fast-xml-parser": "^4.1.3",
 
     "highlight.js": "^11.7.0",
 
     "intro.js": "^6.0.0",
 
@@ -62,57 +62,57 @@
 
     "vue-router": "^4.1.6",
 
     "vue-types": "^5.0.2",
 
     "vuedraggable": "^4.1.0",
 
-    "vxe-table": "^4.3.10",
 
+    "vxe-table": "^4.3.11",
 
     "web-storage-cache": "^1.1.1",
 
     "xe-utils": "^3.5.7",
 
     "xml-js": "^1.6.11"
 
   },
 
   "devDependencies": {
 
-    "@commitlint/cli": "^17.4.4",
 
+    "@commitlint/cli": "^17.5.0",
 
     "@commitlint/config-conventional": "^17.4.4",
 
-    "@iconify/json": "^2.2.31",
 
-    "@intlify/unplugin-vue-i18n": "^0.8.2",
 
+    "@iconify/json": "^2.2.38",
 
+    "@intlify/unplugin-vue-i18n": "^0.10.0",
 
     "@purge-icons/generated": "^0.9.0",
 
     "@types/intro.js": "^5.1.1",
 
-    "@types/lodash-es": "^4.17.6",
 
-    "@types/node": "^18.14.6",
 
+    "@types/lodash-es": "^4.17.7",
 
+    "@types/node": "^18.15.5",
 
     "@types/nprogress": "^0.2.0",
 
     "@types/qrcode": "^1.5.0",
 
     "@types/qs": "^6.9.7",
 
-    "@typescript-eslint/eslint-plugin": "^5.54.1",
 
-    "@typescript-eslint/parser": "^5.54.1",
 
-    "@vitejs/plugin-legacy": "^4.0.1",
 
-    "@vitejs/plugin-vue": "^4.0.0",
 
-    "@vitejs/plugin-vue-jsx": "^3.0.0",
 
-    "autoprefixer": "^10.4.13",
 
+    "@typescript-eslint/eslint-plugin": "^5.56.0",
 
+    "@typescript-eslint/parser": "^5.56.0",
 
+    "@vitejs/plugin-legacy": "^4.0.2",
 
+    "@vitejs/plugin-vue": "^4.1.0",
 
+    "@vitejs/plugin-vue-jsx": "^3.0.1",
 
+    "autoprefixer": "^10.4.14",
 
     "bpmn-js": "^8.9.0",
 
     "bpmn-js-properties-panel": "^0.46.0",
 
     "consola": "^2.15.3",
 
-    "eslint": "^8.35.0",
 
-    "eslint-config-prettier": "^8.7.0",
 
-    "eslint-define-config": "^1.15.0",
 
+    "eslint": "^8.36.0",
 
+    "eslint-config-prettier": "^8.8.0",
 
+    "eslint-define-config": "^1.17.0",
 
     "eslint-plugin-prettier": "^4.2.1",
 
     "eslint-plugin-vue": "^9.9.0",
 
-    "lint-staged": "^13.1.2",
 
+    "lint-staged": "^13.2.0",
 
     "postcss": "^8.4.21",
 
     "postcss-html": "^1.5.0",
 
     "postcss-scss": "^4.0.6",
 
-    "prettier": "^2.8.4",
 
-    "rimraf": "^4.3.1",
 
-    "rollup": "^3.18.0",
 
-    "sass": "^1.58.3",
 
-    "stylelint": "^15.2.0",
 
+    "prettier": "^2.8.6",
 
+    "rimraf": "^4.4.1",
 
+    "rollup": "^3.20.0",
 
+    "sass": "^1.59.3",
 
+    "stylelint": "^15.3.0",
 
     "stylelint-config-html": "^1.1.0",
 
     "stylelint-config-prettier": "^9.0.5",
 
-    "stylelint-config-recommended": "^10.0.1",
 
-    "stylelint-config-standard": "^30.0.1",
 
-    "stylelint-order": "^6.0.2",
 
-    "terser": "^5.16.5",
 
-    "typescript": "4.9.5",
 
+    "stylelint-config-recommended": "^11.0.0",
 
+    "stylelint-config-standard": "^31.0.0",
 
+    "stylelint-order": "^6.0.3",
 
+    "terser": "^5.16.6",
 
+    "typescript": "5.0.2",
 
     "unplugin-auto-import": "^0.15.1",
 
     "unplugin-element-plus": "^0.7.0",
 
     "unplugin-vue-components": "^0.24.1",
 
-    "vite": "4.1.4",
 
+    "vite": "4.2.1",
 
     "vite-plugin-compression": "^0.5.1",
 
     "vite-plugin-ejs": "^1.6.4",
 
     "vite-plugin-eslint": "^1.8.1",
 
@@ -125,7 +125,7 @@
 
     "windicss": "^3.5.6"
 
   },
 
   "engines": {
 
-    "node": ">=16.0.0"
 
+    "node": ">=16.18.0"
 
   },
 
   "license": "MIT",
 
   "repository": {

+ 1 - 1
src/components/Descriptions/src/Descriptions.vue
Fájl Megtekintése 

@@ -76,7 +76,7 @@ const toggleClick = () => {
 
       v-if="title"
 
       :class="[
 
         `${prefixCls}-header`,
 
-        'h-50px flex justify-between items-center mb-10px border-bottom-1 border-solid border-[var(--tags-view-border-color)] px-10px cursor-pointer dark:border-[var(--el-border-color)]'
 
+        'h-50px flex justify-between items-center border-bottom-1 border-solid border-[var(--tags-view-border-color)] px-10px cursor-pointer dark:border-[var(--el-border-color)]'
 
       ]"
 
       @click="toggleClick"
 
     >

+ 1 - 1
src/components/Editor/src/Editor.vue
Fájl Megtekintése 

@@ -178,7 +178,7 @@ defineExpose({
 
 </script>
 
 
 <template>
 
-  <div class="border-1 border-solid border-[var(--tags-view-border-color)] z-3000">
 
+  <div class="border-1 border-solid border-[var(--tags-view-border-color)] z-99">
 
     <!-- 工具栏 -->
 
     <Toolbar
 
       :editor="editorRef"

+ 2 - 2
src/layout/components/Breadcrumb/src/Breadcrumb.vue
Fájl Megtekintése 

@@ -37,7 +37,7 @@ export default defineComponent({
 
     })
 
 
     const getBreadcrumb = () => {
 
-      const currentPath = currentRoute.value.path
 
+      const currentPath = currentRoute.value.matched.slice(-1)[0].path
 
 
       levelList.value = filter<AppRouteRecordRaw>(unref(menuRouters), (node: AppRouteRecordRaw) => {
 
         return node.path === currentPath
 
@@ -47,7 +47,7 @@ export default defineComponent({
 
     const renderBreadcrumb = () => {
 
       const breadcrumbList = treeToList<AppRouteRecordRaw[]>(unref(levelList))
 
       return breadcrumbList.map((v) => {
 
-        const disabled = v.redirect === 'noredirect'
 
+        const disabled = !v.redirect || v.redirect === 'noredirect'
 
         const meta = v.meta as RouteMeta
 
         return (
 
           <ElBreadcrumbItem to={{ path: disabled ? '' : v.path }} key={v.name}>

+ 3 - 3
src/views/infra/codegen/components/ImportTable.vue
Fájl Megtekintése 

@@ -52,7 +52,7 @@
 
 import { VxeTableInstance } from 'vxe-table'
 
 import type { DatabaseTableVO } from '@/api/infra/codegen/types'
 
 import { getSchemaTableListApi, createCodegenListApi } from '@/api/infra/codegen'
 
-import { getDataSourceConfigListApi, DataSourceConfigVO } from '@/api/infra/dataSourceConfig'
 
+import { getDataSourceConfigList, DataSourceConfigVO } from '@/api/infra/dataSourceConfig'
 
 
 const { t } = useI18n() // 国际化
 
 const message = useMessage() // 消息弹窗
 
@@ -67,9 +67,9 @@ const queryParams = reactive({
 
 })
 
 const dataSourceConfigs = ref<DataSourceConfigVO[]>([])
 
 const show = async () => {
 
-  const res = await getDataSourceConfigListApi()
 
+  const res = await getDataSourceConfigList()
 
   dataSourceConfigs.value = res
 
-  queryParams.dataSourceConfigId = dataSourceConfigs.value[0].id
 
+  queryParams.dataSourceConfigId = dataSourceConfigs.value[0].id as number
 
   visible.value = true
 
   await getList()
 
 }

+ 1 - 1
vite.config.ts
Fájl Megtekintése 

@@ -42,7 +42,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
 
       // },
 
     },
 
     // 项目使用的vite插件。 单独提取到build/vite/plugin中管理
 
-    plugins: createVitePlugins(env.VITE_APP_TITLE),
 
+    plugins: createVitePlugins(),
 
     css: {
 
       preprocessorOptions: {
 
         scss: {