修改代码

This commit is contained in:
ival 2021-04-08 09:23:42 +08:00
parent 84d8a396f0
commit d24f91afc1

View File

@ -13,25 +13,45 @@ export const elementConst = {
...form2ShapeStyle ...form2ShapeStyle
], ],
shape: [ shape: [
{prop: 'x1', label: '起始点横坐标', type: types.Number, precision: 0, step:1, {
prop: 'x1',
label: '起始点横坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入起始点横坐标', trigger: 'blur' } { required: true, message:'请输入起始点横坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '起始点横坐标'}, description: '起始点横坐标'
{prop: 'y1', label: '起始点纵坐标', type: types.Number, precision: 0, step:1, }, {
prop: 'y1',
label: '起始点纵坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入起始点纵坐标', trigger: 'blur' } { required: true, message:'请输入起始点纵坐标', trigger: 'blur' }
], ],
value: 10, value: 100,
description: '起始点纵坐标'}, description: '起始点纵坐标'
{prop: 'x2', label: '终止点横坐标', type: types.Number, precision: 0, step:1, },{
prop: 'x2',
label: '终止点横坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入终止点横坐标', trigger: 'blur' } { required: true, message:'请输入终止点横坐标', trigger: 'blur' }
], ],
value: 10, value: 100,
description: '终止点横坐标'}, description: '终止点横坐标'
{prop: 'y2', label: '终止点纵坐标', type: types.Number, precision: 0, step:1, },{
prop: 'y2',
label: '终止点纵坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入终止点纵坐标', trigger: 'blur' } { required: true, message:'请输入终止点纵坐标', trigger: 'blur' }
], ],
@ -65,37 +85,63 @@ export const elementConst = {
rules:[ rules:[
{ required: true, message:'请输入填充样式', trigger: 'blur' } { required: true, message:'请输入填充样式', trigger: 'blur' }
], ],
value: '', value: '#fff',
description: '填充样式。' description: '填充样式。'
}, },
...form2ShapeStyle ...form2ShapeStyle
], ],
shape: [ shape: [
{prop: 'x', label: '左上角横坐标', type: types.Number, precision: 0, step:1, {
prop: 'x',
label: '左上角横坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入左上角横坐标', trigger: 'blur' } { required: true, message:'请输入左上角横坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '左上角横坐标'}, description: '左上角横坐标'
{prop: 'y', label: '左上角纵坐标', type: types.Number, precision: 0, step:1, }, {
prop: 'y',
label: '左上角纵坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入左上角纵坐标', trigger: 'blur' } { required: true, message:'请输入左上角纵坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '左上角纵坐标'}, description: '左上角纵坐标'
{prop: 'width', label: '宽度', type: types.Number, precision: 0, step:1, }, {
prop: 'width',
label: '宽度',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入宽度', trigger: 'blur' } { required: true, message:'请输入宽度', trigger: 'blur' }
], ],
value: 50, value: 50,
description: '宽度'}, description: '宽度'
{prop: 'height', label: '高度', type: types.Number, precision: 0, step:1, }, {
prop: 'height',
label: '高度',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入高度', trigger: 'blur' } { required: true, message:'请输入高度', trigger: 'blur' }
], ],
value: 50, value: 50,
description: '高度'}, description: '高度'
{prop: 'r', label: '圆角矩形半径', type: types.NumberArray, precision: 0, step:1, length:4, }, {
prop: 'r',
label: '圆角矩形半径',
type: types.NumberArray,
precision: 0,
step:1,
length:4,
rules:[ rules:[
{ required: true, message:'请输入圆角矩形半径', trigger: 'blur' } { required: true, message:'请输入圆角矩形半径', trigger: 'blur' }
], ],
@ -116,30 +162,46 @@ export const elementConst = {
rules:[ rules:[
{ required: true, message:'请输入填充样式', trigger: 'blur' } { required: true, message:'请输入填充样式', trigger: 'blur' }
], ],
value: '', value: '#fff',
description: '填充样式。' description: '填充样式。'
}, },
...form2ShapeStyle ...form2ShapeStyle
], ],
shape: [ shape: [
{prop: 'cx', label: '圆心横坐标', type: types.Number, precision: 0, step:1, {
prop: 'cx',
label: '圆心横坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入圆心横坐标', trigger: 'blur' } { required: true, message:'请输入圆心横坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '圆心横坐标'}, description: '圆心横坐标'},
{prop: 'cy', label: '圆心纵坐标', type: types.Number, precision: 0, step:1, {
prop: 'cy',
label: '圆心纵坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入圆心纵坐标', trigger: 'blur' } { required: true, message:'请输入圆心纵坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '圆心纵坐标'}, description: '圆心纵坐标'
{prop: 'r', label: '半径', type: types.Number, precision: 0, step:1, }, {
prop: 'r',
label: '半径',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入半径', trigger: 'blur' } { required: true, message:'请输入半径', trigger: 'blur' }
], ],
value: 20, value: 50,
description: '半径'} description: '半径'
}
] ]
} }
}, },
@ -155,7 +217,7 @@ export const elementConst = {
rules:[ rules:[
{ required: true, message:'请输入填充样式', trigger: 'blur' } { required: true, message:'请输入填充样式', trigger: 'blur' }
], ],
value: '', value: '#fff',
description: '填充样式。' description: '填充样式。'
}, },
...form2ShapeStyle ...form2ShapeStyle
@ -201,36 +263,57 @@ export const elementConst = {
rules:[ rules:[
{ required: true, message:'请输入填充样式', trigger: 'blur' } { required: true, message:'请输入填充样式', trigger: 'blur' }
], ],
value: '', value: '#fff',
description: '填充样式。' description: '填充样式。'
}, },
...form2ShapeStyle ...form2ShapeStyle
], ],
shape:[ shape:[
{prop: 'x', label: '圆心横坐标', type: types.Number, precision: 0, step:1, {
prop: 'x',
label: '圆心横坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入圆心横坐标', trigger: 'blur' } { required: true, message:'请输入圆心横坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '圆心横坐标'}, description: '圆心横坐标'
{prop: 'y', label: '圆心纵坐标', type: types.Number, precision: 0, step:1, }, {
prop: 'y',
label: '圆心纵坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入圆心纵坐标', trigger: 'blur' } { required: true, message:'请输入圆心纵坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '圆心纵坐标'}, description: '圆心纵坐标'
{prop: 'r', label: '半径', type: types.Number, precision: 0, step:1, }, {
prop: 'r',
label: '半径',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入半径', trigger: 'blur' } { required: true, message:'请输入半径', trigger: 'blur' }
], ],
value: 20, value: 40,
description: '半径'}, description: '半径'
{prop: 'n', label: '边数', type: types.Number, precision: 0, step:1, }, {
prop: 'n',
label: '边数',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入边数', trigger: 'blur' } { required: true, message:'请输入边数', trigger: 'blur' }
], ],
value: 20, value: 5,
description: '边数'} description: '边数'
}
] ]
} }
}, },
@ -246,36 +329,57 @@ export const elementConst = {
rules:[ rules:[
{ required: true, message:'请输入填充样式', trigger: 'blur' } { required: true, message:'请输入填充样式', trigger: 'blur' }
], ],
value: '', value: '#fff',
description: '填充样式。' description: '填充样式。'
}, },
...form2ShapeStyle ...form2ShapeStyle
], ],
shape:[ shape:[
{prop: 'cx', label: '圆心横坐标', type: types.Number, precision: 0, step:1, {
prop: 'cx',
label: '圆心横坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入圆心横坐标', trigger: 'blur' } { required: true, message:'请输入圆心横坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '圆心横坐标'}, description: '圆心横坐标'
{prop: 'cy', label: '圆心纵坐标', type: types.Number, precision: 0, step:1, }, {
prop: 'cy',
label: '圆心纵坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入圆心纵坐标', trigger: 'blur' } { required: true, message:'请输入圆心纵坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '圆心纵坐标'}, description: '圆心纵坐标'
{prop: 'rx', label: '横向半径', type: types.Number, precision: 0, step:1, }, {
prop: 'rx',
label: '横向半径',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入横向半径', trigger: 'blur' } { required: true, message:'请输入横向半径', trigger: 'blur' }
], ],
value: 20, value: 50,
description: '横向半径'}, description: '横向半径'
{prop: 'ry', label: '纵向半径', type: types.Number, precision: 0, step:1, }, {
prop: 'ry',
label: '纵向半径',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入纵向半径', trigger: 'blur' } { required: true, message:'请输入纵向半径', trigger: 'blur' }
], ],
value: 20, value: 50,
description: '纵向半径'} description: '纵向半径'
}
] ]
} }
}, },
@ -287,37 +391,62 @@ export const elementConst = {
...form2ShapeStyle ...form2ShapeStyle
], ],
shape: [ shape: [
{prop: 'cx', label: '圆心横坐标', type: types.Number, precision: 0, step:1, {
prop: 'cx',
label: '圆心横坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入圆心横坐标', trigger: 'blur' } { required: true, message:'请输入圆心横坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '圆心横坐标'}, description: '圆心横坐标'
{prop: 'cy', label: '圆心纵坐标', type: types.Number, precision: 0, step:1, }, {
prop: 'cy',
label: '圆心纵坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入圆心纵坐标', trigger: 'blur' } { required: true, message:'请输入圆心纵坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '圆心纵坐标'}, description: '圆心纵坐标'
{prop: 'r', label: '半径', type: types.Number, precision: 0, step:1, }, {
prop: 'r',
label: '半径',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入半径', trigger: 'blur' } { required: true, message:'请输入半径', trigger: 'blur' }
], ],
value: 20, value: 50,
description: '半径'}, description: '半径'
{prop: 'startAngle', label: '起始弧度', type: types.Number, precision: 0, step:1, }, {
prop: 'startAngle',
label: '起始弧度',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入起始弧度', trigger: 'blur' } { required: true, message:'请输入起始弧度', trigger: 'blur' }
], ],
value: 20, value: 50,
description: '起始弧度'}, description: '起始弧度'
{prop: 'endAngle', label: '终止弧度', type: types.Number, precision: 0, step:1, }, {
prop: 'endAngle',
label: '终止弧度',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入终止弧度', trigger: 'blur' } { required: true, message:'请输入终止弧度', trigger: 'blur' }
], ],
value: 20, value: 50,
description: '终止弧度'}, description: '终止弧度'
{ }, {
prop: 'clockwise', prop: 'clockwise',
label: '顺时针方向', label: '顺时针方向',
type: types.Boolean, type: types.Boolean,
@ -342,49 +471,76 @@ export const elementConst = {
rules:[ rules:[
{ required: true, message:'请输入填充样式', trigger: 'blur' } { required: true, message:'请输入填充样式', trigger: 'blur' }
], ],
value: '', value: '#fff',
description: '填充样式。' description: '填充样式。'
}, },
...form2ShapeStyle ...form2ShapeStyle
], ],
shape: [ shape: [
{prop: 'cx', label: '圆心横坐标', type: types.Number, precision: 0, step:1, {
prop:
'cx', label: '圆心横坐标', type: types.Number, precision: 0, step:1,
rules:[ rules:[
{ required: true, message:'请输入圆心横坐标', trigger: 'blur' } { required: true, message:'请输入圆心横坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '圆心横坐标'}, description: '圆心横坐标'
{prop: 'cy', label: '圆心纵坐标', type: types.Number, precision: 0, step:1, }, {
prop: 'cy',
label: '圆心纵坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入圆心纵坐标', trigger: 'blur' } { required: true, message:'请输入圆心纵坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '圆心纵坐标'}, description: '圆心纵坐标'
{prop: 'r', label: '半径', type: types.Number, precision: 0, step:1, }, {
prop: 'r',
label: '半径',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入半径', trigger: 'blur' } { required: true, message:'请输入半径', trigger: 'blur' }
], ],
value: 20, value: 50,
description: '半径'}, description: '半径'
{prop: 'r0', label: '内半径', type: types.Number, precision: 0, step:1, }, {
prop: 'r0',
label: '内半径',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入内半径', trigger: 'blur' } { required: true, message:'请输入内半径', trigger: 'blur' }
], ],
value: 20, value: 50,
description: '内半径'}, description: '内半径'
{prop: 'startAngle', label: '起始弧度', type: types.Number, precision: 0, step:1, }, {
prop: 'startAngle',
label: '起始弧度',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入起始弧度', trigger: 'blur' } { required: true, message:'请输入起始弧度', trigger: 'blur' }
], ],
value: 20, value: 50,
description: '起始弧度'}, description: '起始弧度'
{prop: 'endAngle', label: '终止弧度', type: types.Number, precision: 0, step:1, }, {
prop: 'endAngle',
label: '终止弧度',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入终止弧度', trigger: 'blur' } { required: true, message:'请输入终止弧度', trigger: 'blur' }
], ],
value: 20, value: 50,
description: '终止弧度'}, description: '终止弧度'
{ }, {
prop: 'clockwise', prop: 'clockwise',
label: '顺时针方向', label: '顺时针方向',
type: types.Boolean, type: types.Boolean,
@ -409,36 +565,57 @@ export const elementConst = {
rules:[ rules:[
{ required: true, message:'请输入填充样式', trigger: 'blur' } { required: true, message:'请输入填充样式', trigger: 'blur' }
], ],
value: '', value: '#fff',
description: '填充样式。' description: '填充样式。'
}, },
...form2ShapeStyle ...form2ShapeStyle
], ],
shape: [ shape: [
{prop: 'cx', label: '圆心横坐标', type: types.Number, precision: 0, step:1, {
prop: 'cx',
label: '圆心横坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入圆心横坐标', trigger: 'blur' } { required: true, message:'请输入圆心横坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '圆心横坐标'}, description: '圆心横坐标'
{prop: 'cy', label: '圆心纵坐标', type: types.Number, precision: 0, step:1, }, {
prop: 'cy',
label: '圆心纵坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入圆心纵坐标', trigger: 'blur' } { required: true, message:'请输入圆心纵坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '圆心纵坐标'}, description: '圆心纵坐标'
{prop: 'width', label: '宽度', type: types.Number, precision: 0, step:1, }, {
prop: 'width',
label: '宽度',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入宽度', trigger: 'blur' } { required: true, message:'请输入宽度', trigger: 'blur' }
], ],
value: 50, value: 50,
description: '宽度'}, description: '宽度'
{prop: 'height', label: '高度', type: types.Number, precision: 0, step:1, }, {
prop: 'height',
label: '高度',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入高度', trigger: 'blur' } { required: true, message:'请输入高度', trigger: 'blur' }
], ],
value: 50, value: 50,
description: '高度'} description: '高度'
}
] ]
} }
}, },
@ -454,36 +631,57 @@ export const elementConst = {
rules:[ rules:[
{ required: true, message:'请输入填充样式', trigger: 'blur' } { required: true, message:'请输入填充样式', trigger: 'blur' }
], ],
value: '', value: '#fff',
description: '填充样式。' description: '填充样式。'
}, },
...form2ShapeStyle ...form2ShapeStyle
], ],
shape: [ shape: [
{prop: 'cx', label: '圆心横坐标', type: types.Number, precision: 0, step:1, {
prop: 'cx',
label: '圆心横坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入圆心横坐标', trigger: 'blur' } { required: true, message:'请输入圆心横坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '圆心横坐标'}, description: '圆心横坐标'},
{prop: 'cy', label: '圆心纵坐标', type: types.Number, precision: 0, step:1, {
prop: 'cy',
label: '圆心纵坐标',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入圆心纵坐标', trigger: 'blur' } { required: true, message:'请输入圆心纵坐标', trigger: 'blur' }
], ],
value: 10, value: 10,
description: '圆心纵坐标'}, description: '圆心纵坐标'
{prop: 'width', label: '宽度', type: types.Number, precision: 0, step:1, }, {
prop: 'width',
label: '宽度',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入宽度', trigger: 'blur' } { required: true, message:'请输入宽度', trigger: 'blur' }
], ],
value: 50, value: 50,
description: '宽度'}, description: '宽度'
{prop: 'height', label: '高度', type: types.Number, precision: 0, step:1, }, {
prop: 'height',
label: '高度',
type: types.Number,
precision: 0,
step:1,
rules:[ rules:[
{ required: true, message:'请输入高度', trigger: 'blur' } { required: true, message:'请输入高度', trigger: 'blur' }
], ],
value: 50, value: 50,
description: '高度'} description: '高度'
}
] ]
} }
} }