|
@@ -114,6 +114,7 @@
|
|
|
@change='treeConfirm'
|
|
|
@focusChange='focusChange'
|
|
|
:hideClear='true'
|
|
|
+ :selectedIds='selectedIds'
|
|
|
/>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -146,9 +147,8 @@ export default {
|
|
|
label: '线条'
|
|
|
}
|
|
|
],
|
|
|
- options1: [],
|
|
|
- options2: [],
|
|
|
|
|
|
+ selectedIds: [],
|
|
|
borderLineOption: [
|
|
|
{
|
|
|
id: 'solid',
|
|
@@ -231,6 +231,11 @@ export default {
|
|
|
},
|
|
|
create() {
|
|
|
//新增
|
|
|
+ if (this.ruleForm.FillColor.indexOf('#') > -1) {
|
|
|
+ this.ruleForm.FillColor = this.ruleForm.FillColor
|
|
|
+ } else {
|
|
|
+ this.ruleForm.FillColor = this.hexify(this.ruleForm.FillColor)
|
|
|
+ }
|
|
|
let postParams = {
|
|
|
Content: [this.ruleForm]
|
|
|
}
|
|
@@ -246,6 +251,11 @@ export default {
|
|
|
},
|
|
|
update() {
|
|
|
//修改
|
|
|
+ if (this.ruleForm.FillColor.indexOf('#') > -1) {
|
|
|
+ this.ruleForm.FillColor = this.ruleForm.FillColor
|
|
|
+ } else {
|
|
|
+ this.ruleForm.FillColor = this.hexify(this.ruleForm.FillColor)
|
|
|
+ }
|
|
|
let postParams = {
|
|
|
Content: [this.ruleForm]
|
|
|
}
|
|
@@ -284,16 +294,92 @@ export default {
|
|
|
},
|
|
|
//rgba转成16进制
|
|
|
hexify(color) {
|
|
|
- var values = color
|
|
|
- .replace(/rgba?\(/, '')
|
|
|
- .replace(/\)/, '')
|
|
|
- .replace(/[\s+]/g, '')
|
|
|
- .split(',')
|
|
|
- var a = parseFloat(values[3] || 1),
|
|
|
- r = Math.floor(a * parseInt(values[0]) + (1 - a) * 255),
|
|
|
- g = Math.floor(a * parseInt(values[1]) + (1 - a) * 255),
|
|
|
- b = Math.floor(a * parseInt(values[2]) + (1 - a) * 255)
|
|
|
- return '#' + ('0' + r.toString(16)).slice(-2) + ('0' + g.toString(16)).slice(-2) + ('0' + b.toString(16)).slice(-2)
|
|
|
+ console.log(color, 'color')
|
|
|
+ // var values = color
|
|
|
+ // .replace(/rgba?\(/, '')
|
|
|
+ // .replace(/\)/, '')
|
|
|
+ // .replace(/[\s+]/g, '')
|
|
|
+ // .split(',')
|
|
|
+ // var a = parseFloat(values[3] || 1),
|
|
|
+ // r = Math.floor(a * parseInt(values[0]) + (1 - a) * 255),
|
|
|
+ // g = Math.floor(a * parseInt(values[1]) + (1 - a) * 255),
|
|
|
+ // b = Math.floor(a * parseInt(values[2]) + (1 - a) * 255),
|
|
|
+ // opacity = ''
|
|
|
+ var opacity = ''
|
|
|
+ var rgb = color.split(',')
|
|
|
+ var r = parseInt(rgb[0].split('(')[1])
|
|
|
+ var g = parseInt(rgb[1])
|
|
|
+ var b = parseInt(rgb[2].split(')')[0])
|
|
|
+ switch (parseFloat(rgb[3] || 1) + '') {
|
|
|
+ case '0':
|
|
|
+ opacity = '00'
|
|
|
+ break
|
|
|
+ case '0.05':
|
|
|
+ opacity = '0C'
|
|
|
+ break
|
|
|
+ case '0.1':
|
|
|
+ opacity = '19'
|
|
|
+ break
|
|
|
+ case '0.15':
|
|
|
+ opacity = '26'
|
|
|
+ break
|
|
|
+ case '0.2':
|
|
|
+ opacity = '33'
|
|
|
+ break
|
|
|
+ case '0.25':
|
|
|
+ opacity = '3F'
|
|
|
+ break
|
|
|
+ case '0.3':
|
|
|
+ opacity = '4C'
|
|
|
+ break
|
|
|
+ case '0.35':
|
|
|
+ opacity = '59'
|
|
|
+ break
|
|
|
+ case '0.4':
|
|
|
+ opacity = '66'
|
|
|
+ break
|
|
|
+ case '0.45':
|
|
|
+ opacity = '72'
|
|
|
+ break
|
|
|
+ case '0.5':
|
|
|
+ opacity = '7F'
|
|
|
+ break
|
|
|
+ case '0.55':
|
|
|
+ opacity = '8C'
|
|
|
+ break
|
|
|
+ case '0.6':
|
|
|
+ opacity = '99'
|
|
|
+ break
|
|
|
+ case '0.65':
|
|
|
+ opacity = 'A5'
|
|
|
+ break
|
|
|
+ case '0.7':
|
|
|
+ opacity = 'B2'
|
|
|
+ break
|
|
|
+ case '0.75':
|
|
|
+ opacity = 'BF'
|
|
|
+ break
|
|
|
+ case '0.8':
|
|
|
+ opacity = 'CC'
|
|
|
+ break
|
|
|
+ case '0.85':
|
|
|
+ opacity = 'D8'
|
|
|
+ break
|
|
|
+ case '0.9':
|
|
|
+ opacity = 'E5'
|
|
|
+ break
|
|
|
+ case '0.95':
|
|
|
+ opacity = 'F2'
|
|
|
+ break
|
|
|
+ case '1':
|
|
|
+ opacity = 'FF'
|
|
|
+ break
|
|
|
+ }
|
|
|
+ var hex = '#' + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1) + opacity
|
|
|
+ console.log(hex, 'hrc')
|
|
|
+ return hex
|
|
|
+
|
|
|
+ // return '#' + ('0' + r.toString(16)).slice(-2) + ('0' + g.toString(16)).slice(-2) + ('0' + b.toString(16)).slice(-2) + opacity
|
|
|
},
|
|
|
// 背景颜色改变
|
|
|
changBgColor(val) {
|