diff --git a/src/Draw/drawPolygon.js b/src/Draw/drawPolygon.js index 84cbb9f..af9780a 100644 --- a/src/Draw/drawPolygon.js +++ b/src/Draw/drawPolygon.js @@ -13,6 +13,7 @@ class DrawPolygon extends Draw { * */ constructor(sdk, options = {}) { super(sdk, options) + this.color = options.color || 'rgba(255,0,0,0.5)' this.polygonHasCreated = false } @@ -34,8 +35,8 @@ class DrawPolygon extends Draw { positions: new Cesium.CallbackProperty((e) => { return that.positions.concat(that.positions[0]) }), - width: 2, - material: Cesium.Color.fromCssColorString('#c1c505').withAlpha(0.5), + width: 3, + material: Cesium.Color.fromCssColorString(that.color).withAlpha(1), clampToGround: true, zIndex: 99999999 }, diff --git a/src/Obj/Base/CircleDiffuse/index.js b/src/Obj/Base/CircleDiffuse/index.js index be4646d..92b2cfd 100644 --- a/src/Obj/Base/CircleDiffuse/index.js +++ b/src/Obj/Base/CircleDiffuse/index.js @@ -362,6 +362,7 @@ class CircleDiffuse extends Base { return this.options.circle } set circle(v) { + console.log(v) this.options.circle = v || [{ radius: 10 }] for (let i = 0; i < this.options.circle.length; i++) { if(this.options.circle[i].radius>999999) { @@ -1405,7 +1406,7 @@ class CircleDiffuse extends Base { } } this._radius = radius - inputElm.value = value + // inputElm.value = value CircleDiffuse.create(this) } } diff --git a/src/Obj/Base/CurvelineObject/index.js b/src/Obj/Base/CurvelineObject/index.js index 0c8bf41..df5c8e3 100644 --- a/src/Obj/Base/CurvelineObject/index.js +++ b/src/Obj/Base/CurvelineObject/index.js @@ -62,7 +62,7 @@ class CurvelineObject extends Base { options['extend-width'] || options['extend-width'] === 0 ? options['extend-width'] : 10 - this.options['extend-color'] = options['extend-color'] || 'rgba(255,222,0,0.3)' + this.options['extend-color'] = options['extend-color'] || 'rgba(255,255,80,0.3)' this.options.show = options.show || options.show === false ? options.show : true this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2 diff --git a/src/Obj/Base/PolylineObject/index.js b/src/Obj/Base/PolylineObject/index.js index 51d022f..092b41b 100644 --- a/src/Obj/Base/PolylineObject/index.js +++ b/src/Obj/Base/PolylineObject/index.js @@ -33,7 +33,7 @@ class PolylineObject extends Base { * @param options.smooth=false {boolean} 线段圆滑 * @param options.extend=false {boolean} 线缓冲 * @param options['extend-width']=10 {number} 线缓冲宽度 - * @param options['extend-color']=rgba(255,222,0,0.5) {number} 线缓冲颜色 + * @param options['extend-color']=rgba(255,255,80,0.3) {number} 线缓冲颜色 * @param options.show=true {boolean} 显隐 * @param {Array.} options.positions 坐标数组 [{lng,lat},...] * @param options.label {object} 标注 @@ -70,7 +70,7 @@ class PolylineObject extends Base { options['extend-width'] || options['extend-width'] === 0 ? options['extend-width'] : 10 - this.options['extend-color'] = options['extend-color'] || 'rgba(255,222,0,0.3)' + this.options['extend-color'] = options['extend-color'] || 'rgba(255,255,80,0.3)' this.options.show = options.show || options.show === false ? options.show : true this.options.heightMode = (options.heightMode || options.heightMode == 0) ? options.heightMode : 2 diff --git a/static/custom/css/index.css b/static/custom/css/index.css index ec8178e..193d824 100644 --- a/static/custom/css/index.css +++ b/static/custom/css/index.css @@ -2123,6 +2123,9 @@ .YJ-custom-base-dialog.particle-effects>.content .row>.col { width: 200px; } +.YJ-custom-base-dialog.particle-effects>.content .ew-color-picker .row>.col { + width: auto; +} .YJ-custom-base-dialog.particle-effects>.content [type="range"] { margin-top: 10px;