From 4eae7af1ce6cd0ea8ac6485e26528625e83c3c70 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 十月 2021 15:18:57 +0800
Subject: [PATCH] 2021-10-12
---
src/pc/modulesource/option.jsx | 1
src/views/printTemplate/index.jsx | 26 ++++-
src/views/pcdesign/index.jsx | 12 ++
src/utils/utils-custom.js | 47 +++++++++--
src/menu/pastecontroller/index.jsx | 17 ++-
src/views/appmanage/scriptform/index.jsx | 8 +
src/views/printTemplate/print.js | 28 +++---
src/templates/menuconfig/editthdmenu/index.jsx | 1
src/views/appmanage/transform/index.jsx | 2
src/tabviews/zshare/actionList/popupbutton/index.scss | 6 +
src/views/mobdesign/index.jsx | 3
src/menu/popview/index.jsx | 24 ++++-
src/views/menudesign/index.jsx | 3
src/menu/components/tabs/paste/index.jsx | 17 ++-
src/utils/utils.js | 2
15 files changed, 142 insertions(+), 55 deletions(-)
diff --git a/src/menu/components/tabs/paste/index.jsx b/src/menu/components/tabs/paste/index.jsx
index c51ac9f..9f0d0d1 100644
--- a/src/menu/components/tabs/paste/index.jsx
+++ b/src/menu/components/tabs/paste/index.jsx
@@ -23,18 +23,20 @@
this.setState({visible: true})
}
- resetconfig = (item, Tab, copyBtns) => {
+ resetconfig = (item, Tab, copyBtns, uuids = {}) => {
item.floor = Tab.floor + 1
item.tabId = Tab.uuid
item.parentId = Tab.parentId
if (item.type === 'tabs') {
- item.uuid = MenuUtils.getuuid()
+ uuids[item.uuid] = MenuUtils.getuuid()
+ item.uuid = uuids[item.uuid]
item.setting.name = item.setting.name + MenuUtils.getdataName().toUpperCase().substr(-4)
item.name = item.setting.name
item.subtabs.forEach(tab => {
- tab.uuid = MenuUtils.getuuid()
+ uuids[tab.uuid] = MenuUtils.getuuid()
+ tab.uuid = uuids[tab.uuid]
tab.parentId = item.uuid
if (item.floor >= 3) {
@@ -42,12 +44,13 @@
}
tab.components = tab.components.map(cell => {
- cell = this.resetconfig(cell, tab, copyBtns)
+ cell = this.resetconfig(cell, tab, copyBtns, uuids)
return cell
})
})
} else if (item.type === 'group') {
- item.uuid = MenuUtils.getuuid()
+ uuids[item.uuid] = MenuUtils.getuuid()
+ item.uuid = uuids[item.uuid]
item.setting.name = item.setting.name + MenuUtils.getdataName().toUpperCase().substr(-4)
item.name = item.setting.name
@@ -56,12 +59,12 @@
cell.tabId = Tab.uuid
cell.parentId = Tab.parentId
- cell = MenuUtils.resetComponentConfig(cell, copyBtns)
+ cell = MenuUtils.resetComponentConfig(cell, copyBtns, uuids)
return cell
})
} else {
- item = MenuUtils.resetComponentConfig(item, copyBtns)
+ item = MenuUtils.resetComponentConfig(item, copyBtns, uuids)
}
return item
diff --git a/src/menu/pastecontroller/index.jsx b/src/menu/pastecontroller/index.jsx
index a5529f5..1356945 100644
--- a/src/menu/pastecontroller/index.jsx
+++ b/src/menu/pastecontroller/index.jsx
@@ -22,16 +22,18 @@
this.setState({visible: true})
}
- resetconfig = (item, copyBtns) => {
+ resetconfig = (item, copyBtns, uuids = {}) => {
let appType = sessionStorage.getItem('appType')
if (item.type === 'tabs') {
- item.uuid = MenuUtils.getuuid()
+ uuids[item.uuid] = MenuUtils.getuuid()
+ item.uuid = uuids[item.uuid]
item.setting.name = item.setting.name + MenuUtils.getdataName().toUpperCase().substr(-4)
item.name = item.setting.name
item.subtabs.forEach(tab => {
- tab.uuid = MenuUtils.getuuid()
+ uuids[tab.uuid] = MenuUtils.getuuid()
+ tab.uuid = uuids[tab.uuid]
tab.parentId = item.uuid
if (appType !== 'mob') {
@@ -43,12 +45,13 @@
cell.tabId = tab.uuid
cell.parentId = tab.parentId
- cell = this.resetconfig(cell, copyBtns)
+ cell = this.resetconfig(cell, copyBtns, uuids)
return cell
})
})
} else if (item.type === 'group') {
- item.uuid = MenuUtils.getuuid()
+ uuids[item.uuid] = MenuUtils.getuuid()
+ item.uuid = uuids[item.uuid]
item.setting.name = item.setting.name + MenuUtils.getdataName().toUpperCase().substr(-4)
item.name = item.setting.name
@@ -57,11 +60,11 @@
cell.tabId = item.tabId || ''
cell.parentId = item.parentId || ''
- cell = MenuUtils.resetComponentConfig(cell, copyBtns)
+ cell = MenuUtils.resetComponentConfig(cell, copyBtns, uuids)
return cell
})
} else {
- item = MenuUtils.resetComponentConfig(item, copyBtns)
+ item = MenuUtils.resetComponentConfig(item, copyBtns, uuids)
}
return item
diff --git a/src/menu/popview/index.jsx b/src/menu/popview/index.jsx
index a85ea98..9f1a385 100644
--- a/src/menu/popview/index.jsx
+++ b/src/menu/popview/index.jsx
@@ -178,6 +178,11 @@
MenuID: MenuId
}
+ if (sessionStorage.getItem('appType') === 'pc') {
+ param.TypeCharOne = sessionStorage.getItem('kei_no')
+ param.Typename = 'pc'
+ }
+
Api.getSystemConfig(param).then(result => {
if (result.status) {
let config = null
@@ -379,11 +384,18 @@
LText: []
}
- btnParam.LText = this.getMenuMessage()
- btnParam.LText = btnParam.LText.join(' union all ')
- btnParam.LText = Utils.formatOptions(btnParam.LText)
- btnParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp)
+ if (sessionStorage.getItem('appType') === 'pc') {
+ param.TypeCharOne = sessionStorage.getItem('kei_no')
+ param.Typename = 'pc'
+
+ btnParam.LText = ''
+ } else {
+ btnParam.LText = this.getMenuMessage()
+ btnParam.LText = btnParam.LText.join(' union all ')
+ btnParam.LText = Utils.formatOptions(btnParam.LText)
+ btnParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp)
+ }
new Promise(resolve => {
if (delButtons.length === 0) {
@@ -496,6 +508,8 @@
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
} else if (item.setting.interType && !item.setting.primaryKey) {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
+ } else if (!item.setting.supModule) {
+ error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婄骇缁勪欢锛乣
}
}
if (item.type === 'bar' || item.type === 'line' || item.type === 'pie') {
diff --git a/src/pc/modulesource/option.jsx b/src/pc/modulesource/option.jsx
index 0da610b..76a2ac4 100644
--- a/src/pc/modulesource/option.jsx
+++ b/src/pc/modulesource/option.jsx
@@ -39,6 +39,7 @@
{ type: 'menu', url: Carousel, component: 'carousel', subtype: 'datacard', title: '杞挱-鍔ㄦ�佹暟鎹�', width: 24 },
{ type: 'menu', url: Carousel1, component: 'carousel', subtype: 'propcard', title: '杞挱-闈欐�佹暟鎹�', width: 24 },
{ type: 'menu', url: NormalTable, component: 'table', subtype: 'normaltable', title: '甯哥敤琛�', width: 24 },
+ { type: 'menu', url: NormalTable, component: 'table', subtype: 'editable', title: '琛ㄦ牸锛堝彲缂栬緫锛�', width: 24 },
{ type: 'menu', url: TableCard, component: 'table', subtype: 'tablecard', title: '琛ㄦ牸锛堝崱鐗囷級', width: 12 },
{ type: 'menu', url: tree, component: 'tree', subtype: 'normaltree', title: '鏍戝舰鍒楄〃', width: 12 },
{ type: 'menu', url: line, component: 'line', subtype: 'line', title: '鎶樼嚎鍥�', width: 24 },
diff --git a/src/tabviews/zshare/actionList/popupbutton/index.scss b/src/tabviews/zshare/actionList/popupbutton/index.scss
index e0a65c3..e115405 100644
--- a/src/tabviews/zshare/actionList/popupbutton/index.scss
+++ b/src/tabviews/zshare/actionList/popupbutton/index.scss
@@ -1,6 +1,9 @@
.custom-popview.popview-modal {
>.ant-modal-content >.ant-modal-body {
padding: 0;
+ .custom-page-wrap {
+ min-height: 200px;
+ }
}
}
.custom-drawer-popview {
@@ -24,6 +27,9 @@
text-align: right;
box-shadow: 0 0 3px #cbcbcb;
}
+ .custom-page-wrap {
+ min-height: calc(100vh - 110px);
+ }
}
}
}
diff --git a/src/templates/menuconfig/editthdmenu/index.jsx b/src/templates/menuconfig/editthdmenu/index.jsx
index 76cc412..8ec7b43 100644
--- a/src/templates/menuconfig/editthdmenu/index.jsx
+++ b/src/templates/menuconfig/editthdmenu/index.jsx
@@ -717,6 +717,7 @@
config.MenuNo = param.MenuNo
config.easyCode = ''
config.components = MenuUtils.resetConfig(config.components)
+ config.enabled = false
param.LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(config)))
}
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index a5f307f..a29a1a9 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -332,17 +332,19 @@
* @description 閲嶇疆鑿滃崟閰嶇疆锛岄〉闈㈡暣浣撳鍒�
* @return {String} components 閰嶇疆淇℃伅
*/
- static resetConfig = (components) => {
+ static resetConfig = (components, uuids = {}) => {
return components.map(item => {
if (item.type === 'navbar') {
return item
}
- item.uuid = this.getuuid()
+ uuids[item.uuid] = this.getuuid()
+ item.uuid = uuids[item.uuid]
if (item.type === 'tabs') {
item.subtabs.forEach(tab => {
- tab.uuid = this.getuuid()
+ uuids[tab.uuid] = this.getuuid()
+ tab.uuid = uuids[tab.uuid]
tab.parentId = item.uuid
tab.components = tab.components.map(cell => {
@@ -350,14 +352,14 @@
cell.parentId = item.uuid
return cell
})
- tab.components = this.resetConfig(tab.components)
+ tab.components = this.resetConfig(tab.components, uuids)
})
} else if (item.type === 'group') {
item.components = item.components.map(cell => {
cell.parentId = item.uuid
return cell
})
- item.components = this.resetConfig(item.components)
+ item.components = this.resetConfig(item.components, uuids)
} else if (item.type === 'menubar') {
item.subMenus = item.subMenus.map(cell => {
cell.uuid = this.getuuid()
@@ -487,6 +489,19 @@
})
}
+ if (item.setting && item.setting.supModule && item.setting.supModule[0] !== 'empty') {
+ let em = false
+ item.setting.supModule = item.setting.supModule.map(c => {
+ if (!uuids[c]) {
+ em = true
+ }
+ return uuids[c] || ''
+ })
+ if (em) {
+ item.setting.supModule = ''
+ }
+ }
+
if (item.wrap && item.wrap.doubleClick) {
item.wrap.doubleClick = oriUids[item.wrap.doubleClick] || ''
}
@@ -513,12 +528,17 @@
* @description 閲嶇疆缁勪欢閰嶇疆
* @return {String} item 缁勪欢淇℃伅
*/
- static resetComponentConfig = (item, copyBtns) => {
+ static resetComponentConfig = (item, copyBtns, uuids = {}) => {
if (item.type === 'navbar') {
return item
}
- item.uuid = this.getuuid()
+ let _uuid = this.getuuid()
+
+ uuids[item.uuid] = _uuid
+
+ item.uuid = _uuid
+
if (item.dataName) {
item.dataName = this.getdataName()
}
@@ -725,8 +745,17 @@
})
}
- if (item.setting && item.setting.supModule) {
- item.setting.supModule = ''
+ if (item.setting && item.setting.supModule && item.setting.supModule[0] !== 'empty') {
+ let em = false
+ item.setting.supModule = item.setting.supModule.map(c => {
+ if (!uuids[c]) {
+ em = true
+ }
+ return uuids[c] || ''
+ })
+ if (em) {
+ item.setting.supModule = ''
+ }
}
if (item.wrap && item.wrap.doubleClick) {
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 2a92d14..1e8e4b5 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1147,7 +1147,7 @@
// 鎺у埗鍙版墦鍗版暟鎹�
let conLtext = []
- let _Ltext = data.map((item, lindex) => {
+ let _Ltext = data.map(item => {
let vals = []
let convals = []
columns.forEach(col => {
diff --git a/src/views/appmanage/scriptform/index.jsx b/src/views/appmanage/scriptform/index.jsx
index 4fc324c..5ed14e9 100644
--- a/src/views/appmanage/scriptform/index.jsx
+++ b/src/views/appmanage/scriptform/index.jsx
@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Select, notification } from 'antd'
+import { Form, Row, Col, Input, Select, notification, Tooltip, Icon } from 'antd'
import moment from 'moment'
import Api from '@/api'
@@ -159,7 +159,11 @@
<Form {...formItemLayout} className="app-script-form">
<Row gutter={24}>
<Col span={12}>
- <Form.Item label="绫诲瀷">
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="1銆佸垵娆″崌绾ф垨搴旂敤鍩烘湰淇℃伅淇敼鏃讹紝璇烽鍏堟坊鍔犲簲鐢紙鍩烘湰淇℃伅锛夛紱2銆佸瓙搴旂敤鏁翠綋鍗囩骇鏃讹紝璇锋坊鍔犲瓙搴旂敤锛堝崌绾у唴瀹瑰寘鎷〉闈㈠強鏉冮檺鏍戯級锛�3銆佸崟涓〉闈㈠崌绾ф椂锛岃娣诲姞椤甸潰锛�4銆佹秹鍙婃潈闄愭洿鏂版椂锛岃娣诲姞鏉冮檺鏍�">
+ <Icon style={{color: '#c49f47', marginRight: '5px'}} type="question-circle" />绫诲瀷
+ </Tooltip>
+ }>
{getFieldDecorator('VType', {
initialValue: 'subapp',
rules: [{
diff --git a/src/views/appmanage/transform/index.jsx b/src/views/appmanage/transform/index.jsx
index 9ede6fb..c68aaf9 100644
--- a/src/views/appmanage/transform/index.jsx
+++ b/src/views/appmanage/transform/index.jsx
@@ -63,7 +63,7 @@
max: 20,
message: '浼犺緭鍙蜂笉鍙秴杩�20涓瓧绗�!'
}]
- })(<Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />)}
+ })(<Input placeholder="" autoFocus autoComplete="off" onPressEnter={this.handleSubmit} />)}
</Form.Item>
</Col> : null}
<Col span={24}>
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 57274c6..be66c84 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -723,6 +723,7 @@
_conf.uuid = item.uuid
_conf.MenuID = item.uuid
_conf.Template = 'CustomPage'
+ _conf.enabled = false
} else {
resolve({
status: true
@@ -863,6 +864,8 @@
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
} else if (!item.setting.primaryKey) {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
+ } else if (!item.setting.supModule) {
+ error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婄骇缁勪欢锛乣
}
}
if (item.type === 'bar' || item.type === 'line' || item.type === 'pie') {
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 8047b9c..19b9f5e 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -580,6 +580,7 @@
}
} else {
config.components = MenuUtils.resetConfig(config.components)
+ config.enabled = false
message.success('澶嶅埗鎴愬姛锛屼繚瀛樺悗鐢熸晥銆�')
}
@@ -1142,6 +1143,8 @@
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
} else if (!item.setting.primaryKey) {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
+ } else if (!item.setting.supModule) {
+ error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婄骇缁勪欢锛乣
}
}
if (item.type === 'bar' || item.type === 'line' || item.type === 'pie') {
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index f27c627..84fd928 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -652,6 +652,7 @@
}
} else {
config.components = MenuUtils.resetConfig(config.components)
+ config.enabled = false
message.success('澶嶅埗鎴愬姛锛屼繚瀛樺悗鐢熸晥銆�')
}
@@ -1243,7 +1244,9 @@
Api.getSystemConfig({
func: 'sPC_Get_LongParam',
- MenuID: item.$originUuid
+ MenuID: item.$originUuid,
+ TypeCharOne: sessionStorage.getItem('kei_no'),
+ typename: 'pc',
}).then(result => {
if (result.status) {
let _conf = ''
@@ -1260,6 +1263,7 @@
_conf.uuid = item.uuid
_conf.MenuID = item.uuid
_conf.Template = 'webPage'
+ _conf.enabled = false
} else {
resolve({
status: true
@@ -1275,7 +1279,9 @@
Template: 'webPage',
MenuName: item.label,
PageParam: JSON.stringify({Template: 'webPage'}),
- LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(_conf)))
+ LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(_conf))),
+ TypeCharOne: sessionStorage.getItem('kei_no'),
+ Typename: 'pc',
}
Api.getSystemConfig(_param).then(response => {
@@ -1401,6 +1407,8 @@
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆鏁版嵁婧愶紒`
} else if (!item.setting.primaryKey) {
error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婚敭锛乣
+ } else if (!item.setting.supModule) {
+ error = `缁勪欢銆�${item.name}銆嬫湭璁剧疆涓婄骇缁勪欢锛乣
}
}
if (item.type === 'bar' || item.type === 'line' || item.type === 'pie') {
diff --git a/src/views/printTemplate/index.jsx b/src/views/printTemplate/index.jsx
index 8be5e6e..3d8dd6c 100644
--- a/src/views/printTemplate/index.jsx
+++ b/src/views/printTemplate/index.jsx
@@ -2,7 +2,7 @@
import { DndProvider } from 'react-dnd'
import { is, fromJS } from 'immutable'
import HTML5Backend from 'react-dnd-html5-backend'
-import { Card, notification, Row, Button, Modal, Input, Icon } from 'antd'
+import { Card, notification, Row, Button, Modal, Input, Icon, Switch } from 'antd'
import DragElement from './dragelement'
import MutilForm from './mutilform'
import SourceElement from './dragelement/source'
@@ -44,7 +44,8 @@
upPlus: 1,
upMinus: 1,
leftPlus: 1,
- leftMinus: 1
+ leftMinus: 1,
+ debug: false
}
getclickpoint = (e) => {
@@ -335,19 +336,19 @@
}
resetbox = () => {
- const { config } = this.state
+ const { config, debug } = this.state
let ratio = (config.height || 1) / (config.width || 1)
document.getElementById('darea').style.height = parseInt(document.getElementById('darea').style.width) * ratio + 'px'
- printCtrl.sketch(config, null)
+ printCtrl.sketch(config, null, debug)
}
resetview () {
- const { config, editItemId } = this.state
+ const { config, editItemId, debug } = this.state
- printCtrl.sketch(config, editItemId)
+ printCtrl.sketch(config, editItemId, debug)
}
/**
@@ -769,7 +770,7 @@
}
new Promise(resolve => {
- printCtrl.sketch(config, null).then(res => {
+ printCtrl.sketch(config, null, false).then(res => {
let param = {
Base64Img: res
}
@@ -881,6 +882,14 @@
})
}
+ changeDebug = (val) => {
+ this.setState({
+ debug: val
+ }, () => {
+ this.resetview()
+ })
+ }
+
render () {
return (
<div className="print-template">
@@ -897,6 +906,9 @@
<Input addonBefore={<Icon title="璺濅笂" type="arrow-up" />} addonAfter={<Icon onClick={() => this.updatePosition('upMinus')} type="minus" />} onChange={(e) => this.change(e, 'upMinus')} value={this.state.upMinus} />
<Input addonBefore={<Icon title="璺濆乏" type="arrow-left" />} addonAfter={<Icon onClick={() => this.updatePosition('leftPlus')} type="plus" />} onChange={(e) => this.change(e, 'leftPlus')} value={this.state.leftPlus} />
<Input addonBefore={<Icon title="璺濆乏" type="arrow-left" />} addonAfter={<Icon onClick={() => this.updatePosition('leftMinus')} type="minus" />} onChange={(e) => this.change(e, 'leftMinus')} value={this.state.leftMinus} />
+ <div style={{marginTop: '10px'}}>
+ <span>璋冭瘯妯″紡锛�</span><Switch onChange={this.changeDebug} />
+ </div>
</Card>
</aside>
<div className="switchbox" onClick={this.switchbox}></div>
diff --git a/src/views/printTemplate/print.js b/src/views/printTemplate/print.js
index 4247780..81c5792 100644
--- a/src/views/printTemplate/print.js
+++ b/src/views/printTemplate/print.js
@@ -4,7 +4,7 @@
* @param {Object} configs 閰嶇疆淇℃伅
* @param {Boolean} selectId 缂栬緫鍏冪礌
*/
- static sketch (configs, selectId) {
+ static sketch (configs, selectId, debug = false) {
if (!configs.height || !configs.width) return
if (configs.height / configs.width > 10 || configs.width / configs.height > 10) return
@@ -43,7 +43,7 @@
})
return new Promise(resolve => {
- this.sketchothers(context, elements, selectId, ratio, resolve)
+ this.sketchothers(context, elements, selectId, debug, ratio, resolve)
})
} else {
return new Promise(resolve => {
@@ -57,7 +57,7 @@
* @param {Object} context 鐢诲竷瀵硅薄
* @param {Object} elements 鍥剧墖鏂囧瓧淇℃伅
*/
- static sketchothers (context, elements, selectId, ratio, resolve) {
+ static sketchothers (context, elements, selectId, debug, ratio, resolve) {
let element = elements.splice(0, 1)[0] // 閫愪釜缁樺埗鍥剧墖鏂囧瓧
let textLineSpace = 5 // 缁樺埗鏃惰闂磋窛锛岄槻姝㈡枃瀛楅噸鍙�
context.save()
@@ -70,7 +70,7 @@
context.translate(-_cx, -_cy) // 鎭㈠鍘熺偣
}
- if (selectId === element.uuid) { // 閫変腑鍏冪礌锛岃缃閮ㄩ槾褰�
+ if (debug || selectId === element.uuid) { // 閫変腑鍏冪礌锛岃缃閮ㄩ槾褰�
context.shadowBlur = 5
context.shadowColor = '#1890ff'
context.fillStyle = 'white'
@@ -104,7 +104,7 @@
context.fillRect(element.left, element.top, element.width, element.height)
}
- if (selectId === element.uuid && element.width > 3 * ratio && element.height > 3 * ratio) { // 閫変腑鍏冪礌锛岃缃閮ㄩ槾褰�
+ if ((debug || selectId === element.uuid) && element.width > 3 * ratio && element.height > 3 * ratio) { // 閫変腑鍏冪礌锛岃缃閮ㄩ槾褰�
context.strokeStyle = '#1890ff'
context.beginPath()
context.moveTo(element.left + element.width - 7, element.top + element.height - 2)
@@ -117,7 +117,7 @@
if (!element.width || !element.height) {
context.restore() // 閲嶇疆鐢诲竷
if (elements.length > 0) {
- this.sketchothers(context, elements, selectId, ratio, resolve)
+ this.sketchothers(context, elements, selectId, debug, ratio, resolve)
} else {
this.cachesketch(context, resolve)
}
@@ -258,7 +258,7 @@
context.restore() // 閲嶇疆鐢诲竷
if (elements.length > 0) {
- this.sketchothers(context, elements, selectId, ratio, resolve)
+ this.sketchothers(context, elements, selectId, debug, ratio, resolve)
} else {
this.cachesketch(context, resolve)
}
@@ -301,7 +301,7 @@
context.restore() // 閲嶇疆鐢诲竷
if (elements.length > 0) {
- this.sketchothers(context, elements, selectId, ratio, resolve)
+ this.sketchothers(context, elements, selectId, debug, ratio, resolve)
} else {
this.cachesketch(context, resolve)
}
@@ -314,7 +314,7 @@
context.restore() // 閲嶇疆鐢诲竷
if (elements.length > 0) {
- this.sketchothers(context, elements, selectId, ratio, resolve)
+ this.sketchothers(context, elements, selectId, debug, ratio, resolve)
} else {
this.cachesketch(context, resolve)
}
@@ -343,7 +343,7 @@
context.restore() // 閲嶇疆鐢诲竷
if (elements.length > 0) {
- this.sketchothers(context, elements, selectId, ratio, resolve)
+ this.sketchothers(context, elements, selectId, debug, ratio, resolve)
} else {
this.cachesketch(context, resolve)
}
@@ -353,7 +353,7 @@
context.restore() // 閲嶇疆鐢诲竷
if (elements.length > 0) {
- this.sketchothers(context, elements, selectId, ratio, resolve)
+ this.sketchothers(context, elements, selectId, debug, ratio, resolve)
} else {
this.cachesketch(context, resolve)
}
@@ -385,7 +385,7 @@
context.restore() // 閲嶇疆鐢诲竷
if (elements.length > 0) {
- this.sketchothers(context, elements, selectId, ratio, resolve)
+ this.sketchothers(context, elements, selectId, debug, ratio, resolve)
} else {
this.cachesketch(context, resolve)
}
@@ -395,7 +395,7 @@
context.restore() // 閲嶇疆鐢诲竷
if (elements.length > 0) {
- this.sketchothers(context, elements, selectId, ratio, resolve)
+ this.sketchothers(context, elements, selectId, debug, ratio, resolve)
} else {
this.cachesketch(context, resolve)
}
@@ -404,7 +404,7 @@
image.onerror = () => {
context.restore() // 閲嶇疆鐢诲竷
if (elements.length > 0) {
- this.sketchothers(context, elements, selectId, ratio, resolve)
+ this.sketchothers(context, elements, selectId, debug, ratio, resolve)
} else {
this.cachesketch(context, resolve)
}
--
Gitblit v1.8.0