|
@@ -2040,8 +2040,8 @@
|
|
|
</div>
|
|
|
<div class="modal-body">
|
|
|
<input class="form-control form-control-sm mb-1" type="text" id="map-name" value="" placeholder="请输入路线名称">
|
|
|
- <div id="map-color-select" class="input-group mb-1" title="Using input value">
|
|
|
- <input id="map-color" type="text" class="form-control form-control-sm" />
|
|
|
+ <div id="map-color-select" class="input-group mb-1">
|
|
|
+ <input id="map-color" type="text" class="form-control form-control-sm" style="height: 30px" />
|
|
|
<span class="input-group-append"><span class="input-group-text colorpicker-input-addon"><i></i></span></span>
|
|
|
</div>
|
|
|
<!--<input class="form-control form-control-sm mb-1" type="text" id="map-color" value="#ff0000" placeholder="请选择路线颜色">-->
|
|
@@ -2153,6 +2153,27 @@
|
|
|
$('#bd-set-11-1').modal('show');
|
|
|
});
|
|
|
});
|
|
|
+ $('#map-color-select').colorpicker({
|
|
|
+ // container: true,
|
|
|
+ color: '#ff0000',
|
|
|
+ useAlpha: false,
|
|
|
+ extensions: [
|
|
|
+ {
|
|
|
+ name: 'swatches', // extension name to load
|
|
|
+ options: { // extension options
|
|
|
+ colors: {
|
|
|
+ '#ffffff': '#ffffff',
|
|
|
+ '#337ab7': '#337ab7',
|
|
|
+ '#5cb85c': '#5cb85c',
|
|
|
+ '#5bc0de': '#5bc0de',
|
|
|
+ '#f0ad4e': '#f0ad4e',
|
|
|
+ '#d9534f': '#d9534f'
|
|
|
+ },
|
|
|
+ namesAsValues: true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ });
|
|
|
const mapSpread = SpreadJsObj.createNewSpread($('#map-spread')[0]);
|
|
|
const mapSpreadSetting = {
|
|
|
cols: [
|
|
@@ -2176,8 +2197,8 @@
|
|
|
const mapInfo = _.find(tenderMapList, { id });
|
|
|
$('#map-name').val(mapInfo.name);
|
|
|
$('#map-color').val(mapInfo.color);
|
|
|
- console.log(mapInfo.color);
|
|
|
- $('#map-color-select').colorpicker({"color": mapInfo.color});
|
|
|
+ $('#map-color').attr('value', mapInfo.color);
|
|
|
+ $('#map-color-select').colorpicker("setValue", mapInfo.color);
|
|
|
SpreadJsObj.loadSheetData(mapSpread.getActiveSheet(), SpreadJsObj.DataType.Data, (mapInfo.map_json ? JSON.parse(unescape(escape(mapInfo.map_json))) : []));
|
|
|
});
|
|
|
const xPattern = /^-?(\d{1,2}(\.\d{1,8})?|1[0-7]\d(\.\d{1,8})?|180)$/;
|