+ Fix some bugs that prevent building and running both server and web modules.
+ Update web modules packages to latest stable versions.
This commit is contained in:
parent
2ee45d0b8a
commit
3eb9f9313d
|
@ -1,8 +1,6 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"go.uber.org/zap"
|
|
||||||
|
|
||||||
"github.com/flipped-aurora/gin-vue-admin/server/core"
|
"github.com/flipped-aurora/gin-vue-admin/server/core"
|
||||||
"github.com/flipped-aurora/gin-vue-admin/server/global"
|
"github.com/flipped-aurora/gin-vue-admin/server/global"
|
||||||
"github.com/flipped-aurora/gin-vue-admin/server/initialize"
|
"github.com/flipped-aurora/gin-vue-admin/server/initialize"
|
||||||
|
|
|
@ -11,35 +11,35 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@element-plus/icons-vue": "^0.2.7",
|
"@element-plus/icons-vue": "^0.2.7",
|
||||||
"axios": "^0.24.0",
|
"axios": "^0.27.2",
|
||||||
"core-js": "^3.6.5",
|
"core-js": "^3.6.5",
|
||||||
"echarts": "5.3.2",
|
"echarts": "5.3.3",
|
||||||
"element-plus": "2.2.9",
|
"element-plus": "2.2.16",
|
||||||
"highlight.js": "^10.6.0",
|
"highlight.js": "^10.6.0",
|
||||||
"js-cookie": "^3.0.1",
|
"js-cookie": "^3.0.1",
|
||||||
"marked": "^2.0.0",
|
"marked": "^4.1.0",
|
||||||
"mitt": "^3.0.0",
|
"mitt": "^3.0.0",
|
||||||
"nprogress": "^0.2.0",
|
"nprogress": "^0.2.0",
|
||||||
"path": "^0.12.7",
|
"path": "^0.12.7",
|
||||||
"pinia": "^2.0.9",
|
"pinia": "^2.0.22",
|
||||||
"qs": "^6.8.0",
|
"qs": "^6.11.0",
|
||||||
"quill": "^1.3.7",
|
"quill": "^1.3.7",
|
||||||
"screenfull": "^5.0.2",
|
"screenfull": "^6.0.2",
|
||||||
"spark-md5": "^3.0.1",
|
"spark-md5": "^3.0.2",
|
||||||
"vue": "^3.2.25",
|
"vue": "^3.2.39",
|
||||||
"vue-i18n": "^9.2.0-beta.26",
|
"vue-i18n": "^9.2.2",
|
||||||
"vue-router": "^4.0.0-0"
|
"vue-router": "^4.1.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@intlify/vite-plugin-vue-i18n": "^3.2.1",
|
"@intlify/vite-plugin-vue-i18n": "^6.0.1",
|
||||||
"@intlify/vue-i18n-loader": "^4.1.0",
|
"@intlify/vue-i18n-loader": "^4.2.0",
|
||||||
"@vitejs/plugin-legacy": "^2.0.0",
|
"@vitejs/plugin-legacy": "^2.0.0",
|
||||||
"@vitejs/plugin-vue": "^3.0.1",
|
"@vitejs/plugin-vue": "^3.0.1",
|
||||||
"@vue/cli-plugin-babel": "~4.5.0",
|
"@vue/cli-plugin-babel": "^5.0.8",
|
||||||
"@vue/cli-plugin-eslint": "~4.5.0",
|
"@vue/cli-plugin-eslint": "^5.0.8",
|
||||||
"@vue/cli-plugin-router": "~4.5.0",
|
"@vue/cli-plugin-router": "^5.0.8",
|
||||||
"@vue/cli-plugin-vuex": "~4.5.0",
|
"@vue/cli-plugin-vuex": "^5.0.8",
|
||||||
"@vue/cli-service": "~4.5.0",
|
"@vue/cli-service": "^5.0.8",
|
||||||
"@vue/compiler-sfc": "^3.1.5",
|
"@vue/compiler-sfc": "^3.1.5",
|
||||||
"babel-eslint": "^10.1.0",
|
"babel-eslint": "^10.1.0",
|
||||||
"babel-plugin-import": "^1.13.3",
|
"babel-plugin-import": "^1.13.3",
|
||||||
|
|
|
@ -13,12 +13,15 @@ import auth from '@/directive/auth'
|
||||||
import { store } from '@/pinia'
|
import { store } from '@/pinia'
|
||||||
import App from './App.vue'
|
import App from './App.vue'
|
||||||
import i18n from './i18n' // added by mohamed hassan to multilangauge
|
import i18n from './i18n' // added by mohamed hassan to multilangauge
|
||||||
/**
|
|
||||||
|
/* *
|
||||||
* @description 导入加载进度条,防止首屏加载时间过长,用户等待
|
* @description 导入加载进度条,防止首屏加载时间过长,用户等待
|
||||||
*
|
*
|
||||||
* */
|
* */
|
||||||
|
|
||||||
import Nprogress from 'nprogress'
|
import Nprogress from 'nprogress'
|
||||||
import 'nprogress/nprogress.css'
|
import 'nprogress/nprogress.css'
|
||||||
|
|
||||||
Nprogress.configure({ showSpinner: false, ease: 'ease', speed: 500 })
|
Nprogress.configure({ showSpinner: false, ease: 'ease', speed: 500 })
|
||||||
Nprogress.start()
|
Nprogress.start()
|
||||||
|
|
||||||
|
|
|
@ -42,6 +42,7 @@
|
||||||
分配按钮
|
分配按钮
|
||||||
</el-button>
|
</el-button>
|
||||||
</span>
|
</span>
|
||||||
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-tree>
|
</el-tree>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -192,9 +192,10 @@ import PreviewCodeDialog from '@/view/systemTools/autoCode/component/previewCode
|
||||||
import { toUpperCase, toHump, toSQLLine, toLowerCase } from '@/utils/stringFun'
|
import { toUpperCase, toHump, toSQLLine, toLowerCase } from '@/utils/stringFun'
|
||||||
import { createTemp, getDB, getTable, getColumn, preview, getMeta, getPackageApi } from '@/api/autoCode'
|
import { createTemp, getDB, getTable, getColumn, preview, getMeta, getPackageApi } from '@/api/autoCode'
|
||||||
import { getDict } from '@/utils/dictionary'
|
import { getDict } from '@/utils/dictionary'
|
||||||
import { ref, getCurrentInstance, reactive } from 'vue'
|
import { ref, getCurrentInstance, reactive, watch } from 'vue'
|
||||||
import { useRoute, useRouter } from 'vue-router'
|
import { useRoute, useRouter } from 'vue-router'
|
||||||
import { ElMessage } from 'element-plus'
|
import { ElMessage } from 'element-plus'
|
||||||
|
import WarningBar from '@/components/warningBar/warningBar.vue'
|
||||||
import { useI18n } from 'vue-i18n' // added by mohamed hassan to support multilanguage
|
import { useI18n } from 'vue-i18n' // added by mohamed hassan to support multilanguage
|
||||||
|
|
||||||
const { t } = useI18n() // added by mohamed hassan to support multilanguage
|
const { t } = useI18n() // added by mohamed hassan to support multilanguage
|
||||||
|
@ -215,16 +216,6 @@ const fieldTemplate = {
|
||||||
dictType: ''
|
dictType: ''
|
||||||
}
|
}
|
||||||
|
|
||||||
import FieldDialog from '@/view/systemTools/autoCode/component/fieldDialog.vue'
|
|
||||||
import PreviewCodeDialog from '@/view/systemTools/autoCode/component/previewCodeDialg.vue'
|
|
||||||
import { toUpperCase, toHump, toSQLLine, toLowerCase } from '@/utils/stringFun'
|
|
||||||
import { createTemp, getDB, getTable, getColumn, preview, getMeta, getPackageApi } from '@/api/autoCode'
|
|
||||||
import { getDict } from '@/utils/dictionary'
|
|
||||||
import { ref, getCurrentInstance, reactive, watch } from 'vue'
|
|
||||||
import { useRoute, useRouter } from 'vue-router'
|
|
||||||
import { ElMessage } from 'element-plus'
|
|
||||||
import WarningBar from '@/components/warningBar/warningBar.vue'
|
|
||||||
|
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const activeNames = reactive([])
|
const activeNames = reactive([])
|
||||||
|
|
Loading…
Reference in New Issue