Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wisdom-components
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
wisdom-components
Commits
c6fe1103
Commit
c6fe1103
authored
Apr 25, 2023
by
陈龙
Browse files
Options
Browse Files
Download
Plain Diff
fix: 修复历史曲线仅显示曲线的功能交互的问题;修复其他问题
parents
fdf3e3f7
791b935d
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
5 deletions
+27
-5
CHANGELOG.md
packages/extend-components/EC_ConfigurationView/CHANGELOG.md
+6
-0
package.json
packages/extend-components/EC_ConfigurationView/package.json
+1
-1
HistoryModel.js
...xtend-components/EC_ConfigurationView/src/HistoryModel.js
+10
-2
RealModel.js
...s/extend-components/EC_ConfigurationView/src/RealModel.js
+10
-2
No files found.
packages/extend-components/EC_ConfigurationView/CHANGELOG.md
View file @
c6fe1103
...
...
@@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file. See
[
Conventional Commits
](
https://conventionalcommits.org
)
for commit guidelines.
## [1.4.47](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_configurationview@1.4.46...@wisdom-components/ec_configurationview@1.4.47) (2023-04-25)
### Bug Fixes
-
组态图片路径及文字位置生效 (
[
7b39233
](
https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/7b3923392ee4dfd321accff1c8361c3a542574e3
)
)
## [1.4.46](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/ec_configurationview@1.4.45...@wisdom-components/ec_configurationview@1.4.46) (2023-04-25)
### Bug Fixes
...
...
packages/extend-components/EC_ConfigurationView/package.json
View file @
c6fe1103
{
"name"
:
"@wisdom-components/ec_configurationview"
,
"version"
:
"1.4.4
6
"
,
"version"
:
"1.4.4
7
"
,
"description"
:
"> TODO: description"
,
"author"
:
"tuqian <webtuqian@163.com>"
,
"homepage"
:
""
,
...
...
packages/extend-components/EC_ConfigurationView/src/HistoryModel.js
View file @
c6fe1103
...
...
@@ -957,7 +957,7 @@ const ConfigurationView = (props) => {
{
width
:
56
,
height
:
56
,
scale
:
1
,
source
:
''
,
background
:
'#2e3343'
},
new
go
.
Binding
(
'source'
,
'imgSrc'
,
function
(
v
)
{
return
v
?
`/Panda
Core/GCK
/SketchPad/PreviewResource?name=
${
v
}
&_site=
${
?
`/Panda
Monitor/Monitor
/SketchPad/PreviewResource?name=
${
v
}
&_site=
${
globalConfig
?.
userInfo
?.
LocalSite
||
''
}
`
: '';
...
...
@@ -1006,7 +1006,7 @@ const ConfigurationView = (props) => {
new go.Binding('source', 'imgSrc', function (v) {
return !v
? require('./images/组态/默认.png')
: `
/
Panda
Core
/
GCK
/
SketchPad
/
PreviewResource
?
name
=
$
{
v
}
&
_site
=
$
{
: `
/
Panda
Monitor
/
Monitor
/
SketchPad
/
PreviewResource
?
name
=
$
{
v
}
&
_site
=
$
{
globalConfig
?.
userInfo
?.
LocalSite
||
''
}
`;
}).makeTwoWay(),
...
...
@@ -1195,6 +1195,8 @@ const ConfigurationView = (props) => {
new go.Binding('font', 'fontStyle'),
new go.Binding('stroke', 'fontStroke').makeTwoWay(),
new go.Binding('textAlign', 'fontAlign'),
new go.Binding('maxSize', 'textSize'),
new go.Binding('minSize', 'textSize'),
),
{
click(e, node) {
...
...
@@ -1261,6 +1263,8 @@ const ConfigurationView = (props) => {
new go.Binding('font', 'fontStyle'),
new go.Binding('stroke', 'fontStroke').makeTwoWay(),
new go.Binding('textAlign', 'fontAlign'),
new go.Binding('maxSize', 'textSize'),
new go.Binding('minSize', 'textSize'),
),
{
click(e, node) {
...
...
@@ -1383,6 +1387,8 @@ const ConfigurationView = (props) => {
new go.Binding('font', 'fontStyle'),
new go.Binding('stroke', 'fontStroke'),
new go.Binding('textAlign', 'fontAlign'),
new go.Binding('maxSize', 'textSize'),
new go.Binding('minSize', 'textSize'),
),
{
click(e, node) {
...
...
@@ -1709,6 +1715,8 @@ const ConfigurationView = (props) => {
new go.Binding('font', 'fontStyle'),
new go.Binding('stroke', 'fontStroke'),
new go.Binding('textAlign', 'fontAlign'),
new go.Binding('maxSize', 'textSize'),
new go.Binding('minSize', 'textSize'),
),
{
click(e, node) {
...
...
packages/extend-components/EC_ConfigurationView/src/RealModel.js
View file @
c6fe1103
...
...
@@ -1376,7 +1376,7 @@ const ConfigurationView = (props) => {
{
width
:
56
,
height
:
56
,
scale
:
1
,
source
:
''
,
background
:
'#2e3343'
},
new
go
.
Binding
(
'source'
,
'imgSrc'
,
function
(
v
)
{
return
v
?
`/Panda
Core/GCK
/SketchPad/PreviewResource?name=
${
v
}
&_site=
${
?
`/Panda
Monitor/Monitor
/SketchPad/PreviewResource?name=
${
v
}
&_site=
${
globalConfig
?.
userInfo
?.
LocalSite
||
''
}
`
: '';
...
...
@@ -1425,7 +1425,7 @@ const ConfigurationView = (props) => {
new go.Binding('source', 'imgSrc', function (v) {
return !v
? require('./images/组态/默认.png')
: `
/
Panda
Core
/
GCK
/
SketchPad
/
PreviewResource
?
name
=
$
{
v
}
&
_site
=
$
{
: `
/
Panda
Monitor
/
Monitor
/
SketchPad
/
PreviewResource
?
name
=
$
{
v
}
&
_site
=
$
{
globalConfig
?.
userInfo
?.
LocalSite
||
''
}
`;
}).makeTwoWay(),
...
...
@@ -1628,6 +1628,8 @@ const ConfigurationView = (props) => {
new go.Binding('font', 'fontStyle'),
new go.Binding('stroke', 'fontStroke').makeTwoWay(),
new go.Binding('textAlign', 'fontAlign'),
new go.Binding('maxSize', 'textSize'),
new go.Binding('minSize', 'textSize'),
),
{
click(e, node) {
...
...
@@ -1697,6 +1699,8 @@ const ConfigurationView = (props) => {
new go.Binding('font', 'fontStyle'),
new go.Binding('stroke', 'fontStroke').makeTwoWay(),
new go.Binding('textAlign', 'fontAlign'),
new go.Binding('maxSize', 'textSize'),
new go.Binding('minSize', 'textSize'),
),
{
click(e, node) {
...
...
@@ -1831,6 +1835,8 @@ const ConfigurationView = (props) => {
new go.Binding('font', 'fontStyle'),
new go.Binding('stroke', 'fontStroke'),
new go.Binding('textAlign', 'fontAlign'),
new go.Binding('maxSize', 'textSize'),
new go.Binding('minSize', 'textSize'),
),
{
click(e, node) {
...
...
@@ -2163,6 +2169,8 @@ const ConfigurationView = (props) => {
new go.Binding('font', 'fontStyle'),
new go.Binding('stroke', 'fontStroke'),
new go.Binding('textAlign', 'fontAlign'),
new go.Binding('maxSize', 'textSize'),
new go.Binding('minSize', 'textSize'),
),
{
click(e, node) {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment