Skip to content

Y
yqlh-dataEase
Commit 39b37a75 by ChenXiHi
Options

Merge branch 'develop' of http://47.108.78.218:28999/frontend/yqlh-dataEase into feature/branch_cxr 

# Conflicts:
#	src/views/chart/components/ChartComponentG2.vue
#	yarn.lock
parents 55249ef4 5438fc4f
正在显示 包含 372 行增加 和 250 行删除
src/App.vue
...@@ -27,7 +27,9 @@ export default { ...@@ -27,7 +27,9 @@ export default {
name: 'App', name: 'App',
components: { PluginCom, PasswordUpdateForm }, components: { PluginCom, PasswordUpdateForm },
computed: { computed: {
...mapState('user', ['passwordModified']) ...mapState('user', [
'passwordModified'
])
}, },
data() { data() {
return { return {
...@@ -43,9 +45,7 @@ export default { ...@@ -43,9 +45,7 @@ export default {
} }
}, },
mounted() { mounted() {
const passwordModified = JSON.parse( const passwordModified = JSON.parse(localStorage.getItem('passwordModified'))
localStorage.getItem('passwordModified')
)
if (typeof passwordModified === 'boolean') { if (typeof passwordModified === 'boolean') {
this.$store.commit('user/SET_PASSWORD_MODIFIED', passwordModified) this.$store.commit('user/SET_PASSWORD_MODIFIED', passwordModified)
} }
......
src/components/asyncComponent/index.vue
...@@ -54,15 +54,13 @@ export default { ...@@ -54,15 +54,13 @@ export default {
// window.SyncComponentCache[this.url] = Axios.get(this.url) // window.SyncComponentCache[this.url] = Axios.get(this.url)
res = await window.SyncComponentCache[this.url] res = await window.SyncComponentCache[this.url]
} else { } else {
this.mode = await window.SyncComponentCache[this.url] res = await window.SyncComponentCache[this.url]
return
} }
if (res) { if (res) {
const Fn = Function const Fn = Function
const dynamicCode = res.data || res const dynamicCode = res.data || res
const component = new Fn(`return ${dynamicCode}`)() const component = new Fn(`return ${dynamicCode}`)()
this.mode = component.default || component this.mode = component.default || component
window.SyncComponentCache[this.url] = this.mode
} }
} }
} }
......
src/components/canvas/customComponent/UserView.vue
...@@ -360,7 +360,7 @@ export default { ...@@ -360,7 +360,7 @@ export default {
computed: { computed: {
// 首次加载且非编辑状态新复制的视图，使用外部filter // 首次加载且非编辑状态新复制的视图，使用外部filter
initLoad() { initLoad() {
return !(this.isEdit && this.currentCanvasNewId.includes(this.element.id)) && this.isFirstLoad return !(this.isEdit && this.currentCanvasNewId.includes(this.element.id)) && this.isFirstLoad && this.canvasId === 'canvas-main'
}, },
scaleCoefficient() { scaleCoefficient() {
if (this.terminal === 'pc' && !this.mobileLayoutStatus) { if (this.terminal === 'pc' && !this.mobileLayoutStatus) {
......
src/components/dragItem/index.vue
...@@ -6,7 +6,16 @@ ...@@ -6,7 +6,16 @@
class="item-axis" class="item-axis"
@close="removeItem" @close="removeItem"
> >
{{ item.name }} <el-tooltip
v-if="toolTip"
class="item"
effect="dark"
:content="toolTip || item.name"
placement="top"
>
<span>{{ item.name }}</span>
</el-tooltip>
<span v-else>{{ item.name }}</span>
</el-tag> </el-tag>
</span> </span>
</template> </template>
...@@ -22,6 +31,11 @@ export default { ...@@ -22,6 +31,11 @@ export default {
index: { index: {
type: Number, type: Number,
required: true required: true
},
toolTip: {
type: String,
required: false,
default: ''
} }
}, },
......
src/components/elTreeSelect/index.vue
...@@ -410,7 +410,7 @@ export default { ...@@ -410,7 +410,7 @@ export default {
}, },
_filterFun(value, data, node) { _filterFun(value, data, node) {
if (!value) return true if (!value) return true
return data[this.propsLabel].indexOf(value) !== -1 return data[this.propsLabel?.toLocaleUpperCase()].indexOf(value.toLocaleUpperCase()) !== -1
}, },
_treeNodeClickFun(data, node, vm) { _treeNodeClickFun(data, node, vm) {
const { multiple } = this.selectParams const { multiple } = this.selectParams
......
src/components/elVisualSelect/index.vue
...@@ -121,7 +121,7 @@ export default { ...@@ -121,7 +121,7 @@ export default {
}, },
keyWord(val, old) { keyWord(val, old) {
if (val === old) return if (val === old) return
const results = val ? this.list.filter(item => item.text.includes(val)) : null const results = val ? this.vagueFilter(val, this.list) : null
this.resetList(results) this.resetList(results)
this.reCacularHeight() this.reCacularHeight()
this.$nextTick(() => { this.$nextTick(() => {
...@@ -136,6 +136,11 @@ export default { ...@@ -136,6 +136,11 @@ export default {
}) })
}, },
methods: { methods: {
vagueFilter(val, nodes) {
if (!val || !val.trim()) return nodes
const results = nodes.filter(item => item.text?.toLocaleUpperCase().includes(val.toLocaleUpperCase()))
return results
},
resetSelectAll() { resetSelectAll() {
this.selectAll = false this.selectAll = false
}, },
...@@ -148,7 +153,7 @@ export default { ...@@ -148,7 +153,7 @@ export default {
selectAllChange(val) { selectAllChange(val) {
let vals = val ? [...this.list.map(ele => ele.id)] : [] let vals = val ? [...this.list.map(ele => ele.id)] : []
if (this.keyWord.trim() && val) { if (this.keyWord.trim() && val) {
vals = this.list.filter(item => item.text.includes(this.keyWord.trim())).map(ele => ele.id) vals = this.vagueFilter(this.keyWord.trim(), this.list).map(ele => ele.id)
} }
this.visualChange(vals) this.visualChange(vals)
this.selectValue = vals this.selectValue = vals
...@@ -233,14 +238,14 @@ export default { ...@@ -233,14 +238,14 @@ export default {
isAllSelect() { isAllSelect() {
let vals = this.list.length let vals = this.list.length
if (this.keyWord.trim()) { if (this.keyWord.trim()) {
vals = this.list.filter(item => item.text.includes(this.keyWord.trim())).map(ele => ele.id).filter(ele => this.selectValue.includes(ele)).length vals = this.vagueFilter(this.keyWord.trim(), this.list).map(ele => ele.id).filter(ele => this.selectValue.includes(ele)).length
} }
return vals return vals
}, },
halfSelect() { halfSelect() {
let vals = this.list.length let vals = this.list.length
if (this.keyWord.trim()) { if (this.keyWord.trim()) {
vals = this.list.filter(item => item.text.includes(this.keyWord.trim())).map(ele => ele.id).length vals = this.vagueFilter(this.keyWord.trim(), this.list).map(ele => ele.id).length
} }
return vals return vals
}, },
......
src/components/widget/deWidget/DeSelectGrid.vue
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
v-model="value" v-model="value"
@change="handleCheckedChange" @change="handleCheckedChange"
> >
<template v-for="item in data.filter(node => !keyWord || (node.id && node.id.includes(keyWord)))"> <template v-for="item in data.filter(node => !keyWord || (node.id && node.id.toLocaleUpperCase().includes(keyWord.toLocaleUpperCase())))">
<el-checkbox <el-checkbox
:key="item.id" :key="item.id"
:label="item.id" :label="item.id"
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
@change="changeRadioBox" @change="changeRadioBox"
> >
<el-radio <el-radio
v-for="(item, index) in data.filter(node => !keyWord || (node.id && node.id.includes(keyWord)))" v-for="(item, index) in data.filter(node => !keyWord || (node.id && node.id.toLocaleUpperCase().includes(keyWord.toLocaleUpperCase())))"
:key="index" :key="index"
:label="item.id" :label="item.id"
@click.native.prevent="testChange(item)" @click.native.prevent="testChange(item)"
......
src/components/widget/deWidget/DeSelectTree.vue
...@@ -381,7 +381,7 @@ export default { ...@@ -381,7 +381,7 @@ export default {
_filterFun(value, data, node) { _filterFun(value, data, node) {
if (!value) return true if (!value) return true
return data.id.toString().indexOf(value.toString()) !== -1 return data.id.toString().toLocaleUpperCase().indexOf(value.toString().toLocaleUpperCase()) !== -1
}, },
// 树点击 // 树点击
_nodeClickFun(data, node, vm) { _nodeClickFun(data, node, vm) {
......
src/icons/svg/city-brightness.svg
<svg t="1689841433435" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5685" width="200" height="200"><path d="M290.773333 213.333333v85.333334H426.666667v512H149.333333V213.333333h141.44m42.666667-42.666666H106.666667v682.666666h362.666666V256h-135.893333V170.666667z" p-id="5686"></path><path d="M661.333333 384v426.666667h-192V384h192m42.666667-42.666667H426.666667v512h277.333333V341.333333z" p-id="5687"></path><path d="M768 298.666667v128h106.666667v384h-170.666667V298.666667h64m42.666667-42.666667h-149.333334v597.333333h256V384h-106.666666v-128z" p-id="5688"></path><path d="M85.333333 810.666667h853.333334v42.666666H85.333333zM234.666667 384h106.666666v42.666667h-106.666666zM234.666667 533.333333h106.666666v42.666667h-106.666666zM234.666667 682.666667h106.666666v42.666666h-106.666666zM533.333333 512h64v42.666667h-64zM533.333333 640h64v42.666667h-64zM768 533.333333h42.666667v42.666667h-42.666667zM768 661.333333h42.666667v42.666667h-42.666667z" p-id="5689"></path></svg> <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1690265919057" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14240" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M491.52 76.8h37.888v111.616l53.76 66.56 74.24 91.648h-296.96l74.24-91.648 56.32-69.632V76.8h0.512zM289.792 886.272h59.392V382.464h323.072v504.32h57.856V486.4H870.4v399.872h93.184V957.44H83.456V353.792l206.336 118.272v414.208z m231.936-143.36V798.72h44.544v-55.808h-44.544z m-409.6-84.992v33.792h27.136v-33.792h-27.136z m130.048 59.392v33.792h27.136v-33.792h-27.136z m0-119.808v33.792h27.136v-33.792h-27.136z m0-59.392v33.792h27.136v-33.792h-27.136z m-43.008 119.808v33.792h27.136v-33.792h-27.136z m0-119.808v33.792h27.136v-33.792h-27.136z m-44.544 119.808v33.792h27.136v-33.792h-27.136z m0 59.392v33.792h27.136v-33.792h-27.136z m0-119.808v33.792h27.136v-33.792h-27.136z m-42.496-59.392v33.792h27.136v-33.792h-27.136z m642.048 130.048v41.984h33.792v-41.984h-33.792z m0 73.216v41.984h33.792v-41.984h-33.792z m0-222.208v41.984h33.792v-41.984h-33.792z m52.736 73.216v41.984h33.28v-41.984h-33.28z m0-73.216v41.984h33.28v-41.984h-33.28z m-421.376 223.744V798.72H430.08v-55.808h-44.544z m0-198.656v55.808H430.08v-55.808h-44.544z m203.264 0v55.808h44.544v-55.808H588.8z m-67.072 0v55.808h44.544v-55.808h-44.544z m-67.072 0v55.808h44.544v-55.808h-44.544zM385.536 446.464v55.808H430.08V446.464h-44.544z m203.264 0v55.808h44.544V446.464H588.8z m-67.072 0v55.808h44.544V446.464h-44.544zM385.536 645.12v55.808H430.08V645.12h-44.544z m203.264 0v55.808h44.544V645.12H588.8z" fill="#2c2c2c" p-id="14241"></path></svg>
src/icons/svg/city-sweep.svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1690265990298" class="icon" viewBox="0 0 1038 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16350" xmlns:xlink="http://www.w3.org/1999/xlink" width="202.734375" height="200"><path d="M522.666667 0c282.766222 0 512 229.233778 512 512s-229.233778 512-512 512-512-229.233778-512-512 229.233778-512 512-512z m-35.029334 213.333333h-126.791111a14.222222 14.222222 0 0 0-14.222222 14.222223v47.018666H312.888889a28.444444 28.444444 0 0 0-28.444445 28.444445V782.222222a28.444444 28.444444 0 0 0 28.444445 28.444445h426.666667a28.444444 28.444444 0 0 0 28.444444-28.444445V471.893333a28.444444 28.444444 0 0 0-19.555556-27.022222l-125.013333-41.173333a14.222222 14.222222 0 0 0-18.673778 13.511111v299.52a13.240889 13.240889 0 1 1-26.481777 0V303.004444a28.444444 28.444444 0 0 0-28.444445-28.444444h-33.749333V241.777778a28.444444 28.444444 0 0 0-28.444445-28.444445z m232.945778 407.352889v60.373334h-68.408889v-60.373334h68.408889z m-230.926222 0v60.373334h-116.593778v-60.373334h116.593778z m230.926222-126.663111v60.387556h-68.408889v-60.387556h68.408889z m-230.926222 0v60.387556h-116.593778v-60.387556h116.593778z m0-126.663111v60.387556h-116.593778V367.36h116.593778z" fill="#2c2c2c" p-id="16351"></path></svg>
src/lang/en.js
...@@ -626,7 +626,8 @@ export default { ...@@ -626,7 +626,8 @@ export default {
status: 'Authorization status', status: 'Authorization status',
valid: 'Valid', valid: 'Valid',
invalid: 'Invalid', invalid: 'Invalid',
expired: 'Expired' expired: 'Expired',
expired_msg: 'license has expired since {0}. It is recommended to update the license, which does not affect the use of enterprise version functions'
}, },
member: { member: {
create: 'Add members', create: 'Add members',
...@@ -1533,6 +1534,7 @@ export default { ...@@ -1533,6 +1534,7 @@ export default {
no_function: 'Function not enter，please input.', no_function: 'Function not enter，please input.',
chart_flow_map: 'Flow Map', chart_flow_map: 'Flow Map',
chart_city_brightness_map: 'City Brightness Map', chart_city_brightness_map: 'City Brightness Map',
chart_city_sweep_map: 'City Sweep Map',
start_point: 'Start point(Lat/Long)', start_point: 'Start point(Lat/Long)',
end_point: 'End point(Lat/Long)', end_point: 'End point(Lat/Long)',
line: 'Line', line: 'Line',
......
src/lang/tw.js
...@@ -626,7 +626,8 @@ export default { ...@@ -626,7 +626,8 @@ export default {
status: '授權狀態', status: '授權狀態',
valid: '有效', valid: '有效',
invalid: '無效', invalid: '無效',
expired: '已過期' expired: '已過期',
expired_msg: 'License已過期，過期時間：{0}，為了不影響企業版功能的使用，建議您更新License'
}, },
member: { member: {
create: '添加成員', create: '添加成員',
...@@ -1526,6 +1527,7 @@ export default { ...@@ -1526,6 +1527,7 @@ export default {
no_function: '函數尚未支持直接引用，請在字段表達式中手動輸入。', no_function: '函數尚未支持直接引用，請在字段表達式中手動輸入。',
chart_flow_map: '流向地圖', chart_flow_map: '流向地圖',
chart_city_brightness_map: '城市亮度圖', chart_city_brightness_map: '城市亮度圖',
chart_city_sweep_map: '圓形掃光城市',
start_point: '起點經緯度', start_point: '起點經緯度',
end_point: '終點經緯度', end_point: '終點經緯度',
line: '線條', line: '線條',
......
src/lang/zh.js
...@@ -625,7 +625,8 @@ export default { ...@@ -625,7 +625,8 @@ export default {
status: '授权状态', status: '授权状态',
valid: '有效', valid: '有效',
invalid: '无效', invalid: '无效',
expired: '已过期' expired: '已过期',
expired_msg: 'License已过期，过期时间：{0}，为了不影响企业版功能的使用，建议您更新License'
}, },
member: { member: {
create: '添加成员', create: '添加成员',
...@@ -1178,7 +1179,7 @@ export default { ...@@ -1178,7 +1179,7 @@ export default {
chart_pie_rose: '南丁格尔玫瑰图', chart_pie_rose: '南丁格尔玫瑰图',
chart_pie_donut_rose: '南丁格尔玫瑰环形图', chart_pie_donut_rose: '南丁格尔玫瑰环形图',
chart_funnel: '漏斗图', chart_funnel: '漏斗图',
chart_sankey:'桑基图', chart_sankey: '桑基图',
chart_radar: '雷达图', chart_radar: '雷达图',
chart_gauge: '仪表盘', chart_gauge: '仪表盘',
chart_map: '地图', chart_map: '地图',
...@@ -1559,7 +1560,8 @@ export default { ...@@ -1559,7 +1560,8 @@ export default {
map_line_color_target_color: '结束颜色', map_line_color_target_color: '结束颜色',
map_line_theta_offset: '弧度', map_line_theta_offset: '弧度',
chart_bubble_map: '气泡地图', chart_bubble_map: '气泡地图',
chart_city_brightness_map: '城市亮度图' chart_city_brightness_map: '城市亮度图',
chart_city_sweep_map: '圆形扫光城市'
}, },
dataset: { dataset: {
scope_edit: '仅编辑时生效', scope_edit: '仅编辑时生效',
......
src/layout/components/Licbar.vue
<template> <template>
<div <div
v-if="!licValidate && licStatus !== 'no_record'" v-if="!licValidate && licStatus !== 'no_record' && !tipClosed"
class="lic" class="lic_tips"
> >
<strong>{{ $t(licMsg) }}</strong> <el-alert
class="lic_alert"
:title="$t(licMsg)"
type="warning"
show-icon
center
@close="closeTip"
/>
</div> </div>
</template> </template>
...@@ -20,9 +29,7 @@ export default { ...@@ -20,9 +29,7 @@ export default {
} }
}, },
computed: { computed: {
/* theme() {
return this.$store.state.settings.theme
}, */
licValidate() { licValidate() {
return this.$store.state.lic.validate return this.$store.state.lic.validate
}, },
...@@ -30,40 +37,40 @@ export default { ...@@ -30,40 +37,40 @@ export default {
return this.$store.state.lic.licStatus || '' return this.$store.state.lic.licStatus || ''
}, },
licMsg() { licMsg() {
if (this.$store.state.lic?.licMsg?.includes('expired')) {
const message = this.$store.state.lic.licMsg
const exp = message.substring(message.indexOf('since ') + 6, message.indexOf(','))
return this.$t('license.expired_msg').replace('{0}', exp)
}
return this.$store.state.lic.licMsg ? ('license.' + this.$store.state.lic.licMsg) : null return this.$store.state.lic.licMsg ? ('license.' + this.$store.state.lic.licMsg) : null
},
tipClosed() {
return localStorage.getItem('lic_closed')
} }
}, },
mounted() { mounted() {
// this.validate()
}, },
methods: { methods: {
// validate() { closeTip() {
// validateLic().then(res => { localStorage.setItem('lic_closed', true)
// this.lic = true }
// this.$store.dispatch('lic/setValidate', true)
// }).catch((e) => {
// this.msg = e.response.data.message
// this.lic = false
// this.$store.dispatch('lic/setValidate', false)
// })
// }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.lic_tips {
.lic { position: absolute;
height: 24px; z-index: 2000;
background-color: #c92100; position:absolute;
color: #fff; top: 0;left:0;right:0;
text-align: center; margin: auto;
/* padding: 6px 11px; */ }
position: fixed; .lic_alert ::v-deep .el-icon-close{
z-index: 1002; top: 16px !important;
top: 0; right: 10px !important;
width: 100%; }
}
</style> </style>
src/layout/components/Topbar.vue
...@@ -281,7 +281,7 @@ export default { ...@@ -281,7 +281,7 @@ export default {
unloadHandler(e) { unloadHandler(e) {
this.gap_time = new Date().getTime() - this.beforeUnload_time this.gap_time = new Date().getTime() - this.beforeUnload_time
if (this.gap_time <= 5) { if (this.gap_time <= 5) {
this.logout().then(res => {}) // this.logout().then(res => {})
} }
}, },
......
src/main.js
...@@ -76,8 +76,8 @@ Vue.use(Vuetify) ...@@ -76,8 +76,8 @@ Vue.use(Vuetify)
* please remove it before going online ! ! ! * please remove it before going online ! ! !
*/ */
if (process.env.NODE_ENV === 'production') { if (process.env.NODE_ENV === 'production') {
// const { mockXHR } = require('../mock') // const { mockXHR } = require('../mock')
// mockXHR() // mockXHR()
} }
// set ElementUI lang to EN // set ElementUI lang to EN
...@@ -124,7 +124,7 @@ Vue.prototype.hasDataPermission = function(pTarget, pSource) { ...@@ -124,7 +124,7 @@ Vue.prototype.hasDataPermission = function(pTarget, pSource) {
Vue.prototype.checkPermission = function(pers) { Vue.prototype.checkPermission = function(pers) {
const permissions = store.getters.permissions const permissions = store.getters.permissions
const hasPermission = pers.every((needP) => { const hasPermission = pers.every(needP => {
const result = permissions.includes(needP) const result = permissions.includes(needP)
return result return result
}) })
...@@ -137,21 +137,18 @@ Vue.prototype.$cancelRequest = function(cancelkey) { ...@@ -137,21 +137,18 @@ Vue.prototype.$cancelRequest = function(cancelkey) {
if (cancelkey) { if (cancelkey) {
if (cancelkey.indexOf('/**') > -1) { if (cancelkey.indexOf('/**') > -1) {
Vue.prototype.$currentHttpRequestList.forEach((item, key) => { Vue.prototype.$currentHttpRequestList.forEach((item, key) => {
key.indexOf(cancelkey.split('/**')[0]) > -1 && key.indexOf(cancelkey.split('/**')[0]) > -1 && item('Operation canceled by the user.')
item('Operation canceled by the user.')
}) })
} else { } else {
Vue.prototype.$currentHttpRequestList.get(cancelkey) && Vue.prototype.$currentHttpRequestList.get(cancelkey) && Vue.prototype.$currentHttpRequestList.get(cancelkey)('Operation canceled by the user.')
Vue.prototype.$currentHttpRequestList.get(cancelkey)(
'Operation canceled by the user.'
)
} }
} }
} }
new Vue({ new Vue({
router, router,
store, store,
i18n, i18n,
render: (h) => h(App) render: h => h(App)
}).$mount('#app') }).$mount('#app')
src/permission.js
...@@ -3,49 +3,51 @@ import store from './store' ...@@ -3,49 +3,51 @@ import store from './store'
// import { Message } from 'element-ui' // import { Message } from 'element-ui'
import NProgress from 'nprogress' // progress bar import NProgress from 'nprogress' // progress bar
import 'nprogress/nprogress.css' // progress bar style import 'nprogress/nprogress.css' // progress bar style
import { getToken } from '@/utils/auth' // get token from cookie import {
getToken
} from '@/utils/auth' // get token from cookie
import getPageTitle from '@/utils/get-page-title' import getPageTitle from '@/utils/get-page-title'
import { buildMenus } from '@/api/system/menu' import {
import { filterAsyncRouter } from '@/store/modules/permission' buildMenus
import { isMobile, changeFavicon } from '@/utils/index' } from '@/api/system/menu'
import {
filterAsyncRouter
} from '@/store/modules/permission'
import {
isMobile,
changeFavicon
} from '@/utils/index'
import Layout from '@/layout/index' import Layout from '@/layout/index'
import { getSysUI } from '@/utils/auth' import {
getSysUI
} from '@/utils/auth'
import { getSocket } from '@/websocket' import {
getSocket
} from '@/websocket'
NProgress.configure({ NProgress.configure({
showSpinner: false showSpinner: false
}) // NProgress Configuration }) // NProgress Configuration
const whiteList = [ const whiteList = ['/login', '/401', '/404', '/delink', '/nolic', '/de-auto-login'] // no redirect whitelist
'/login',
'/401',
'/404',
'/delink',
'/nolic',
'/de-auto-login'
] // no redirect whitelist
const routeBefore = (callBack) => { const routeBefore = (callBack) => {
let uiInfo = getSysUI() let uiInfo = getSysUI()
if (!uiInfo || Object.keys(uiInfo).length === 0) { if (!uiInfo || Object.keys(uiInfo).length === 0) {
store store.dispatch('user/getUI').then(() => {
.dispatch('user/getUI') document.title = getPageTitle()
.then(() => { uiInfo = getSysUI()
document.title = getPageTitle() if (uiInfo['ui.favicon'] && uiInfo['ui.favicon'].paramValue) {
uiInfo = getSysUI() const faviconUrl = '/system/ui/image/' + uiInfo['ui.favicon'].paramValue
if (uiInfo['ui.favicon'] && uiInfo['ui.favicon'].paramValue) { changeFavicon(faviconUrl)
const faviconUrl = }
'/system/ui/image/' + uiInfo['ui.favicon'].paramValue callBack()
changeFavicon(faviconUrl) }).catch(err => {
} document.title = getPageTitle()
callBack() console.error(err)
}) callBack()
.catch((err) => { })
document.title = getPageTitle()
console.error(err)
callBack()
})
} else { } else {
document.title = getPageTitle() document.title = getPageTitle()
if (!!uiInfo && uiInfo['ui.favicon'] && uiInfo['ui.favicon'].paramValue) { if (!!uiInfo && uiInfo['ui.favicon'] && uiInfo['ui.favicon'].paramValue) {
...@@ -55,120 +57,97 @@ const routeBefore = (callBack) => { ...@@ -55,120 +57,97 @@ const routeBefore = (callBack) => {
callBack() callBack()
} }
} }
router.beforeEach(async(to, from, next) => router.beforeEach(async (to, from, next) => routeBefore(() => {
routeBefore(() => { // start progress bar
// start progress bar NProgress.start()
NProgress.start() const mobileIgnores = ['/delink', '/de-auto-login']
const mobileIgnores = ['/delink', '/de-auto-login'] const mobilePreview = '/preview/'
const mobilePreview = '/preview/' const hasToken = getToken()
const hasToken = getToken()
if ( if (isMobile() && !to.path.includes(mobilePreview) && mobileIgnores.indexOf(to.path) === -1) {
isMobile() && let urlSuffix = '/app.html'
!to.path.includes(mobilePreview) && if (hasToken) {
mobileIgnores.indexOf(to.path) === -1 urlSuffix += ('?detoken=' + hasToken)
) {
let urlSuffix = '/app.html'
if (hasToken) {
urlSuffix += '?detoken=' + hasToken
}
localStorage.removeItem('user-info')
localStorage.removeItem('userId')
localStorage.removeItem('Authorization')
window.location.href = window.origin + urlSuffix
NProgress.done()
} }
localStorage.removeItem('user-info')
localStorage.removeItem('userId')
localStorage.removeItem('Authorization')
window.location.href = window.origin + urlSuffix
NProgress.done()
}
// set page title // set page title
document.title = getPageTitle(to.meta.title) document.title = getPageTitle(to.meta.title)
// determine whether the user has logged in // determine whether the user has logged in
if (hasToken) {
if (to.path === '/login') { if (hasToken) {
// if is logged in, redirect to the home page if (to.path === '/login') {
next({ // if is logged in, redirect to the home page
path: '/' next({
}) path: '/'
NProgress.done() })
NProgress.done()
} else {
const hasGetUserInfo = store.getters.name
if (hasGetUserInfo || to.path.indexOf('/previewScreenShot/') > -1 || to.path.indexOf('/preview/') > -1 || to.path.indexOf('/delink') > -1 || to.path.indexOf('/nolic') > -1) {
next()
store.dispatch('permission/setCurrentPath', to.path)
let route = store.getters.permission_routes.find(
item => item.path === '/' + to.path.split('/')[1]
)
// 如果找不到这个路由，说明是首页
if (!route) {
route = store.getters.permission_routes.find(item => item.path === '/')
}
store.commit('permission/SET_CURRENT_ROUTES', route)
if (['system'].includes(route.name)) {
store.dispatch('app/toggleSideBarHide', false)
}
} else { } else {
const hasGetUserInfo = store.getters.name if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
if ( // get user info
hasGetUserInfo || store.dispatch('user/getInfo').then(() => {
to.path.indexOf('/previewScreenShot/') > -1 || const deWebsocket = getSocket()
to.path.indexOf('/preview/') > -1 || deWebsocket && deWebsocket.reconnect && deWebsocket.reconnect()
to.path.indexOf('/delink') > -1 || store.dispatch('lic/getLicInfo').then(() => {
to.path.indexOf('/nolic') > -1 loadMenus(next, to)
) { }).catch(() => {
next() loadMenus(next, to)
store.dispatch('permission/setCurrentPath', to.path) })
let route = store.getters.permission_routes.find( }).catch(() => {
(item) => item.path === '/' + to.path.split('/')[1] store.dispatch('user/logout').then(() => {
) location.reload() // 为了重新实例化vue-router对象 避免bug
// 如果找不到这个路由，说明是首页 })
if (!route) { })
route = store.getters.permission_routes.find( } else if (store.getters.loadMenus) {
(item) => item.path === '/' // 修改成false，防止死循环
) store.dispatch('user/updateLoadMenus')
} store.dispatch('lic/getLicInfo').then(() => {
store.commit('permission/SET_CURRENT_ROUTES', route) loadMenus(next, to)
if (['system'].includes(route.name)) { }).catch(() => {
store.dispatch('app/toggleSideBarHide', false) loadMenus(next, to)
} })
} else { } else {
if (store.getters.roles.length === 0) { next()
// 判断当前用户是否已拉取完user_info信息
// get user info
store
.dispatch('user/getInfo')
.then(() => {
const deWebsocket = getSocket()
deWebsocket && deWebsocket.reconnect && deWebsocket.reconnect()
store
.dispatch('lic/getLicInfo')
.then(() => {
loadMenus(next, to)
})
.catch(() => {
loadMenus(next, to)
})
})
.catch(() => {
store.dispatch('user/logout').then(() => {
location.reload() // 为了重新实例化vue-router对象 避免bug
})
})
} else if (store.getters.loadMenus) {
// 修改成false，防止死循环
store.dispatch('user/updateLoadMenus')
store
.dispatch('lic/getLicInfo')
.then(() => {
loadMenus(next, to)
})
.catch(() => {
loadMenus(next, to)
})
} else {
next()
}
} }
} }
} else { }
/* has no token*/ } else {
/* has no token*/
if (whiteList.indexOf(to.path) !== -1) { if (whiteList.indexOf(to.path) !== -1) {
// in the free login whitelist, go directly // in the free login whitelist, go directly
next() next()
} else { } else {
// other pages that do not have permission to access are redirected to the login page. // other pages that do not have permission to access are redirected to the login page.
next(`/login?redirect=${to.fullPath}`) next(`/login?redirect=${to.fullPath}`)
NProgress.done() NProgress.done()
}
} }
}) }
) }))
export const loadMenus = (next, to) => { export const loadMenus = (next, to) => {
buildMenus().then((res) => { buildMenus().then(res => {
const data = res.data const data = res.data
const filterData = filterRouter(data) const filterData = filterRouter(data)
const asyncRouter = filterAsyncRouter(filterData) const asyncRouter = filterAsyncRouter(filterData)
...@@ -194,8 +173,7 @@ export const loadMenus = (next, to) => { ...@@ -194,8 +173,7 @@ export const loadMenus = (next, to) => {
redirect: '/404', redirect: '/404',
hidden: true hidden: true
}) })
store.dispatch('permission/GenerateRoutes', asyncRouter).then(() => { store.dispatch('permission/GenerateRoutes', asyncRouter).then(() => { // 存储路由
// 存储路由
router.addRoutes(asyncRouter) router.addRoutes(asyncRouter)
if (pathValid(to.path, asyncRouter)) { if (pathValid(to.path, asyncRouter)) {
next({ next({
...@@ -234,9 +212,9 @@ const pathValid = (path, routers) => { ...@@ -234,9 +212,9 @@ const pathValid = (path, routers) => {
const hasCurrentRouter = (locations, routers, index) => { const hasCurrentRouter = (locations, routers, index) => {
const location = locations[index] const location = locations[index]
let kids = [] let kids = []
const isvalid = routers.some((router) => { const isvalid = routers.some(router => {
kids = router.children kids = router.children
return router.path === location || '/' + location === router.path return (router.path === location || ('/' + location) === router.path)
}) })
if (isvalid && index < locations.length - 1) { if (isvalid && index < locations.length - 1) {
return hasCurrentRouter(locations, kids, index + 1) return hasCurrentRouter(locations, kids, index + 1)
...@@ -244,16 +222,14 @@ const hasCurrentRouter = (locations, routers, index) => { ...@@ -244,16 +222,14 @@ const hasCurrentRouter = (locations, routers, index) => {
return isvalid return isvalid
} }
// 根据权限过滤菜单 // 根据权限过滤菜单
const filterRouter = (routers) => { const filterRouter = routers => {
const user_permissions = store.getters.permissions const user_permissions = store.getters.permissions
// if (!user_permissions || user_permissions.length === 0) { // if (!user_permissions || user_permissions.length === 0) {
// return routers // return routers
// } // }
const tempResults = routers.filter((router) => const tempResults = routers.filter(router => hasPermission(router, user_permissions))
hasPermission(router, user_permissions)
)
// 如果是一级菜单(目录) 没有字菜单 那就移除 // 如果是一级菜单(目录) 没有字菜单 那就移除
return tempResults.filter((item) => { return tempResults.filter(item => {
if (item.type === 0 && (!item.children || item.children.length === 0)) { if (item.type === 0 && (!item.children || item.children.length === 0)) {
return false return false
} }
...@@ -264,16 +240,13 @@ const hasPermission = (router, user_permissions) => { ...@@ -264,16 +240,13 @@ const hasPermission = (router, user_permissions) => {
// 判断是否有符合权限 eg. user:read,user:delete // 判断是否有符合权限 eg. user:read,user:delete
if (router.permission && router.permission.indexOf(',') > -1) { if (router.permission && router.permission.indexOf(',') > -1) {
const permissions = router.permission.split(',') const permissions = router.permission.split(',')
const permissionsFilter = permissions.filter((permission) => { const permissionsFilter = permissions.filter(permission => {
return user_permissions.includes(permission) return user_permissions.includes(permission)
}) })
if (!permissionsFilter || permissionsFilter.length === 0) { if (!permissionsFilter || permissionsFilter.length === 0) {
return false return false
} }
} else if ( } else if (router.permission && !user_permissions.includes(router.permission)) {
router.permission &&
!user_permissions.includes(router.permission)
) {
// 菜单要求权限 但是当前用户权限没有包含菜单权限 // 菜单要求权限 但是当前用户权限没有包含菜单权限
return false return false
} }
...@@ -283,9 +256,7 @@ const hasPermission = (router, user_permissions) => { ...@@ -283,9 +256,7 @@ const hasPermission = (router, user_permissions) => {
} }
// 如果有字菜单 则 判断是否满足 ‘任意一个子菜单有权限’ // 如果有字菜单 则 判断是否满足 ‘任意一个子菜单有权限’
if (router.children && router.children.length) { if (router.children && router.children.length) {
const permissionChildren = router.children.filter((item) => const permissionChildren = router.children.filter(item => hasPermission(item, user_permissions))
hasPermission(item, user_permissions)
)
router.children = permissionChildren router.children = permissionChildren
return router.children.length > 0 return router.children.length > 0
} }
......
src/views/chart/chart/cityBrightness/cityBrightness_antv.js
...@@ -29,11 +29,13 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action ...@@ -29,11 +29,13 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action
lang: lang, lang: lang,
pitch: size.mapPitch, pitch: size.mapPitch,
// pitch: 64.88, // 地图倾角 // pitch: 64.88, // 地图倾角
style: mapStyle style: mapStyle,
// style: 'dark' // style: 'dark'
// center: [116.41667, 39.91667], // 地图中心经纬度-北京 // center: [116.41667, 39.91667], // 地图中心经纬度-北京
// zoom: 10, zoom: 12,
// maxZoom: 20 // maxZoom: 20
center: [114.060288, 22.53684] // 数据集是深圳市区的点，中心先设为深圳
// center: [104.58631, 30.71882] // 成阿中心经纬度
}), }),
logoVisible: false logoVisible: false
}) })
...@@ -44,7 +46,7 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action ...@@ -44,7 +46,7 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action
chartDom.setMapStyle(mapStyle) chartDom.setMapStyle(mapStyle)
} }
} }
if (xAxis?.length < 1 || yAxis?.lang < 1) { if (xAxis?.length < 2 || yAxis?.length < 1) {
chartDom.removeAllLayer() chartDom.removeAllLayer()
return chartDom return chartDom
} }
...@@ -65,23 +67,25 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action ...@@ -65,23 +67,25 @@ export function baseCityBrightnessMapOptionAntV(chartDom, chartId, chart, action
}) })
const mapData = { type: 'FeatureCollection', features: newTableRow } const mapData = { type: 'FeatureCollection', features: newTableRow }
// console.log('mapData', mapData) // console.log('mapData', mapData)
chartDom.removeAllLayer() chartDom.removeAllLayer()
.then(() => { .then(() => {
const pointLayer = new PointLayer({}) const pointLayer = new PointLayer({})
.source(mapData) .source(mapData)
.size(2) .size(2)
.color('h8', [ .color('h8', color?.colors)
'#0A3663', // .color('h8', [
'#1558AC', // '#0A3663',
'#3771D9', // '#1558AC',
'#4D89E5', // '#3771D9',
'#64A5D3', // '#4D89E5',
'#72BED6', // '#64A5D3',
'#83CED6', // '#72BED6',
'#A6E1E0', // '#83CED6',
'#B8EFE2', // '#A6E1E0',
'#D7F9F0' // '#B8EFE2',
]) // '#D7F9F0'
// ])
if (!init) { if (!init) {
chartDom.addLayer(pointLayer) chartDom.addLayer(pointLayer)
} }
......
src/views/chart/chart/citySweep/citySweep_antv.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/chart/chart/util.js
...@@ -2076,7 +2076,40 @@ export const TYPE_CONFIGS = [ ...@@ -2076,7 +2076,40 @@ export const TYPE_CONFIGS = [
] ]
} }
}, },
// 圆形城市扫光图
{
render: 'antv',
category: 'chart.chart_type_space',
value: 'city-sweep',
title: 'chart.chart_city_sweep_map',
icon: 'city-sweep',
properties: [
'color-selector',
'size-selector-ant-v',
'title-selector-ant-v'
],
propertyInner: {
'color-selector': [
'mapStyle'
],
'size-selector-ant-v': [
'mapPitch'
],
'title-selector-ant-v': [
'show',
'title',
'fontSize',
'color',
'hPosition',
'isItalic',
'isBolder',
'remarkShow',
'fontFamily',
'letterSpace',
'fontShadow'
]
}
},
// 城市亮度图 // 城市亮度图
{ {
render: 'antv', render: 'antv',
...@@ -2091,7 +2124,9 @@ export const TYPE_CONFIGS = [ ...@@ -2091,7 +2124,9 @@ export const TYPE_CONFIGS = [
], ],
propertyInner: { propertyInner: {
'color-selector': [ 'color-selector': [
'mapStyle' 'mapStyle',
'value',
'gradient-color'
], ],
'size-selector-ant-v': [ 'size-selector-ant-v': [
'mapPitch' 'mapPitch'
......
src/views/chart/components/ChartComponent.vue
...@@ -481,9 +481,11 @@ export default { ...@@ -481,9 +481,11 @@ export default {
trackClick(trackAction) { trackClick(trackAction) {
const param = this.pointParam const param = this.pointParam
if (!param || !param.data || !param.data.dimensionList) { if (!param || !param.data || !param.data.dimensionList) {
// 地图提示没有关联字段 其他没有维度信息的 直接返回
if (this.chart.type === 'map') { if (this.chart.type === 'map') {
this.$warning(this.$t('panel.no_drill_field')) const zoom = this.myChart.getOption().geo[0].zoom
if (zoom <= 1) {
this.$warning(this.$t('panel.no_drill_field'))
}
} }
return return
} }
......
src/views/chart/components/ChartComponentG2.vue
...@@ -65,8 +65,10 @@ import { mapState } from 'vuex' ...@@ -65,8 +65,10 @@ import { mapState } from 'vuex'
import { baseFlowMapOption } from '@/views/chart/chart/map/map_antv' import { baseFlowMapOption } from '@/views/chart/chart/map/map_antv'
import { baseBubbleMapOption } from '@/views/chart/chart/bubble/bubble_antv' import { baseBubbleMapOption } from '@/views/chart/chart/bubble/bubble_antv'
import { baseCityBrightnessMapOptionAntV } from '@/views/chart/chart/cityBrightness/cityBrightness_antv' import { baseCityBrightnessMapOptionAntV } from '@/views/chart/chart/cityBrightness/cityBrightness_antv'
import { baseCitySweepMapOptionAntV } from '@/views/chart/chart/citySweep/citySweep_antv'
import { clear } from 'size-sensor' import { clear } from 'size-sensor'
import { baseSankeyOptionAntV } from '@/views/chart/chart/sankey/sankey_antv' import { baseSankeyOptionAntV } from '@/views/chart/chart/sankey/sankey_antv'
import { baseBuildingOptionAntV } from '@/views/chart/chart/building/building' import { baseBuildingOptionAntV } from '@/views/chart/chart/building/building'
export default { export default {
name: 'ChartComponentG2', name: 'ChartComponentG2',
...@@ -314,20 +316,26 @@ export default { ...@@ -314,20 +316,26 @@ export default {
this.myChart = baseBubbleMapOption(this.myChart, this.chartId, chart, this.antVAction) this.myChart = baseBubbleMapOption(this.myChart, this.chartId, chart, this.antVAction)
} else if (chart.type === 'city-brightness') { } else if (chart.type === 'city-brightness') {
this.myChart = baseCityBrightnessMapOptionAntV(this.myChart, this.chartId, chart, this.antVAction) this.myChart = baseCityBrightnessMapOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
} else if (chart.type === 'chart_sankey') {
} else if (chart.type === 'city-sweep') {
this.myChart = baseCitySweepMapOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
} else if (chart.type === 'chart_sankey') {
this.myChart = baseSankeyOptionAntV(this.myChart, this.chartId, chart, this.antVAction) this.myChart = baseSankeyOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
} else if (chart.type === 'threeDColumn') { } else if (chart.type === 'threeDColumn') {
this.myChart = base3DColumnOptionAntV(this.myChart, this.chartId, chart, this.antVAction) this.myChart = base3DColumnOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
} else if (chart.type === 'chart_building') { } else if (chart.type === 'chart_building') {
this.myChart = baseBuildingOptionAntV(this.myChart, this.chartId, chart, this.antVAction) this.myChart = baseBuildingOptionAntV(this.myChart, this.chartId, chart, this.antVAction)
} else { } else {
if (this.myChart) { if (this.myChart) {
this.antVRenderStatus = false this.antVRenderStatus = false
this.myChart.destroy() this.myChart.destroy()
} }
} }
if (this.myChart && !equalsAny(chart.type, 'liquid', 'flow-map', 'bubble', 'city-brightness') && this.searchCount > 0) {
this.myChart.options.animation = false if (this.myChart && !equalsAny(chart.type, 'liquid', 'flow-map', 'bubble', 'city-brightness','city-sweep') && this.searchCount > 0) {
this.myChart.options.animation = false
} }
if (this.myChart?.options?.legend) { if (this.myChart?.options?.legend) {
let pageNavigatorInactiveFill, pageNavigatorFill let pageNavigatorInactiveFill, pageNavigatorFill
...@@ -463,6 +471,10 @@ export default { ...@@ -463,6 +471,10 @@ export default {
this.title_class.zIndex = 4 this.title_class.zIndex = 4
this.title_class.position = 'absolute' this.title_class.position = 'absolute'
} }
if (this.chart.type === 'city-sweep') {
this.title_class.zIndex = 4
this.title_class.position = 'absolute'
}
} }
this.initRemark() this.initRemark()
}, },
......
src/views/chart/components/componentStyle/dialog/RemarkEditor.vue
...@@ -14,6 +14,22 @@ ...@@ -14,6 +14,22 @@
<script> <script>
import tinymce from 'tinymce/tinymce' // tinymce默认hidden，不引入不显示 import tinymce from 'tinymce/tinymce' // tinymce默认hidden，不引入不显示
import Editor from '@tinymce/tinymce-vue' import Editor from '@tinymce/tinymce-vue'
import 'tinymce/themes/silver/theme' // 编辑器主题
import 'tinymce/icons/default' // 引入编辑器图标icon，不引入则不显示对应图标
// 引入编辑器插件（基本免费插件都在这儿了）
import 'tinymce/plugins/advlist' // 高级列表
import 'tinymce/plugins/autolink' // 自动链接
import 'tinymce/plugins/link' // 超链接
import 'tinymce/plugins/image' // 插入编辑图片
import 'tinymce/plugins/lists' // 列表插件
import 'tinymce/plugins/charmap' // 特殊字符
import 'tinymce/plugins/media' // 插入编辑媒体
import 'tinymce/plugins/wordcount' // 字数统计
import 'tinymce/plugins/table' // 表格
import 'tinymce/plugins/contextmenu' // contextmenu
import 'tinymce/plugins/directionality'
import 'tinymce/plugins/nonbreaking'
import 'tinymce/plugins/pagebreak'
import { imgUrlTrans } from '@/components/canvas/utils/utils' import { imgUrlTrans } from '@/components/canvas/utils/utils'
import { mapState } from 'vuex' import { mapState } from 'vuex'
// 编辑器引入 // 编辑器引入
......
src/views/login/index.vue
...@@ -216,6 +216,7 @@ import { changeFavicon, showMultiLoginMsg } from '@/utils/index' ...@@ -216,6 +216,7 @@ import { changeFavicon, showMultiLoginMsg } from '@/utils/index'
import { initTheme } from '@/utils/ThemeUtil' import { initTheme } from '@/utils/ThemeUtil'
import PluginCom from '@/views/system/plugin/PluginCom' import PluginCom from '@/views/system/plugin/PluginCom'
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import xss from 'xss'
export default { export default {
name: 'Login', name: 'Login',
components: { PluginCom }, components: { PluginCom },
...@@ -449,7 +450,27 @@ export default { ...@@ -449,7 +450,27 @@ export default {
this.showFoot = this.uiInfo['ui.showFoot'].paramValue === true || this.uiInfo['ui.showFoot'].paramValue === 'true' this.showFoot = this.uiInfo['ui.showFoot'].paramValue === true || this.uiInfo['ui.showFoot'].paramValue === 'true'
if (this.showFoot) { if (this.showFoot) {
const content = this.uiInfo['ui.footContent'] && this.uiInfo['ui.footContent'].paramValue const content = this.uiInfo['ui.footContent'] && this.uiInfo['ui.footContent'].paramValue
this.footContent = content const myXss = new xss.FilterXSS({
css: {
whiteList: {
'background-color': true,
'text-align': true,
'color': true,
'margin-top': true,
'margin-bottom': true,
'line-height': true,
'box-sizing': true,
'padding-top': true,
'padding-bottom': true
}
},
whiteList: {
...xss.whiteList,
p: ['style'],
span: ['style']
}
})
this.footContent = myXss.process(content)
} }
} }
}, },
......
src/views/panel/filter/FilterDialog.vue
...@@ -266,6 +266,7 @@ ...@@ -266,6 +266,7 @@
<div v-if="currentElement.options && currentElement.options.attrs"> <div v-if="currentElement.options && currentElement.options.attrs">
<filter-head <filter-head
:element="currentElement" :element="currentElement"
@dataset-name="dataSetName"
/> />
<filter-control <filter-control
...@@ -463,6 +464,23 @@ export default { ...@@ -463,6 +464,23 @@ export default {
bus.$off('valid-values-change', this.validateFilterValue) bus.$off('valid-values-change', this.validateFilterValue)
}, },
methods: { methods: {
dataSetName(tableId, callback) {
let result = null
if (tableId) {
const stack = [...this.defaultData]
while (stack.length) {
const tableNode = stack.pop()
if (tableNode.id === tableId) {
result = tableNode.name
break
}
if (tableNode.children?.length) {
tableNode.children.forEach(kid => stack.push(kid))
}
}
}
callback && callback(result)
},
async checkSuperior(list, anotherTableIds) { async checkSuperior(list, anotherTableIds) {
let fieldValid = false let fieldValid = false
const fieldId = this.myAttrs?.fieldId const fieldId = this.myAttrs?.fieldId
......
src/views/panel/filter/filterMain/FilterHead.vue
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
:key="item.id" :key="item.id"
:item="item" :item="item"
:index="index" :index="index"
:tool-tip="getTableName(item.tableId)"
@closeItem="closeItem" @closeItem="closeItem"
/> />
...@@ -70,7 +71,12 @@ export default { ...@@ -70,7 +71,12 @@ export default {
}, },
methods: { methods: {
getTableName(tableId) {
let tableName = null
this.$emit('dataset-name', tableId, t => { tableName = t })
console.log(tableName)
return tableName
},
onMove(e, originalEvent) { onMove(e, originalEvent) {
return true return true
}, },
......
src/views/panel/list/PanelList.vue
...@@ -591,8 +591,9 @@ export default { ...@@ -591,8 +591,9 @@ export default {
? this.defaultData.slice(0, 3) ? this.defaultData.slice(0, 3)
: this.defaultData : this.defaultData
}, },
...mapState(['nowPanelTrackInfo']) ...mapState(['nowPanelTrackInfo', 'user'])
}, },
// ...mapState('user'),
watch: { watch: {
// 切换展示页面后 重新点击一下当前节点 // 切换展示页面后 重新点击一下当前节点
'$store.state.panel.mainActiveName': function(newVal, oldVal) { '$store.state.panel.mainActiveName': function(newVal, oldVal) {
...@@ -895,14 +896,16 @@ export default { ...@@ -895,14 +896,16 @@ export default {
}, },
tree(cache = false) { tree(cache = false) {
const modelInfo = localStorage.getItem('panel-main-tree') const modelInfo = localStorage.getItem('panel-main-tree')
const { username } = this.user.user
const userCache = modelInfo && cache const userCache = modelInfo && cache
if (userCache) { if (userCache) {
this.tData = JSON.parse(modelInfo) this.tData = JSON.parse(modelInfo)
?.filter(item => item.createBy === username) // 只显示创建人的数据
} }
groupTree(this.groupForm, !userCache).then((res) => { groupTree(this.groupForm, !userCache).then((res) => {
localStorage.setItem('panel-main-tree', JSON.stringify(res.data || [])) localStorage.setItem('panel-main-tree', JSON.stringify(res.data || []))
if (!userCache) { if (!userCache) {
this.tData = res.data || [] this.tData = res.data?.filter(item => item.createBy === username) || [] // 只显示创建人的数据
} }
if (this.responseSource === 'appApply') { if (this.responseSource === 'appApply') {
this.fromAppActive() this.fromAppActive()
......
src/views/panel/list/PanelViewShow.vue
...@@ -258,6 +258,7 @@ ...@@ -258,6 +258,7 @@
<Preview <Preview
v-if="showMainFlag" v-if="showMainFlag"
ref="paneViewPreviewRef" ref="paneViewPreviewRef"
:class="fullscreen && 'fullscreen-visual-selects'"
:component-data="mainCanvasComponentData" :component-data="mainCanvasComponentData"
:canvas-style-data="canvasStyleData" :canvas-style-data="canvasStyleData"
:active-tab="activeTab" :active-tab="activeTab"
...@@ -932,5 +933,12 @@ export default { ...@@ -932,5 +933,12 @@ export default {
color: inherit; color: inherit;
margin-right: 5px; margin-right: 5px;
} }
.fullscreen-visual-selects {
.VisualSelects {
top: inherit !important;
left: inherit !important;
}
}
</style> </style>
vue.config.js
...@@ -60,14 +60,11 @@ module.exports = { ...@@ -60,14 +60,11 @@ module.exports = {
'@': resolve('src') '@': resolve('src')
} }
}, },
output: output: process.env.NODE_ENV === 'development' ? {} : {
process.env.NODE_ENV === 'development' filename: `js/[name].[contenthash:8].${pkg.version}.js`,
? {} publicPath: '/',
: { chunkFilename: `js/[name].[contenthash:8].${pkg.version}.js`
filename: `js/[name].[contenthash:8].${pkg.version}.js`, },
publicPath: '/',
chunkFilename: `js/[name].[contenthash:8].${pkg.version}.js`
},
plugins: [ plugins: [
new CopyWebpackPlugin([ new CopyWebpackPlugin([
{ {
...@@ -90,14 +87,15 @@ module.exports = { ...@@ -90,14 +87,15 @@ module.exports = {
}) })
] ]
}, },
chainWebpack: (config) => { chainWebpack: config => {
config.module.rules.delete('svg') // 删除默认配置中处理svg, config.module.rules.delete('svg') // 删除默认配置中处理svg,
// const svgRule = config.module.rule('svg') // const svgRule = config.module.rule('svg')
// svgRule.uses.clear() // svgRule.uses.clear()
config.module config.module
.rule('svg-sprite-loader') .rule('svg-sprite-loader')
.test(/\.svg$/) .test(/\.svg$/)
.include.add(resolve('src/icons')) // 处理svg目录 .include
.add(resolve('src/icons')) // 处理svg目录
.end() .end()
.use('svg-sprite-loader') .use('svg-sprite-loader')
.loader('svg-sprite-loader') .loader('svg-sprite-loader')
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论