clay
/
ebts-up
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

top权限信息修改,删除web端控制台信息输出

This commit is contained in:
clay 2021-08-05 14:14:28 +08:00
parent c8a3149a62
commit daef1c9abd
12 changed files with 20 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ebts-ui/.env.development
View File

@ -4,8 +4,7 @@ ENV = 'development'
# EBTS/开发环境
#VUE_APP_BASE_API = '/dev-api'
VUE_APP_BASE_API = 'http://localhost:8085/dev-api'
#VUE_APP_BASE_API = 'http://apibase.hchyun.com/dev-api'
#VUE_APP_BASE_API = 'http://apig.odliken.top/dev-api'
#VUE_APP_BASE_API = 'https://api.ebts.top/dev-api'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

3
ebts-ui/.env.production
View File

@ -3,5 +3,4 @@ ENV = 'production'
# EBTS/生产环境
#VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_API = 'http://apibase.hchyun.com/dev-api'
#VUE_APP_BASE_API = '/dev-api'
VUE_APP_BASE_API = 'https://api.ebts.top/dev-api'

2
ebts-ui/src/components/ThemePicker/index.vue
View File

@ -35,8 +35,6 @@ export default {
if (typeof val !== 'string') return
const themeCluster = this.getThemeCluster(val.replace('#', ''))
const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
console.log(themeCluster, originalCluster)
const $message = this.$message({
message: ' Compiling the theme',
customClass: 'theme-message',

1
ebts-ui/src/views/system/file/index.vue
View File

@ -442,7 +442,6 @@ export default {
this.changeArray()
this.fileForm.open = true;
this.fileForm.title = "修改文件信息";
console.log(this.form)
});
},
/** 提交按钮 */

3
ebts-ui/src/views/tool/apiclass/editTable.vue
View File

@ -120,7 +120,6 @@ export default {
this.info = response.data.info
})
}
console.log(apiclassId)
},
methods: {
/** 删除按钮 */
@ -170,12 +169,10 @@ export default {
}
}
if (validateResult) {
console.log(apiclassForm.model)
const interTableDto = {
apiclass: apiclassForm.model,
interTables: this.cloumns,
};
console.log(interTableDto)
updateIntertable(interTableDto).then(res => {
this.msgSuccess(res.msg);
if (res.code === 200) {

2
ebts-ui/src/views/tool/apiclass/index.vue
View File

@ -311,7 +311,6 @@
methods: {
/** 预览代码 */
handlePreview(id){
console.log(id)
getClassPreview(id).then(res =>{
this.preview.data = res.data;
this.preview.open = true;
@ -327,7 +326,6 @@
highlightedCode(code, key) {
const vmName = key;
var language = vmName.substring(vmName.indexOf(".") + 1, vmName.length);
console.log(language)
const result = hljs.highlight(language, code || "", true);
return result.value || ' ';
},

1
ebts-ui/src/views/tool/module/editTable.vue
View File

@ -134,7 +134,6 @@
})
queryListApiclass().then(res => {
this.apiclassOptions = res.data
console.log(res)
})
}
},

8
ebts-ui/src/views/tool/query/uniQuery.vue
View File

@ -255,10 +255,7 @@ export default {
},
methods: {
changUniCon(list) {
console.log(list[0])
console.log(list.length)
for (let i = 0; i < list.length; i++) {
console.log(list[0].ucName)
if (list[i].ucName == "") {
Message({
message: "序号" + i + "查询名称不能为空!",
@ -290,7 +287,6 @@ export default {
isRelease: release,
}
Release(data).then(res=>{
console.log(res)
this.info.isRelease = (this.info.isRelease==1)?2:1
Message({
message:res.msg,
@ -337,7 +333,6 @@ export default {
// 支持双向绑定
this.sqlconfig.coder.on('change', (coder) => {
this.info.uqSql = coder.getValue()
console.log(this.info.uqSql)
if (this.$emit) {
this.$emit('input', this.info.uqSql)
}
@ -349,7 +344,6 @@ export default {
this.cloumns.splice(index, 1);
},
ucTypeChang(index, row) {
console.log(typeof this.cloumns[index].ucMock)
if (row.ucType == 'input' && row.ucCon != 'BETWEEN') {
this.cloumns[index].type = 1
if (typeof (this.cloumns[index].ucMock) != 'string') {
@ -390,7 +384,6 @@ export default {
data.uniCons = list
}
editQueryInfo(data).then(res => {
console.log(res)
this.cloumns = JSONparse(list)
Message({
message: res.msg,
@ -422,7 +415,6 @@ export default {
}
return exportMock(data)
}).then(response => {
console.log(response)
that.cloumns = JSONparse(list)
this.download(response.msg);
})

8
ebts-ui/src/views/tool/top/packages/topology/src/behavior/dice-er-node.js
View File

@ -61,14 +61,14 @@ export default {
if (nodes) {
nodes.forEach((node) => {
const model = node.getModel();
if (model.column.length < 9 ) {
if (model.columns.length < 9 ) {
return;
}
const idx = model.startIndex || 0;
this.start=idx
let startX = model.startX || 0.5;
let startIndex = idx + e.deltaY * 0.02;
if ((model.column.length-idx)<10 && startIndex > idx){
if ((model.columns.length-idx)<10 && startIndex > idx){
return;
}
startX -= e.deltaX;
@ -78,8 +78,8 @@ export default {
if (startX > 0) {
startX = 0;
}
if (startIndex > model.column.length - 1) {
startIndex = model.column.length - 1;
if (startIndex > model.columns.length - 1) {
startIndex = model.columns.length - 1;
}
graph.update(node, {
startIndex,

20
ebts-ui/src/views/tool/top/packages/topology/src/topology.vue
View File

@ -490,7 +490,6 @@ export default {
created() {
},
mounted() {
console.log(this.topId)
Node.obj.diceErBox.sendThis(this)
Behavior.obj.dragAddEdge.sendThis(this)
Behavior.obj.dragEventEdit.sendThis(this)
@ -521,7 +520,6 @@ export default {
methods: {
//todo
ucTypeChang(index, row) {
console.log(typeof this.selectedNodeParams.columns[index].ucMock)
if (row.ucType == 'input' && row.ucCon != 'BETWEEN') {
this.selectedNodeParams.columns[index].type = 1
if (typeof (this.selectedNodeParams.columns[index].ucMock) != 'string') {
@ -1173,7 +1171,6 @@ export default {
this.addHistoryData(key, historyData)
// ************** 记录【添加节点】前的数据状态 end **************
let graphData = graph.save();
console.log(graphData)
let relational = []
let starts = false
if (graphData.nodes.length > 0){
@ -1202,15 +1199,13 @@ export default {
let columns = []
for (let i = 0; i < nodeType.topSearchColumnList.length; i++) {
let item = nodeType.topSearchColumnList[i]
if (item.isUse === 1) {
item.isQuery = 0
item.ucCon = ''
item.ucType = ''
item.type = 1
item.ucMock = ''
item.ucName = item.columnComment
columns.push(item)
}
item.isQuery = 0
item.ucCon = ''
item.ucType = ''
item.type = 1
item.ucMock = ''
item.ucName = item.columnComment
columns.push(item)
}
let node = graph.addItem('node', {
@ -1420,7 +1415,6 @@ export default {
// todo 预览
searchPreview(){
let graphData = this.getGraphData()
// console.log(graphData)
this.$emit('doPreview', graphData)
},
// 保存函数

3
ebts-ui/src/views/tool/top/topology.vue
View File

@ -232,14 +232,13 @@ export default {
this.randomChange()
},
doSaveData(graphData) {
console.log(JSON.stringify(graphData))
let data = {
id : this.topId,
topJson:JSON.stringify(graphData)
}
//todo 入库完成
updateQuery(data).then(res =>{
console.log(res)
this.msgSuccess(res.msg)
})
},
doPreview(graphData){

15
ebts/ebts-generator/src/main/resources/mapper/generator/TopSearchTableMapper.xml
View File

@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="columnComment" column="column_comment" />
<result property="columnType" column="column_type" />
<result property="isPk" column="is_pk" />
<result property="isUse" column="is_use" />
<result property="isUse" column="is_use_column" />
<result property="sort" column="sort" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTopSearchTableById" parameterType="Long" resultMap="TopSearchTableTopSearchColumnResult">
select gtst.id, gtst.table_name, gtst.table_comment, gtst.remark, gtst.create_by, gtst.create_time, gtst.update_by, gtst.update_time,
gtsc.id as column_id, gtsc.search_table_id, gtsc.column_name, gtsc.column_comment, gtsc.column_type, gtsc.is_use, gtsc.create_by, gtsc.create_time, gtsc.update_by, gtsc.update_time,
gtsc.id as column_id, gtsc.search_table_id, gtsc.column_name, gtsc.column_comment, gtsc.column_type, gtsc.is_use as is_use_column, gtsc.create_by, gtsc.create_time, gtsc.update_by, gtsc.update_time,
grm.main_id, grm.child_id, grm.main_key, grm.child_key, grm.type
from gen_top_search_table gtst
left join gen_top_search_column gtsc on gtsc.search_table_id = gtst.id
@ -80,20 +80,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTopSearchTables" resultMap="TopSearchTableTopSearchColumnResult" parameterType="String">
select gtst.id, gtst.table_name, gtst.table_comment, gtst.remark, gtst.create_by, gtst.create_time, gtst.update_by, gtst.update_time,
gtsc.id as column_id, gtsc.search_table_id, gtsc.column_name, gtsc.column_comment, gtsc.column_type, gtsc.is_use, gtsc.create_by, gtsc.create_time, gtsc.update_by, gtsc.update_time,
gtsc.id as column_id, gtsc.search_table_id, gtsc.column_name, gtsc.column_comment, gtsc.column_type, gtsc.is_use as is_use_column, gtsc.create_by, gtsc.create_time, gtsc.update_by, gtsc.update_time,
grm.main_id, grm.child_id, grm.main_key, grm.child_key, grm.type
from gen_top_search_table gtst
left join gen_top_search_column gtsc on gtsc.search_table_id = gtst.id
left join gen_relational_mapping grm on grm.main_id = gtst.id
where gtst.id IN (SELECT search_table_id FROM gen_search_table_role WHERE role_id IN
where gtsc.is_use = 1 and gtst.id IN (SELECT search_table_id FROM gen_search_table_role WHERE role_id IN
<foreach collection="array" item="roleId" open="(" separator="," close=")">
#{roleId}
</foreach>) and gtsc.is_use = 1
</foreach>)
</select>
<!-- <foreach collection="array" item="name" open="(" separator="," close=")">-->
<!-- #{name}#{roleIds}-->
<!-- </foreach>-->
<!--AND table_name NOT LIKE 'gen_%'-->
<select id="selectDbTableList" resultType="java.util.Map">
select table_name, table_comment, create_time, update_time from information_schema.tables
where table_schema = (select database())