From 8c6b60ff1799bb73ddda3fbdcc3f47c22fa5656e Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 24 May 2021 13:46:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AD=97=E6=AE=B5=E5=A4=84=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=BB=99=E5=87=BA=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E2=80=9C=E8=AF=B7=E5=B0=86=E5=B7=A6=E4=BE=A7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=8B=96=E8=87=B3=E6=AD=A4=E5=A4=84=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/Editor/PreviewEject.vue | 2 -- .../src/directive/DataPermission/index.js | 2 -- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + frontend/src/views/panel/edit/index.vue | 4 +--- .../src/views/panel/filter/filterDialog.vue | 23 +++++++++++++++---- .../system/authority/components/LazyTree.vue | 1 - 8 files changed, 22 insertions(+), 13 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/PreviewEject.vue b/frontend/src/components/canvas/components/Editor/PreviewEject.vue index 62787bce27..7fff238442 100644 --- a/frontend/src/components/canvas/components/Editor/PreviewEject.vue +++ b/frontend/src/components/canvas/components/Editor/PreviewEject.vue @@ -79,8 +79,6 @@ export default { }, mounted() { const _this = this - - debugger // 加载数据 _this.restore() const erd = elementResizeDetectorMaker() diff --git a/frontend/src/directive/DataPermission/index.js b/frontend/src/directive/DataPermission/index.js index ff75526c88..d217a40428 100644 --- a/frontend/src/directive/DataPermission/index.js +++ b/frontend/src/directive/DataPermission/index.js @@ -1,8 +1,6 @@ function checkDataPermission(el, binding, vnode) { const dataPermission = vnode.privileges - debugger const { value } = binding - console.log('permission:' + value) // // 数据授权采用并集的方式 部门 角色 用户 有一个有权限即可 // if (value && value instanceof Array) { // const needPermissions = value diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index c26d30d397..118d1fa692 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -815,6 +815,7 @@ export default { input_limit_0_50: '0-50 chars' }, panel: { + drag_here: 'Please drag the left field here', copy_link_passwd: 'Copy link and password', copy_link: 'Copy link', passwd_protect: 'Password Protect', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 227b5ee337..bf73985ab4 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -814,6 +814,7 @@ export default { input_limit_0_50: '0-50字符' }, panel: { + drag_here: '請將左側字段拖至此處', copy_link_passwd: '複製鏈接及密碼', copy_link: '複製鏈接', passwd_protect: '密碼保護', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index b207001c86..a12f580cee 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -816,6 +816,7 @@ export default { input_limit_0_50: '0-50字符' }, panel: { + drag_here: '请将左侧字段拖至此处', copy_link_passwd: '复制链接及密码', copy_link: '复制链接', passwd_protect: '密码保护', diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 7199c8b327..69bef7f6e5 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -255,7 +255,7 @@ export default { this.$router.replace('/panel/index') }, showPanel(type) { - debugger + if (this.showIndex === -1 || this.showIndex === type) { this.$nextTick(() => (this.show = !this.show)) } @@ -270,7 +270,6 @@ export default { // 点击样式按钮 排除 const stick = evt.target.closest('.el-icon-magic-stick') if (!parent && !self && !stick) { - debugger this.show = false window.removeEventListener('click', this.closeSidebar) this.showIndex = -1 @@ -388,7 +387,6 @@ export default { this.openFilterDiolog() }, closeLeftPanel() { - debugger this.show = false // this.beforeDestroy() }, diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue index 1204ffe6c1..e2bcb80fab 100644 --- a/frontend/src/views/panel/filter/filterDialog.vue +++ b/frontend/src/views/panel/filter/filterDialog.vue @@ -120,8 +120,7 @@
- -
字段
+
{{ $t('panel.field') }}
@@ -133,8 +132,8 @@ :move="onMove" style="width:100%;height: 100%;margin:0 10px;border-radius: 4px;overflow-x: auto;display: flex;align-items: center;background-color: white;" @end="end2" - > - + > + @@ -309,7 +308,9 @@ export default { }, methods: { - + attr(){ + return 'aaa' + }, loadViews() { const viewIds = this.componentData .filter(item => item.type === 'view' && item.propValue && item.propValue.viewId) @@ -646,4 +647,16 @@ export default { } } + .list-group:empty, + .list-group > div:empty { + display: inline-block; + width: 100%; + height: calc(100% - 13px); + } + + .list-group:empty:before, + .list-group > div:empty:before { + content: attr(data-value); + } + diff --git a/frontend/src/views/system/authority/components/LazyTree.vue b/frontend/src/views/system/authority/components/LazyTree.vue index d89b4dd1fb..4256803a0c 100644 --- a/frontend/src/views/system/authority/components/LazyTree.vue +++ b/frontend/src/views/system/authority/components/LazyTree.vue @@ -127,7 +127,6 @@ export default { // 初始化授权模板 if (this.showExtent) { authDetailsModel(this.dataInfo.authType).then(res => { - debugger this.defaultAuthDetails = res.data }) this.loadAuth()