diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 8a35b14753..6d9cee4774 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1436,7 +1436,7 @@ export default { field_rename: 'Rename Field', params_work: 'Effective only when editing SQL', sql_variable_limit_1: '1、SQL variables can only be used in where conditions', - sql_variable_limit_2: '2、Example:select * from table_name where column_name1=${parm_name1} and column_name2 in ${parm_name2}', + sql_variable_limit_2: "2、Example:select * from table_name where column_name1='${parm_name1}' and column_name2 in '${parm_name2}'", select_year: 'Select Year', select_month: 'Select Month', select_date: 'Select Date', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 190436c596..35e6952961 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1436,7 +1436,7 @@ export default { field_rename: '字段重命名', params_work: '僅在編輯 sql 時生效', sql_variable_limit_1: '1、SQL變數只能在WHERE條件中使用', - sql_variable_limit_2: '2、示例:select * from table_name where column_name1=${parm_name1} and column_name2 in ${parm_name2}', + sql_variable_limit_2: "2、示例:select * from table_name where column_name1='${parm_name1}' and column_name2 in '${parm_name2}'", selesql_variable_limit_2ct_year: '選擇年', select_month: '選擇月', select_date: '選擇日期', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 0722d9c43f..1023462e2c 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1436,7 +1436,7 @@ export default { params_work: '仅在编辑sql时生效', select_year: '选择年', sql_variable_limit_1: '1、SQL 变量只能在 WHERE 条件中使用', - sql_variable_limit_2: '2、示例:select * from table_name where column_name1=${parm_name1} and column_name2 in ${parm_name2} ', + sql_variable_limit_2: "2、示例:select * from table_name where column_name1='${parm_name1}' and column_name2 in '${parm_name2}'", select_month: '选择月', select_date: '选择日期', select_time: '选择时间', diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue index 0686cd2223..1bf66a13e3 100644 --- a/frontend/src/views/dataset/add/AddSQL.vue +++ b/frontend/src/views/dataset/add/AddSQL.vue @@ -871,7 +871,7 @@ export default { border-radius: 4px; background: #e1eaff; position: relative; - padding: 9px 19px 9px 40px; + padding: 9px 0 9px 40px; font-family: PingFang SC; font-size: 14px; font-weight: 400; diff --git a/frontend/src/views/dataset/common/datasetTree.vue b/frontend/src/views/dataset/common/datasetTree.vue index 0ef6b5012c..949dd1e094 100644 --- a/frontend/src/views/dataset/common/datasetTree.vue +++ b/frontend/src/views/dataset/common/datasetTree.vue @@ -60,6 +60,16 @@ :class="`ds-icon-${data.modelInnerType}`" /> + + + + + {{ $t('dataset.update_setting') }} + + + {{ $t('commons.refresh') }} + + + + + + + + + + + + + + + + + + + + + + + {{ error_massage }} + + + {{ $t('dataset.close') }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('dataset.add_task') }} + + + + + + + + + + + + + + + + + + + + + + {{ $t('dataset.incremental_update_type') }}: + + + {{ $t('dataset.incremental_add') }} + {{ $t('dataset.incremental_delete') }} + + + + + + + + {{ $t('dataset.param') }}: + + {{ $t('dataset.last_update_time') }} + {{ $t('dataset.current_update_time') }} + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue index 2e0b46400a..bfedb958e0 100644 --- a/frontend/src/views/dataset/data/ViewTable.vue +++ b/frontend/src/views/dataset/data/ViewTable.vue @@ -125,14 +125,18 @@ + @@ -175,7 +179,7 @@ import DatasetDetail from '../common/DatasetDetail' import FieldEdit from './FieldEdit' import { pluginLoaded } from '@/api/user' import PluginCom from '@/views/system/plugin/PluginCom' - +import UpdateRecords from './UpdateRecords' export default { name: 'ViewTable', components: { @@ -183,6 +187,7 @@ export default { DatasetDetail, UpdateInfo, TabDataPreview, + UpdateRecords, PluginCom }, props: { diff --git a/frontend/src/views/msg/all.vue b/frontend/src/views/msg/all.vue index 0a625ec2f0..b5df51cc09 100644 --- a/frontend/src/views/msg/all.vue +++ b/frontend/src/views/msg/all.vue @@ -6,6 +6,7 @@
- + {{ data.name }} {{ $t('panel.rename') }} {{ $t('panel.delete') }} @@ -98,6 +103,18 @@ +

+ {{ defaultExpansion ? '收起' : '展开' }} + +

@@ -105,7 +122,7 @@ {{ $t('panel.panel_list') }} - + @@ -148,16 +165,21 @@ {{ data.name }} - + {{ $t('panel.groupAdd') }} - + {{ $t('panel.edit') }} {{ $t('panel.share') }} {{ $t('panel.copy') }} {{ $t('dataset.move_to') }} {{ $t('panel.create_public_links') }} {{ $t('panel.to_default_panel') }} {{ $t('panel.rename') }} {{ $t('panel.delete') }} @@ -305,7 +331,9 @@ {{ $t('panel.cancel') }} + >{{ + $t('panel.cancel') + }} {{ $t('dataset.cancel') }} + >{{ + $t('dataset.cancel') + }} { + this.clearLocalStorage.forEach((item) => { localStorage.removeItem(item) }) this.responseSource = 'panelQuery' @@ -582,9 +632,9 @@ export default { }, initCache() { // 初始化时提前加载视图和数据集的缓存 - this.initLocalStorage.forEach(item => { + this.initLocalStorage.forEach((item) => { if (!localStorage.getItem(item + '-tree')) { - queryAuthModel({ modelType: item }, false).then(res => { + queryAuthModel({ modelType: item }, false).then((res) => { localStorage.setItem(item + '-tree', JSON.stringify(res.data)) }) } @@ -596,7 +646,11 @@ export default { this.defaultTree() this.tree() // 默认展开 同时点击 新增的节点 - if (panelInfo && panelInfo.panelType === 'self' && this.lastActiveNodeData.id) { + if ( + panelInfo && + panelInfo.panelType === 'self' && + this.lastActiveNodeData.id + ) { if (this.editPanel.optType === 'rename') { this.lastActiveNodeData.name = panelInfo.name return @@ -692,10 +746,10 @@ export default { }, beforeClickEdit(type, optType, data, node) { return { - 'type': type, - 'data': data, - 'node': node, - 'optType': optType + type: type, + data: data, + node: node, + optType: optType } }, @@ -726,10 +780,10 @@ export default { beforeClickMore(optType, data, node) { return { - 'type': data.nodeType, - 'data': data, - 'node': node, - 'optType': optType + type: data.nodeType, + data: data, + node: node, + optType: optType } }, @@ -750,7 +804,7 @@ export default { saveGroup(group) { this.$refs['groupForm'].validate((valid) => { if (valid) { - addGroup(group).then(res => { + addGroup(group).then((res) => { this.close() this.$message({ message: this.$t('commons.save_success'), @@ -776,19 +830,20 @@ export default { confirmButtonText: this.$t('panel.confirm'), cancelButtonText: this.$t('panel.cancel'), type: 'warning' - }).then(() => { - delGroup(data.id).then(response => { - this.$message({ - type: 'success', - message: this.$t('panel.delete_success'), - showClose: true - }) - this.clearCanvas() - this.tree() - this.defaultTree() - }) - }).catch(() => { }) + .then(() => { + delGroup(data.id).then((response) => { + this.$message({ + type: 'success', + message: this.$t('panel.delete_success'), + showClose: true + }) + this.clearCanvas() + this.tree() + this.defaultTree() + }) + }) + .catch(() => {}) }, clearCanvas() { @@ -815,11 +870,11 @@ export default { }, tree(cache = false) { const modelInfo = localStorage.getItem('panel-main-tree') - const userCache = (modelInfo && cache) + const userCache = modelInfo && cache if (userCache) { this.tData = JSON.parse(modelInfo) } - groupTree(this.groupForm, !userCache).then(res => { + groupTree(this.groupForm, !userCache).then((res) => { localStorage.setItem('panel-main-tree', JSON.stringify(res.data)) if (!userCache) { this.tData = res.data @@ -839,12 +894,12 @@ export default { panelType: 'system' } const modelInfo = localStorage.getItem('panel-default-tree') - const userCache = (modelInfo && cache) + const userCache = modelInfo && cache if (userCache) { this.defaultData = JSON.parse(modelInfo) } - defaultTree(requestInfo, false).then(res => { + defaultTree(requestInfo, false).then((res) => { localStorage.setItem('panel-default-tree', JSON.stringify(res.data)) if (!userCache) { this.defaultData = res.data @@ -865,7 +920,7 @@ export default { // 清理pc布局缓存 this.$store.commit('setComponentDataCache', null) initPanelData(data.id, false, function(response) { - viewPanelLog({ panelId: data.id }).then(res => { + viewPanelLog({ panelId: data.id }).then((res) => { bus.$emit('set-panel-show-type', 0) data.mobileLayout = response.data.mobileLayout }) @@ -889,7 +944,7 @@ export default { }, beforeClickAddData(type) { return { - 'type': type + type: type } }, @@ -930,15 +985,13 @@ export default { }, resetID(data) { if (data) { - data.forEach(item => { + data.forEach((item) => { item.type !== 'custom' && (item.id = uuid.v1()) }) } return data }, - newPanelSave(id) { - - }, + newPanelSave(id) {}, // 激活并点击当前节点 activeNodeAndClick(panelInfo) { if (panelInfo) { @@ -979,10 +1032,13 @@ export default { moveTo(data) { const _this = this this.moveInfo = data - this.moveDialogTitle = this.$t('dataset.m1') + (data.name.length > 10 ? (data.name.substr(0, 10) + '...') : data.name) + this.$t('dataset.m2') + this.moveDialogTitle = + this.$t('dataset.m1') + + (data.name.length > 10 ? data.name.substr(0, 10) + '...' : data.name) + + this.$t('dataset.m2') const queryInfo = JSON.parse(JSON.stringify(this.groupForm)) queryInfo['nodeType'] = 'folder' - groupTree(queryInfo).then(res => { + groupTree(queryInfo).then((res) => { if (data.nodeType === 'folder') { _this.tGroupData = [ { @@ -1005,7 +1061,7 @@ export default { saveMoveGroup() { this.moveInfo.pid = this.tGroup.id this.moveInfo['optType'] = 'move' - panelUpdate(this.moveInfo).then(response => { + panelUpdate(this.moveInfo).then((response) => { this.tree() this.closeMoveGroup() }) @@ -1050,6 +1106,22 @@ export default {