yvan/Study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

publish: 发布2.7.4版本Beta (#1880)

Browse Source 
* 媒体库增加批量导入URL

* fix 描述错误

* feature: 自动化代码方法支持增加方法描述

* update: 更新依赖，升级为最新版本

* feature: 自动化代码预览部分支持黑夜模式

* fixed: 修复keepalive上线后失效的bug

* feature: 增加自动化基础模板功能

* feature: 增加自动化基础模板功能

* 将用户配置保存到数据库，刷新或者异地登录配置不丢失

* update: 清除无用的userinfo配置信息

* fixed: 清理开发阶段页面无端进入404的bug

* feature: 前端主题配置跟随用户，不再单独设置json编译生效。

* feature: 增加个人中心配置兼容性

* fix(package): 包名设置为中文会导致无法自动生成代码，禁止包名设置为中文

* feature: 格式化代码

* feature: 对严格模式新建根角色进行调整。

* feature: 版本变更为2.7.4

---------

Co-authored-by: sliboy <34034053+sliboy@users.noreply.github.com>
Co-authored-by: ba0ch3ng <ba0ch3ng@foxmail.com>
Co-authored-by: task <121913992@qq.com>
Co-authored-by: task <ms.yangdan@gmail.com>
Co-authored-by: 爱丽-黑子 <62006632+ailiheizi@users.noreply.github.com>
Co-authored-by: sliboy <sliboy@hotmail.com>
This commit is contained in:
PiexlMax(奇淼
2024-09-12 20:48:03 +08:00
committed by GitHub
co-authored by sliboy ba0ch3ng task task 爱丽-黑子 sliboy
parent df3fc0a9ef
commit c20ea7e030
68 changed files with 713 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/view/example/upload/upload.vue
+62 -5
View File
@@ -15,9 +15,16 @@
:max-w-h="1080"
@on-success="getTableData"
/>
<el-button
type="primary"
icon="upload"
@click="importUrlFunc"
>
导入URL
</el-button>
<el-input
v-model="search.keyword"
class="keyword"
class="w-72"
placeholder="请输入文件名或备注"
/>
<el-button
@@ -122,12 +129,12 @@
</template>
<script setup>
import { getFileList, deleteFile, editFileName } from '@/api/fileUploadAndDownload'
import {getFileList, deleteFile, editFileName, importURL} from '@/api/fileUploadAndDownload'
import { downloadImage } from '@/utils/downloadImg'
import CustomPic from '@/components/customPic/index.vue'
import UploadImage from '@/components/upload/image.vue'
import UploadCommon from '@/components/upload/common.vue'
import { formatDate } from '@/utils/format'
import {CreateUUID, formatDate} from '@/utils/format'
import WarningBar from '@/components/warningBar/warningBar.vue'
import { ref } from 'vue'
@@ -228,7 +235,7 @@ const editFileNameFunc = async(row) => {
type: 'success',
message: '编辑成功!',
})
getTableData()
await getTableData()
}
}).catch(() => {
ElMessage({
@@ -237,11 +244,61 @@ const editFileNameFunc = async(row) => {
})
})
}
/**
* 导入URL
*/
const importUrlFunc = () => {
ElMessageBox.prompt('格式：文件名|链接或者仅链接。', '导入', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputType: 'textarea',
inputPlaceholder: '我的图片|https://my-oss.com/my.png\nhttps://my-oss.com/my_1.png',
inputPattern: /\S/,
inputErrorMessage: '不能为空',
}).then(async({ value }) => {
let data = value.split('\n')
let importData = []
data.forEach(item => {
let oneData = item.trim().split('|')
let url, name
if (oneData.length > 1) {
name = oneData[0].trim()
url = oneData[1]
} else {
url = oneData[0].trim()
let str = url.substring(url.lastIndexOf('/') + 1)
name = str.substring(0, str.lastIndexOf('.'))
}
if (url) {
importData.push({
name: name,
url: url,
tag: url.substring(url.lastIndexOf(".") + 1),
key: CreateUUID()
})
}
})
const res = await importURL(importData)
if (res.code === 0) {
ElMessage({
type: 'success',
message: '导入成功!',
})
await getTableData()
}
}).catch(() => {
ElMessage({
type: 'info',
message: '取消导入',
})
})
}
</script>
<style scoped>
.name {
cursor: pointer;
}
</style>
web/src/view/init/index.vue
+7 -11
View File
@@ -191,6 +191,7 @@ const goDoc = () => {
const out = ref(false)
const form = reactive({
adminPassword: '123456',
dbType: 'mysql',
host: '127.0.0.1',
port: '3306',
@@ -204,7 +205,7 @@ const changeDB = (val) => {
switch (val) {
case 'mysql':
Object.assign(form, {
adminPassword:'',
adminPassword:'123456',
reAdminPassword:'',
dbType: 'mysql',
host: '127.0.0.1',
@@ -217,8 +218,7 @@ const changeDB = (val) => {
break
case 'pgsql':
Object.assign(form, {
adminPassword:'',
reAdminPassword:'',
adminPassword:'123456',
dbType: 'pgsql',
host: '127.0.0.1',
port: '5432',
@@ -230,8 +230,7 @@ const changeDB = (val) => {
break
case 'oracle':
Object.assign(form, {
adminPassword:'',
reAdminPassword:'',
adminPassword:'123456',
dbType: 'oracle',
host: '127.0.0.1',
port: '1521',
@@ -243,8 +242,7 @@ const changeDB = (val) => {
break
case 'mssql':
Object.assign(form, {
adminPassword:'',
reAdminPassword:'',
adminPassword:'123456',
dbType: 'mssql',
host: '127.0.0.1',
port: '1433',
@@ -256,8 +254,7 @@ const changeDB = (val) => {
break
case 'sqlite':
Object.assign(form, {
adminPassword:'',
reAdminPassword:'',
adminPassword:'123456',
dbType: 'sqlite',
host: '',
port: '',
@@ -269,8 +266,7 @@ const changeDB = (val) => {
break
default:
Object.assign(form, {
adminPassword:'',
reAdminPassword:'',
adminPassword:'123456',
dbType: 'mysql',
host: '127.0.0.1',
port: '3306',
web/src/view/layout/setting/index.vue
+13 -12
View File
@@ -112,14 +112,12 @@
</div>
</div>
<el-alert type="warning" :closable="false">
<!-- <el-alert type="warning" :closable="false">
请注意，所有配置请保存到本地文件的
<el-tag>config.json</el-tag> 文件中，否则刷新页面后会丢失配置
</el-alert>
</el-alert>-->
<el-button type="primary" class="mt-4" @click="copyConfig"
>复制配置json</el-button
>
<el-button type="primary" class="mt-4" @click="saveConfig">保存配置</el-button>
</div>
</el-drawer>
</template>
@@ -129,6 +127,7 @@ import { useAppStore } from "@/pinia";
import { storeToRefs } from "pinia";
import { ref, computed } from "vue";
import { ElMessage } from "element-plus";
import {setSelfSetting} from "@/api/user";
const appStore = useAppStore();
const { config, device } = storeToRefs(appStore);
defineOptions({
@@ -169,8 +168,8 @@ const sideModes = [
}
];
const copyConfig = () => {
const input = document.createElement("textarea");
const saveConfig = async () => {
/*const input = document.createElement("textarea");
input.value = JSON.stringify(config.value);
// 添加回车
input.value = input.value.replace(/,/g, ",\n");
@@ -178,14 +177,16 @@ const copyConfig = () => {
input.select();
document.execCommand("copy");
document.body.removeChild(input);
ElMessage.success("复制成功, 请自行保存到本地文件中");
ElMessage.success("复制成功, 请自行保存到本地文件中");*/
const res = await setSelfSetting(config.value)
if(res.code === 0){
localStorage.setItem('originSetting', JSON.stringify(config.value))
ElMessage.success('保存成功')
drawer.value = false
}
};
const customColor = ref("");
const handleSideModelChange = (e) => {
console.log(e);
};
</script>
<style lang="scss" scoped>
web/src/view/login/index.vue
+3 -3
View File
@@ -231,7 +231,7 @@ const submitForm = () => {
message: '请正确填写登录信息',
showClose: true,
})
loginVerify()
await loginVerify()
return false
}
@@ -240,7 +240,7 @@ const submitForm = () => {
// 登陆失败，刷新验证码
if (!flag) {
loginVerify()
await loginVerify()
return false
}
@@ -255,7 +255,7 @@ const checkInit = async() => {
if (res.code === 0) {
if (res.data?.needInit) {
userStore.NeedInit()
router.push({ name: 'Init' })
await router.push({name: 'Init'})
} else {
ElMessage({
type: 'info',
web/src/view/superAdmin/api/api.vue
+1 -1
View File
@@ -591,6 +591,7 @@ const enterSyncDialog = async() => {
const onReset = () => {
searchInfo.value = {}
getTableData()
}
// 搜索
@@ -690,7 +691,6 @@ const onSync = async() => {
if (res.code === 0) {
res.data.newApis.forEach(item => {
item.apiGroup = apiGroupMap.value[item.path.split('/')[1]]
console.log(apiGroupMap.value)
})
syncApiData.value = res.data
web/src/view/superAdmin/authority/authority.vue
+2 -2
View File
@@ -201,7 +201,7 @@ const mustUint = (rule, value, callback) => {
const AuthorityOption = ref([
{
authorityId: 0,
authorityName: '根角色'
authorityName: '根角色/严格模式下为当前角色'
}
])
const drawer = ref(false)
@@ -384,7 +384,7 @@ const setOptions = () => {
AuthorityOption.value = [
{
authorityId: 0,
authorityName: '根角色'
authorityName: '根角色(严格模式下为当前用户角色)'
}
]
setAuthorityOptions(tableData.value, AuthorityOption.value, false)
web/src/view/systemTools/autoCode/component/previewCodeDialg.vue
+29 -19
View File
@@ -8,18 +8,30 @@
>
<div
:id="key"
class="h-[calc(100vh-110px)] bg-white px-5 overflow-y-scroll"
class="h-[calc(100vh-110px)] px-5 overflow-y-scroll"
/>
</el-tab-pane>
</el-tabs>
</template>
<script setup>
import { marked } from 'marked'
import { Marked } from "marked";
import { markedHighlight } from "marked-highlight";
import hljs from 'highlight.js'
import 'highlight.js/styles/atom-one-dark.css'
import { ElMessage } from 'element-plus'
import { onMounted, ref } from 'vue'
import {useAppStore} from "@/pinia";
const appStore = useAppStore()
onMounted(() => {
const isDarkMode = appStore.config.darkMode === 'dark';
if (isDarkMode) {
import('highlight.js/styles/atom-one-dark.css');
} else {
import('highlight.js/styles/atom-one-light.css');
}
});
const props = defineProps({
previewCode: {
@@ -32,26 +44,24 @@ const props = defineProps({
const activeName = ref('')
onMounted(() => {
marked.setOptions({
renderer: new marked.Renderer(),
highlight: function(code) {
return hljs.highlightAuto(code).value
},
pedantic: false,
gfm: true,
tables: true,
breaks: false,
sanitize: false,
smartLists: true,
smartypants: false,
xhtml: false,
langPrefix: 'hljs language-'
})
const marked = new Marked(
markedHighlight({
langPrefix: 'hljs language-',
highlight(code, lang, info) {
console.log(code,lang,info)
const language = hljs.getLanguage(lang) ? lang : 'plaintext';
if (lang === 'vue') {
return hljs.highlight(code, { language: 'html' }).value;
}
return hljs.highlight(code, { language }).value;
}
})
);
for (const key in props.previewCode) {
if (activeName.value === '') {
activeName.value = key
}
document.getElementById(key).innerHTML = marked(props.previewCode[key])
document.getElementById(key).innerHTML = marked.parse(props.previewCode[key])
}
})
web/src/view/systemTools/autoCode/index.vue
+46 -9
View File
@@ -386,6 +386,20 @@
<el-checkbox v-model="form.autoCreateResource" />
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item>
<template #label>
<el-tooltip
content="注：使用基础模板将不会生成任何结构体和CURD,仅仅配置enter等属性方便自行开发非CURD逻辑"
placement="bottom"
effect="light"
>
<div> 基础模板 <el-icon><QuestionFilled /></el-icon> </div>
</el-tooltip>
</template>
<el-checkbox v-model="form.onlyTemplate" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
@@ -395,6 +409,7 @@
<el-button
type="primary"
@click="editAndAddField()"
:disabled="form.onlyTemplate"
>
新增字段
</el-button>
@@ -1013,6 +1028,7 @@ const form = ref({
autoMigrate: true,
gvaModel: true,
autoCreateResource: false,
onlyTemplate: false,
fields: []
})
const rules = ref({
@@ -1125,6 +1141,9 @@ const deleteField = (index) => {
}
const autoCodeForm = ref(null)
const enterForm = async(isPreview) => {
if(!form.value.onlyTemplate){
if (form.value.fields.length <= 0) {
ElMessage({
type: 'error',
@@ -1151,14 +1170,6 @@ const enterForm = async(isPreview) => {
return false
}
if (form.value.package === form.value.abbreviation) {
ElMessage({
type: 'error',
message: 'package和结构体简称不可同名'
})
return false
}
if (form.value.fields.some(item => !item.fieldType)) {
ElMessage({
@@ -1168,6 +1179,16 @@ const enterForm = async(isPreview) => {
return false
}
if (form.value.package === form.value.abbreviation) {
ElMessage({
type: 'error',
message: 'package和结构体简称不可同名'
})
return false
}
}
autoCodeForm.value.validate(async valid => {
if (valid) {
for (const key in form.value) {
@@ -1366,6 +1387,7 @@ const clearCatch = async () => {
autoMigrate: true,
gvaModel: true,
autoCreateResource: false,
onlyTemplate: false,
fields: []
}
await nextTick()
@@ -1390,7 +1412,6 @@ const exportJson = () => {
const importJson = (file) =>{
const reader = new FileReader()
reader.onload = (e) => {
console.log(e)
try {
form.value = JSON.parse(e.target.result)
ElMessage.success('JSON 文件导入成功')
@@ -1402,4 +1423,20 @@ const importJson = (file) =>{
return false
}
watch(()=>form.value.onlyTemplate,(val)=>{
if(val){
ElMessageBox.confirm('使用基础模板将不会生成任何结构体和CURD,仅仅配置enter等属性方便自行开发非CURD逻辑', '注意', {
confirmButtonText: '继续',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
form.value.fields = []
})
.catch(() => {
form.value.onlyTemplate = false
})
}
})
</script>
web/src/view/systemTools/autoCodeAdmin/index.vue
+5
View File
@@ -177,6 +177,9 @@
<el-form-item label="缩写：">
<el-input v-model="autoFunc.abbreviation" placeholder="请输入缩写" disabled />
</el-form-item>
<el-form-item label="方法名：">
<el-input v-model="autoFunc.funcDesc" placeholder="请输入方法介绍" />
</el-form-item>
<el-form-item label="方法名：">
<el-input v-model="autoFunc.funcName" placeholder="请输入方法名" />
</el-form-item>
@@ -238,6 +241,7 @@ const autoFunc = ref({
humpPackageName:"",
businessDB:"",
method:"",
funcDesc: ""
})
const addFuncBtn = (row) => {
@@ -252,6 +256,7 @@ const addFuncBtn = (row) => {
autoFunc.value.method = ""
autoFunc.value.funcName = ""
autoFunc.value.router = ""
autoFunc.value.funcDesc = "方法介绍"
funcFlag.value = true;
};
web/src/view/systemTools/autoPkg/autoPkg.vue
+6 -4
View File
@@ -170,8 +170,10 @@ const getTemplates = async ()=>{
getTemplates()
const validateNum = (rule, value, callback) => {
if ((/^\d+$/.test(value[0]))) {
const validateData = (rule, value, callback) => {
if (/[\u4E00-\u9FA5]/g.test(value)) {
callback(new Error('不能为中文'))
} else if ((/^\d+$/.test(value[0]))) {
callback(new Error('不能够以数字开头'))
} else {
callback()
@@ -181,11 +183,11 @@ const validateNum = (rule, value, callback) => {
const rules = ref({
packageName: [
{ required: true, message: '请输入包名', trigger: 'blur' },
{ validator: validateNum, trigger: 'blur' }
{ validator: validateData, trigger: 'blur' }
],
template:[
{ required: true, message: '请选择模板', trigger: 'change' },
{ validator: validateNum, trigger: 'blur' }
{ validator: validateData, trigger: 'blur' }
]
})
web/src/view/systemTools/system/system.vue
+6 -13
View File
@@ -13,7 +13,7 @@
class="mt-3.5"
>
<el-form-item label="端口值">
<el-input v-model.number="config.system.addr" placeholder="请输入端口值"/>
<el-input-number v-model="config.system.addr" placeholder="请输入端口值"/>
</el-form-item>
<el-form-item label="数据库类型">
<el-select
@@ -50,7 +50,7 @@
<el-switch v-model="config.system['use-mongo']"/>
</el-form-item>
<el-form-item label="严格角色模式">
<el-checkbox v-model="config.system['use-strict-auth']">开启</el-checkbox>
<el-switch v-model="config.system['use-strict-auth']"/>
</el-form-item>
<el-form-item label="限流次数">
<el-input-number v-model.number="config.system['iplimit-count']"/>
@@ -75,7 +75,7 @@
<el-form-item label="jwt签名">
<el-input v-model.trim="config.jwt['signing-key']" placeholder="请输入jwt签名">
<template #append>
<el-button @click="CreateUUID">生成</el-button>
<el-button @click="getUUID">生成</el-button>
</template>
</el-input>
</el-form-item>
@@ -682,6 +682,7 @@ import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Minus, Plus } from '@element-plus/icons-vue'
import { emailTest } from '@/api/email'
import {CreateUUID} from "@/utils/format";
defineOptions({
name: 'Config',
@@ -795,16 +796,8 @@ const email = async() => {
}
}
const CreateUUID = () => {
let d = new Date().getTime()
if (window.performance && typeof window.performance.now === 'function') {
d += performance.now()
}
config.value.jwt['signing-key'] = '00000000-0000-0000-0000-000000000000'.replace(/0/g, (c) => {
const r = (d + Math.random() * 16) % 16 | 0 // d是随机种子
d = Math.floor(d / 16)
return (c === '0' ? r : (r & 0x3 | 0x8)).toString(16)
})
const getUUID = () => {
config.value.jwt['signing-key'] = CreateUUID()
}
const addNode = () => {