Skip to content

Commit 6674b0e

Browse files
committed
添加数据源 裁剪时选择数据源 考虑标注数据源后缀是 ##1、#_1的情况
1 parent 16e2b4a commit 6674b0e

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/containers/mapCut/page/MapCut/MapCut.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export default class MapCut extends React.Component {
7878
(async function() {
7979
let layers = await this.props.getLayers()
8080
SMap.getDatasources().then(datasources => {
81-
let reg = /^Label_(.*)#$/
81+
let reg = /^Label_(.*)((#$)|(#_\d+$)|(##\d+$))/
8282
datasources = datasources.filter(item => !item.alias.match(reg))
8383
this.setState({
8484
datasources,

src/containers/workspace/components/FunctionToolbar/FunctionToolbar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ export default class FunctionToolbar extends React.Component {
789789

790790
let userUDBPath, userUDBs
791791
//过滤掉标注和标绘匹配正则
792-
let checkLabelAndPlot = /^(Label_|PlotEdit_(.*)@)(.*)#$/
792+
let checkLabelAndPlot = /^(Label_|PlotEdit_(.*)@)(.*)((#$)|(#_\d+$)|(##\d+$))/
793793
if (
794794
this.props.user &&
795795
this.props.user.currentUser.userName &&

0 commit comments

Comments
 (0)