diff --git a/frontend/src/components/canvas/components/AttrList.vue b/frontend/src/components/canvas/components/AttrList.vue index 559c747e19..b11bcee099 100644 --- a/frontend/src/components/canvas/components/AttrList.vue +++ b/frontend/src/components/canvas/components/AttrList.vue @@ -1,81 +1,82 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file + diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue index 2c32b55ed9..36c6cdf466 100644 --- a/frontend/src/components/canvas/components/Toolbar.vue +++ b/frontend/src/components/canvas/components/Toolbar.vue @@ -11,6 +11,19 @@ + + + + + + + + + + + + + @@ -56,11 +69,8 @@ import { export default { name: 'Toolbar', props: { - buttonActive: { - type: Boolean, - required: false, - default: false - } + styleButtonActive: Boolean, + aidedButtonActive: Boolean }, data() { return { @@ -233,6 +243,9 @@ export default { clickPreview() { this.$emit('previewFullScreen') + }, + changeAidedDesign() { + this.$emit('changeAidedDesign') } } } diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 44634f221f..a370514f5a 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -908,7 +908,30 @@ export default { topComponent: 'Top Component', bottomComponent: 'Bottom Component', upComponent: 'Up One Level', - downComponent: 'Down One Level' + downComponent: 'Down One Level', + open_aided_design: 'Open Component Aided Design', + close_aided_design: 'Close Component Aided Design', + open_style_design: 'Open Style Design', + close_style_design: 'Close Style Design', + left: 'X-Axis', + top: 'Y-Axis', + height: 'Height', + width: 'Width', + color: 'Color', + backgroundColor: 'BackgroundColor', + borderWidth: 'BorderWidth', + borderColor: 'BorderColor', + borderRadius: 'BorderRadius', + fontSize: 'FontSize', + fontWeight: 'FontWeight', + lineHeight: 'LineHeight', + letterSpacing: 'LetterSpacing', + textAlign: 'TextAlign', + opacity: 'Opacity', + aline_left: 'Aline Left', + aline_center: 'Aline Center', + aline_right: 'Aline Right', + select_component: 'Check Component' }, plugin: { local_install: 'Local installation', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 8330f734c8..2211e4a45a 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -908,7 +908,30 @@ export default { topComponent: '置于顶层', bottomComponent: '置于底层', upComponent: '上移一层', - downComponent: '下移一层' + downComponent: '下移一层', + open_aided_design: '打开组件辅助设计', + close_aided_design: '关闭组件辅助设计', + open_style_design: '打开样式设计', + close_style_design: '关闭样式设计', + left: 'x 坐标', + top: 'y 坐标', + height: '高', + width: '宽', + color: '颜色', + backgroundColor: '背景色', + borderWidth: '边框宽度', + borderColor: '边框颜色', + borderRadius: '边框半径', + fontSize: '字体大小', + fontWeight: '字体粗细', + lineHeight: '行高', + letterSpacing: '字间距', + textAlign: '对齐方式', + opacity: '透明度', + aline_left: '左对齐', + aline_center: '居中', + aline_right: '右对齐', + select_component: '请选择组件' }, plugin: { local_install: '本地安裝', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 2feb5ef0f3..348bf41e5e 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -908,8 +908,30 @@ export default { topComponent: '置于顶层', bottomComponent: '置于底层', upComponent: '上移一层', - downComponent: '下移一层' - + downComponent: '下移一层', + open_aided_design: '打开组件辅助设计', + close_aided_design: '关闭组件辅助设计', + open_style_design: '打开样式设计', + close_style_design: '关闭样式设计', + left: 'x 坐标', + top: 'y 坐标', + height: '高', + width: '宽', + color: '颜色', + backgroundColor: '背景色', + borderWidth: '边框宽度', + borderColor: '边框颜色', + borderRadius: '边框半径', + fontSize: '字体大小', + fontWeight: '字体粗细', + lineHeight: '行高', + letterSpacing: '字间距', + textAlign: '对齐方式', + opacity: '透明度', + aline_left: '左对齐', + aline_center: '居中', + aline_right: '右对齐', + select_component: '请选择组件' }, plugin: { local_install: '本地安装', diff --git a/frontend/src/views/dataset/common/DatasetGroupSelector.vue b/frontend/src/views/dataset/common/DatasetGroupSelector.vue index 1833b769da..6027df0e8c 100644 --- a/frontend/src/views/dataset/common/DatasetGroupSelector.vue +++ b/frontend/src/views/dataset/common/DatasetGroupSelector.vue @@ -51,7 +51,7 @@ - + {{ currGroup.name }} @@ -150,7 +150,8 @@ export default { tableForm: { name: '', sort: 'type asc,create_time desc,name asc' - } + }, + dsLoading: false } }, computed: {}, @@ -219,6 +220,7 @@ export default { tableTree() { this.tableData = [] if (this.currGroup) { + this.dsLoading = true post('/dataset/table/list', { sort: 'type asc,create_time desc,name asc', sceneId: this.currGroup.id, @@ -235,6 +237,9 @@ export default { this.$nextTick(function() { this.unionDataChange() }) + this.dsLoading = false + }).catch(res => { + this.dsLoading = false }) } }, diff --git a/frontend/src/views/dataset/common/DatasetTableData.vue b/frontend/src/views/dataset/common/DatasetTableData.vue index 89b2e73dde..7aabcff676 100644 --- a/frontend/src/views/dataset/common/DatasetTableData.vue +++ b/frontend/src/views/dataset/common/DatasetTableData.vue @@ -1,5 +1,5 @@ - + {{ table.name }} { this.fields = response.data.fields @@ -76,6 +78,9 @@ export default { this.$error(response.data.msg, 3000) } this.$refs.plxTable.reloadData(datas) + this.dataLoading = false + }).catch(res => { + this.dataLoading = false }) } }, diff --git a/frontend/src/views/dataset/data/TabDataPreview.vue b/frontend/src/views/dataset/data/TabDataPreview.vue index 484e140cae..a41a88f5c9 100644 --- a/frontend/src/views/dataset/data/TabDataPreview.vue +++ b/frontend/src/views/dataset/data/TabDataPreview.vue @@ -169,7 +169,7 @@ export default { font-size: 12px; } .span-number{ - color: #f18126; + color: #0a7be0; } .table-count{ color: #606266; diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 6594527978..b2a3865b97 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -8,28 +8,34 @@ - + + - + - {{ $t('panel.view') }} - - + + @@ -42,43 +48,18 @@ - - - - - - - - - - - - - {{ $t('panel.style') }} - - - + - - - - - - - - - - - + + - + - + + + + {{ $t('panel.select_component') }} + +
{{ $t('panel.select_component') }}