forked from github/dataease
feat: 字段处默认给出提示信息“请将左侧字段拖至此处”
This commit is contained in:
parent
054cf38976
commit
8c6b60ff17
@ -79,8 +79,6 @@ export default {
|
|||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
const _this = this
|
const _this = this
|
||||||
|
|
||||||
debugger
|
|
||||||
// 加载数据
|
// 加载数据
|
||||||
_this.restore()
|
_this.restore()
|
||||||
const erd = elementResizeDetectorMaker()
|
const erd = elementResizeDetectorMaker()
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
function checkDataPermission(el, binding, vnode) {
|
function checkDataPermission(el, binding, vnode) {
|
||||||
const dataPermission = vnode.privileges
|
const dataPermission = vnode.privileges
|
||||||
debugger
|
|
||||||
const { value } = binding
|
const { value } = binding
|
||||||
console.log('permission:' + value)
|
|
||||||
// // 数据授权采用并集的方式 部门 角色 用户 有一个有权限即可
|
// // 数据授权采用并集的方式 部门 角色 用户 有一个有权限即可
|
||||||
// if (value && value instanceof Array) {
|
// if (value && value instanceof Array) {
|
||||||
// const needPermissions = value
|
// const needPermissions = value
|
||||||
|
@ -815,6 +815,7 @@ export default {
|
|||||||
input_limit_0_50: '0-50 chars'
|
input_limit_0_50: '0-50 chars'
|
||||||
},
|
},
|
||||||
panel: {
|
panel: {
|
||||||
|
drag_here: 'Please drag the left field here',
|
||||||
copy_link_passwd: 'Copy link and password',
|
copy_link_passwd: 'Copy link and password',
|
||||||
copy_link: 'Copy link',
|
copy_link: 'Copy link',
|
||||||
passwd_protect: 'Password Protect',
|
passwd_protect: 'Password Protect',
|
||||||
|
@ -814,6 +814,7 @@ export default {
|
|||||||
input_limit_0_50: '0-50字符'
|
input_limit_0_50: '0-50字符'
|
||||||
},
|
},
|
||||||
panel: {
|
panel: {
|
||||||
|
drag_here: '請將左側字段拖至此處',
|
||||||
copy_link_passwd: '複製鏈接及密碼',
|
copy_link_passwd: '複製鏈接及密碼',
|
||||||
copy_link: '複製鏈接',
|
copy_link: '複製鏈接',
|
||||||
passwd_protect: '密碼保護',
|
passwd_protect: '密碼保護',
|
||||||
|
@ -816,6 +816,7 @@ export default {
|
|||||||
input_limit_0_50: '0-50字符'
|
input_limit_0_50: '0-50字符'
|
||||||
},
|
},
|
||||||
panel: {
|
panel: {
|
||||||
|
drag_here: '请将左侧字段拖至此处',
|
||||||
copy_link_passwd: '复制链接及密码',
|
copy_link_passwd: '复制链接及密码',
|
||||||
copy_link: '复制链接',
|
copy_link: '复制链接',
|
||||||
passwd_protect: '密码保护',
|
passwd_protect: '密码保护',
|
||||||
|
@ -255,7 +255,7 @@ export default {
|
|||||||
this.$router.replace('/panel/index')
|
this.$router.replace('/panel/index')
|
||||||
},
|
},
|
||||||
showPanel(type) {
|
showPanel(type) {
|
||||||
debugger
|
|
||||||
if (this.showIndex === -1 || this.showIndex === type) {
|
if (this.showIndex === -1 || this.showIndex === type) {
|
||||||
this.$nextTick(() => (this.show = !this.show))
|
this.$nextTick(() => (this.show = !this.show))
|
||||||
}
|
}
|
||||||
@ -270,7 +270,6 @@ export default {
|
|||||||
// 点击样式按钮 排除
|
// 点击样式按钮 排除
|
||||||
const stick = evt.target.closest('.el-icon-magic-stick')
|
const stick = evt.target.closest('.el-icon-magic-stick')
|
||||||
if (!parent && !self && !stick) {
|
if (!parent && !self && !stick) {
|
||||||
debugger
|
|
||||||
this.show = false
|
this.show = false
|
||||||
window.removeEventListener('click', this.closeSidebar)
|
window.removeEventListener('click', this.closeSidebar)
|
||||||
this.showIndex = -1
|
this.showIndex = -1
|
||||||
@ -388,7 +387,6 @@ export default {
|
|||||||
this.openFilterDiolog()
|
this.openFilterDiolog()
|
||||||
},
|
},
|
||||||
closeLeftPanel() {
|
closeLeftPanel() {
|
||||||
debugger
|
|
||||||
this.show = false
|
this.show = false
|
||||||
// this.beforeDestroy()
|
// this.beforeDestroy()
|
||||||
},
|
},
|
||||||
|
@ -120,8 +120,7 @@
|
|||||||
<div class="filter-field">
|
<div class="filter-field">
|
||||||
<div class="field-content">
|
<div class="field-content">
|
||||||
<div class="field-content-left">
|
<div class="field-content-left">
|
||||||
<!-- <div class="field-content-text">{{ $t('panel.field') }} </div> -->
|
<div class="field-content-text">{{ $t('panel.field') }} </div>
|
||||||
<div class="field-content-text">字段</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="field-content-right">
|
<div class="field-content-right">
|
||||||
@ -134,7 +133,7 @@
|
|||||||
style="width:100%;height: 100%;margin:0 10px;border-radius: 4px;overflow-x: auto;display: flex;align-items: center;background-color: white;"
|
style="width:100%;height: 100%;margin:0 10px;border-radius: 4px;overflow-x: auto;display: flex;align-items: center;background-color: white;"
|
||||||
@end="end2"
|
@end="end2"
|
||||||
>
|
>
|
||||||
<transition-group class="draggable-group">
|
<transition-group class="list-group" :data-value="$t('panel.field')">
|
||||||
<drag-item v-for="(item,index) in selectField" :key="item.id" :item="item" :index="index" @closeItem="closeItem" />
|
<drag-item v-for="(item,index) in selectField" :key="item.id" :item="item" :index="index" @closeItem="closeItem" />
|
||||||
</transition-group>
|
</transition-group>
|
||||||
</draggable>
|
</draggable>
|
||||||
@ -309,7 +308,9 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
|
attr(){
|
||||||
|
return 'aaa'
|
||||||
|
},
|
||||||
loadViews() {
|
loadViews() {
|
||||||
const viewIds = this.componentData
|
const viewIds = this.componentData
|
||||||
.filter(item => item.type === 'view' && item.propValue && item.propValue.viewId)
|
.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);
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
@ -127,7 +127,6 @@ export default {
|
|||||||
// 初始化授权模板
|
// 初始化授权模板
|
||||||
if (this.showExtent) {
|
if (this.showExtent) {
|
||||||
authDetailsModel(this.dataInfo.authType).then(res => {
|
authDetailsModel(this.dataInfo.authType).then(res => {
|
||||||
debugger
|
|
||||||
this.defaultAuthDetails = res.data
|
this.defaultAuthDetails = res.data
|
||||||
})
|
})
|
||||||
this.loadAuth()
|
this.loadAuth()
|
||||||
|
Loading…
Reference in New Issue
Block a user