@kq_npm/client3d_webgl_vue 0.6.3-beta → 0.6.5-beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/adddata/index.js +5 -1
  2. package/index.js +93 -97
  3. package/package.json +1 -1
  4. package/scenceview/index.js +69 -15
  5. package/sightlineanalysis/index.js +19 -81
package/adddata/index.js CHANGED
@@ -587,7 +587,11 @@ class AddDataViewModel {
587
587
  let mapServerInfo = (0,util_namespaceObject.formatKQMapInfo)(mapInfo, serverUrl, serverName, token, null, true);
588
588
  let showLayers = [];
589
589
  showLayers = showLayers.concat(mapServerInfo.layers_show);
590
- showLayers.reverse();
590
+ showLayers.reverse(); //获取图层筛选类型时用
591
+
592
+ showLayers.forEach(layer => {
593
+ layer.sourceType = 'kqserver';
594
+ });
591
595
  this._layerManager._layerListData = this._layerManager._layerListData.concat(showLayers);
592
596
  showLayers.forEach(layer => {
593
597
  var imageryProvider = new Cesium.Kq3dKQGISMapServerImageryProviderExt({
package/index.js CHANGED
@@ -1156,16 +1156,17 @@ class LayerManager {
1156
1156
  if (layerData.sourceType === "kqserver") {
1157
1157
  if (!layerData.renderType || layerData.renderType === "rest") {
1158
1158
  type = "kqgismapserver";
1159
- layerData.token = source.token; //记录数据源里所有图层信息
1160
-
1161
- layerData.sourceLayers = source.mapServerInfo.layers_show;
1159
+ layerData.token = source.token;
1162
1160
  } else {
1163
1161
  layerData.url += "/" + layerData.renderType;
1164
1162
 
1165
1163
  if (source.token) {
1166
1164
  layerData.url += "?ua_token=" + source.token;
1167
1165
  }
1168
- }
1166
+ } //记录数据源里所有图层信息
1167
+
1168
+
1169
+ layerData.sourceLayers = source.mapServerInfo.layers_show;
1169
1170
  } else if (layerData.sourceType === "arcserver") {
1170
1171
  if (!layerData.renderType || layerData.renderType === "rest") {
1171
1172
  type = "arcgismapserver";
@@ -1455,7 +1456,21 @@ class LayerManager {
1455
1456
  var layers = group._addedLayers || group._layers;
1456
1457
 
1457
1458
  if (layers && layers.length > 0) {
1458
- //layerData.guid = layers[0].guid;
1459
+ //如果是kqserver类型，记录服务返回的图层信息
1460
+ if (layerData.sourceLayers) {
1461
+ var layerInfo = layerData.sourceLayers.find(item => {
1462
+ return item.id + "" == layerData.id + "";
1463
+ });
1464
+
1465
+ if (layerInfo) {
1466
+ for (var key in layerInfo) {
1467
+ if (!layerData[key]) {
1468
+ layerData[key] = layerInfo[key];
1469
+ }
1470
+ }
1471
+ }
1472
+ }
1473
+
1459
1474
  layerData.guid = layerData.sourceName + "@@@" + layerData.id;
1460
1475
  this._guidMapping[layerData.guid] = layers[0].guid;
1461
1476
  layerData.name = name || layers[0].name;
@@ -1478,7 +1493,21 @@ class LayerManager {
1478
1493
  var layers = group._addedLayers || group._layers;
1479
1494
 
1480
1495
  if (layers && layers.length > 0) {
1481
- //layerData.guid = layers[0].guid;
1496
+ //如果是kqserver类型，记录服务返回的图层信息
1497
+ if (layerData.sourceLayers) {
1498
+ var layerInfo = layerData.sourceLayers.find(item => {
1499
+ return item.id + "" == layerData.id + "";
1500
+ });
1501
+
1502
+ if (layerInfo) {
1503
+ for (var key in layerInfo) {
1504
+ if (!layerData[key]) {
1505
+ layerData[key] = layerInfo[key];
1506
+ }
1507
+ }
1508
+ }
1509
+ }
1510
+
1482
1511
  layerData.guid = layerData.sourceName + "@@@" + layerData.id;
1483
1512
  this._guidMapping[layerData.guid] = layers[0].guid;
1484
1513
  layerData.name = name || layers[0].name;
@@ -1664,7 +1693,11 @@ class LayerManager {
1664
1693
  });
1665
1694
  let showLayers = [];
1666
1695
  showLayers = showLayers.concat(mapServerInfo.layers_show);
1667
- showLayers.reverse();
1696
+ showLayers.reverse(); //获取图层筛选类型时用
1697
+
1698
+ showLayers.forEach(layer => {
1699
+ layer.sourceType = 'kqserver';
1700
+ });
1668
1701
  that._layerListData = that._layerListData.concat(showLayers); // console.log(that._layerTreeData);
1669
1702
  // console.log(that._layerListData);
1670
1703
  // console.log(that._layerListData_old);
@@ -1938,30 +1971,51 @@ class LayerManager {
1938
1971
 
1939
1972
  getLayerTreeData() {
1940
1973
  return JSON.parse(JSON.stringify(this._layerTreeData));
1974
+ } //是否包含值
1975
+
1976
+
1977
+ _isContainValue(target, value) {
1978
+ let contain = false;
1979
+
1980
+ if (target) {
1981
+ if (typeof target === "string") {
1982
+ contain = target === value;
1983
+ } else if (target instanceof Array) {
1984
+ target.forEach(item => {
1985
+ if (item === value) {
1986
+ contain = true;
1987
+ }
1988
+ });
1989
+ }
1990
+ } else {
1991
+ contain = true;
1992
+ }
1993
+
1994
+ return contain;
1941
1995
  } //获取选中或未选中图层集合
1942
1996
 
1943
1997
 
1944
- getLayerCheckedList() {
1998
+ getLayerCheckedList(serverType) {
1945
1999
  let checkedLayers = [];
1946
2000
 
1947
2001
  this._layerListData.forEach(layer => {
1948
- if (layer.visible) {
2002
+ if (layer.visible && this._isContainValue(serverType, layer.sourceType)) {
1949
2003
  checkedLayers.push(layer);
1950
2004
  }
1951
- });
2005
+ }, this);
1952
2006
 
1953
2007
  return checkedLayers;
1954
2008
  } //获取选中图层key集合
1955
2009
 
1956
2010
 
1957
- getLayerCheckedListKey(isCheck = true) {
2011
+ getLayerCheckedListKey(isCheck = true, serverType) {
1958
2012
  let checkedKeys = [];
1959
2013
 
1960
2014
  this._layerListData.forEach(layer => {
1961
- if (layer.visible === isCheck) {
2015
+ if (layer.visible === isCheck && this._isContainValue(serverType, layer.sourceType)) {
1962
2016
  checkedKeys.push(layer.guid);
1963
2017
  }
1964
- });
2018
+ }, this);
1965
2019
 
1966
2020
  return checkedKeys;
1967
2021
  }
@@ -1970,9 +2024,9 @@ class LayerManager {
1970
2024
  */
1971
2025
 
1972
2026
 
1973
- getLayerDataByLayerChecked() {
2027
+ getLayerDataByLayerChecked(serverType) {
1974
2028
  let layerData = [];
1975
- const layers_checked = this.getLayerCheckedList();
2029
+ const layers_checked = this.getLayerCheckedList(serverType);
1976
2030
  const layers_old = this._layerListData_old;
1977
2031
 
1978
2032
  for (let i = 0; i < layers_checked.length; i++) {
@@ -6338,12 +6392,11 @@ class SightlineAnalysisViewModel {
6338
6392
 
6339
6393
  this._removeEventListener && this._removeEventListener();
6340
6394
  this._removeEventListener = null;
6341
- } //设置线宽
6342
-
6343
-
6344
- setLineWidth(lineWith) {
6345
- this._sightlineAnalysis.lineWith = Number(lineWith);
6346
- } //设置可视颜色
6395
+ } // //设置线宽
6396
+ // setLineWidth(lineWith) {
6397
+ // this._sightlineAnalysis.lineWith = Number(lineWith);
6398
+ // }
6399
+ //设置可视颜色
6347
6400
 
6348
6401
 
6349
6402
  setVisibleColor(visibleColor) {
@@ -6404,7 +6457,7 @@ const SightlineAnalysisvue_type_script_setup_true_lang_js_default_ = {
6404
6457
  let collapseValue = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(""); // 获取组件传参
6405
6458
 
6406
6459
  let formItem = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.reactive)({
6407
- lineWidth: props.settingParams && props.settingParams.lineWidth || 2,
6460
+ // lineWidth: (props.settingParams && props.settingParams.lineWidth) || 2,
6408
6461
  visibleColor: props.settingParams && props.settingParams.visibleColor || "#67c23a",
6409
6462
  invisibleColor: props.settingParams && props.settingParams.invisibleColor || "#e6a23c",
6410
6463
  obstacleColor: props.settingParams && props.settingParams.obstacleColor || "#F56C6C",
@@ -6432,10 +6485,9 @@ const SightlineAnalysisvue_type_script_setup_true_lang_js_default_ = {
6432
6485
 
6433
6486
  function paramsChanged(key) {
6434
6487
  switch (key) {
6435
- case "lineWidth":
6436
- viewModel.setLineWidth(formItem.lineWidth);
6437
- break;
6438
-
6488
+ // case "lineWidth":
6489
+ // viewModel.setLineWidth(formItem.lineWidth);
6490
+ // break;
6439
6491
  case "visibleColor":
6440
6492
  viewModel.setVisibleColor(formItem.visibleColor);
6441
6493
  break;
@@ -6485,16 +6537,10 @@ const SightlineAnalysisvue_type_script_setup_true_lang_js_default_ = {
6485
6537
  return (_ctx, _cache) => {
6486
6538
  const _component_kq_row = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-row");
6487
6539
 
6488
- const _component_kq_slider = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-slider");
6489
-
6490
- const _component_kq_col = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-col");
6491
-
6492
- const _component_kq_input_number = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-input-number");
6540
+ const _component_kq_color_picker = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-color-picker");
6493
6541
 
6494
6542
  const _component_kq_form_item = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-form-item");
6495
6543
 
6496
- const _component_kq_color_picker = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-color-picker");
6497
-
6498
6544
  const _component_kq_checkbox = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-checkbox");
6499
6545
 
6500
6546
  const _component_kq_form = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-form");
@@ -6525,68 +6571,14 @@ const SightlineAnalysisvue_type_script_setup_true_lang_js_default_ = {
6525
6571
  "label-width": "120px",
6526
6572
  "label-position": "left"
6527
6573
  }, {
6528
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, null, {
6529
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_form_item, {
6530
- label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).lineWidth
6531
- }, {
6532
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, {
6533
- style: {
6534
- "display": "flex"
6535
- }
6536
- }, {
6537
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_col, {
6538
- span: 16
6539
- }, {
6540
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_slider, {
6541
- modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).lineWidth,
6542
- "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).lineWidth = $event),
6543
- min: 1,
6544
- max: 10,
6545
- onInput: _cache[1] || (_cache[1] = $event => paramsChanged('lineWidth'))
6546
- }, null, 8
6547
- /* PROPS */
6548
- , ["modelValue"])]),
6549
- _: 1
6550
- /* STABLE */
6551
-
6552
- }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_col, {
6553
- span: 8
6554
- }, {
6555
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_input_number, {
6556
- modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).lineWidth,
6557
- "onUpdate:modelValue": _cache[2] || (_cache[2] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).lineWidth = $event),
6558
- min: 1,
6559
- max: 10,
6560
- "controls-position": "right",
6561
- onInput: _cache[3] || (_cache[3] = $event => paramsChanged('lineWidth'))
6562
- }, null, 8
6563
- /* PROPS */
6564
- , ["modelValue"])]),
6565
- _: 1
6566
- /* STABLE */
6567
-
6568
- })]),
6569
- _: 1
6570
- /* STABLE */
6571
-
6572
- })]),
6573
- _: 1
6574
- /* STABLE */
6575
-
6576
- }, 8
6577
- /* PROPS */
6578
- , ["label"])]),
6579
- _: 1
6580
- /* STABLE */
6581
-
6582
- }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, null, {
6574
+ default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)(" <kq-row>\r\n <kq-form-item :label=\"language.lineWidth\">\r\n <kq-row style=\"display: flex\">\r\n <kq-col :span=\"16\">\r\n <kq-slider v-model=\"formItem.lineWidth\" :min=\"1\" :max=\"10\" @input=\"paramsChanged('lineWidth')\"></kq-slider>\r\n </kq-col>\r\n <kq-col :span=\"8\">\r\n <kq-input-number v-model=\"formItem.lineWidth\" :min=\"1\" :max=\"10\" controls-position=\"right\" @input=\"paramsChanged('lineWidth')\">\r\n </kq-input-number>\r\n </kq-col>\r\n </kq-row>\r\n </kq-form-item>\r\n </kq-row> "), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, null, {
6583
6575
  default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_form_item, {
6584
6576
  label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).visibleColor
6585
6577
  }, {
6586
6578
  default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_color_picker, {
6587
6579
  modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).visibleColor,
6588
- "onUpdate:modelValue": _cache[4] || (_cache[4] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).visibleColor = $event),
6589
- onChange: _cache[5] || (_cache[5] = $event => paramsChanged('visibleColor'))
6580
+ "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).visibleColor = $event),
6581
+ onChange: _cache[1] || (_cache[1] = $event => paramsChanged('visibleColor'))
6590
6582
  }, null, 8
6591
6583
  /* PROPS */
6592
6584
  , ["modelValue"])]),
@@ -6605,8 +6597,8 @@ const SightlineAnalysisvue_type_script_setup_true_lang_js_default_ = {
6605
6597
  }, {
6606
6598
  default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_color_picker, {
6607
6599
  modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).invisibleColor,
6608
- "onUpdate:modelValue": _cache[6] || (_cache[6] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).invisibleColor = $event),
6609
- onChange: _cache[7] || (_cache[7] = $event => paramsChanged('invisibleColor'))
6600
+ "onUpdate:modelValue": _cache[2] || (_cache[2] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).invisibleColor = $event),
6601
+ onChange: _cache[3] || (_cache[3] = $event => paramsChanged('invisibleColor'))
6610
6602
  }, null, 8
6611
6603
  /* PROPS */
6612
6604
  , ["modelValue"])]),
@@ -6625,8 +6617,8 @@ const SightlineAnalysisvue_type_script_setup_true_lang_js_default_ = {
6625
6617
  }, {
6626
6618
  default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_color_picker, {
6627
6619
  modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).obstacleColor,
6628
- "onUpdate:modelValue": _cache[8] || (_cache[8] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).obstacleColor = $event),
6629
- onChange: _cache[9] || (_cache[9] = $event => paramsChanged('obstacleColor'))
6620
+ "onUpdate:modelValue": _cache[4] || (_cache[4] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).obstacleColor = $event),
6621
+ onChange: _cache[5] || (_cache[5] = $event => paramsChanged('obstacleColor'))
6630
6622
  }, null, 8
6631
6623
  /* PROPS */
6632
6624
  , ["modelValue"])]),
@@ -6642,8 +6634,8 @@ const SightlineAnalysisvue_type_script_setup_true_lang_js_default_ = {
6642
6634
  }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)(" <kq-row style=\"display: flex\">\r\n <kq-col :span=\"12\">\r\n <kq-checkbox v-model=\"formItem.obstaclePoint\">{{ language.obstaclePoint }}</kq-checkbox>\r\n </kq-col>\r\n <kq-col :span=\"12\">\r\n <kq-checkbox v-model=\"formItem.highlightObstacle\">{{ language.highlightObstacle }}</kq-checkbox>\r\n </kq-col>\r\n </kq-row> "), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, null, {
6643
6635
  default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_checkbox, {
6644
6636
  modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).isLabel,
6645
- "onUpdate:modelValue": _cache[10] || (_cache[10] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).isLabel = $event),
6646
- onChange: _cache[11] || (_cache[11] = $event => paramsChanged('isLabel'))
6637
+ "onUpdate:modelValue": _cache[6] || (_cache[6] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).isLabel = $event),
6638
+ onChange: _cache[7] || (_cache[7] = $event => paramsChanged('isLabel'))
6647
6639
  }, {
6648
6640
  default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createTextVNode)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).showLabel), 1
6649
6641
  /* TEXT */
@@ -17046,7 +17038,11 @@ class AddDataViewModel {
17046
17038
  let mapServerInfo = (0,util_namespaceObject.formatKQMapInfo)(mapInfo, serverUrl, serverName, token, null, true);
17047
17039
  let showLayers = [];
17048
17040
  showLayers = showLayers.concat(mapServerInfo.layers_show);
17049
- showLayers.reverse();
17041
+ showLayers.reverse(); //获取图层筛选类型时用
17042
+
17043
+ showLayers.forEach(layer => {
17044
+ layer.sourceType = 'kqserver';
17045
+ });
17050
17046
  this._layerManager._layerListData = this._layerManager._layerListData.concat(showLayers);
17051
17047
  showLayers.forEach(layer => {
17052
17048
  var imageryProvider = new Cesium.Kq3dKQGISMapServerImageryProviderExt({
package/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.6.3-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"^9.2.0-beta.36","xlsx":"^0.18.5","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}
1
+ {"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.6.5-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"^9.2.0-beta.36","xlsx":"^0.18.5","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.8","xe-utils":"^3.5.4"}}
package/scenceview/index.js CHANGED
@@ -703,16 +703,17 @@ class LayerManager {
703
703
  if (layerData.sourceType === "kqserver") {
704
704
  if (!layerData.renderType || layerData.renderType === "rest") {
705
705
  type = "kqgismapserver";
706
- layerData.token = source.token; //记录数据源里所有图层信息
707
-
708
- layerData.sourceLayers = source.mapServerInfo.layers_show;
706
+ layerData.token = source.token;
709
707
  } else {
710
708
  layerData.url += "/" + layerData.renderType;
711
709
 
712
710
  if (source.token) {
713
711
  layerData.url += "?ua_token=" + source.token;
714
712
  }
715
- }
713
+ } //记录数据源里所有图层信息
714
+
715
+
716
+ layerData.sourceLayers = source.mapServerInfo.layers_show;
716
717
  } else if (layerData.sourceType === "arcserver") {
717
718
  if (!layerData.renderType || layerData.renderType === "rest") {
718
719
  type = "arcgismapserver";
@@ -1002,7 +1003,21 @@ class LayerManager {
1002
1003
  var layers = group._addedLayers || group._layers;
1003
1004
 
1004
1005
  if (layers && layers.length > 0) {
1005
- //layerData.guid = layers[0].guid;
1006
+ //如果是kqserver类型，记录服务返回的图层信息
1007
+ if (layerData.sourceLayers) {
1008
+ var layerInfo = layerData.sourceLayers.find(item => {
1009
+ return item.id + "" == layerData.id + "";
1010
+ });
1011
+
1012
+ if (layerInfo) {
1013
+ for (var key in layerInfo) {
1014
+ if (!layerData[key]) {
1015
+ layerData[key] = layerInfo[key];
1016
+ }
1017
+ }
1018
+ }
1019
+ }
1020
+
1006
1021
  layerData.guid = layerData.sourceName + "@@@" + layerData.id;
1007
1022
  this._guidMapping[layerData.guid] = layers[0].guid;
1008
1023
  layerData.name = name || layers[0].name;
@@ -1025,7 +1040,21 @@ class LayerManager {
1025
1040
  var layers = group._addedLayers || group._layers;
1026
1041
 
1027
1042
  if (layers && layers.length > 0) {
1028
- //layerData.guid = layers[0].guid;
1043
+ //如果是kqserver类型，记录服务返回的图层信息
1044
+ if (layerData.sourceLayers) {
1045
+ var layerInfo = layerData.sourceLayers.find(item => {
1046
+ return item.id + "" == layerData.id + "";
1047
+ });
1048
+
1049
+ if (layerInfo) {
1050
+ for (var key in layerInfo) {
1051
+ if (!layerData[key]) {
1052
+ layerData[key] = layerInfo[key];
1053
+ }
1054
+ }
1055
+ }
1056
+ }
1057
+
1029
1058
  layerData.guid = layerData.sourceName + "@@@" + layerData.id;
1030
1059
  this._guidMapping[layerData.guid] = layers[0].guid;
1031
1060
  layerData.name = name || layers[0].name;
@@ -1211,7 +1240,11 @@ class LayerManager {
1211
1240
  });
1212
1241
  let showLayers = [];
1213
1242
  showLayers = showLayers.concat(mapServerInfo.layers_show);
1214
- showLayers.reverse();
1243
+ showLayers.reverse(); //获取图层筛选类型时用
1244
+
1245
+ showLayers.forEach(layer => {
1246
+ layer.sourceType = 'kqserver';
1247
+ });
1215
1248
  that._layerListData = that._layerListData.concat(showLayers); // console.log(that._layerTreeData);
1216
1249
  // console.log(that._layerListData);
1217
1250
  // console.log(that._layerListData_old);
@@ -1485,30 +1518,51 @@ class LayerManager {
1485
1518
 
1486
1519
  getLayerTreeData() {
1487
1520
  return JSON.parse(JSON.stringify(this._layerTreeData));
1521
+ } //是否包含值
1522
+
1523
+
1524
+ _isContainValue(target, value) {
1525
+ let contain = false;
1526
+
1527
+ if (target) {
1528
+ if (typeof target === "string") {
1529
+ contain = target === value;
1530
+ } else if (target instanceof Array) {
1531
+ target.forEach(item => {
1532
+ if (item === value) {
1533
+ contain = true;
1534
+ }
1535
+ });
1536
+ }
1537
+ } else {
1538
+ contain = true;
1539
+ }
1540
+
1541
+ return contain;
1488
1542
  } //获取选中或未选中图层集合
1489
1543
 
1490
1544
 
1491
- getLayerCheckedList() {
1545
+ getLayerCheckedList(serverType) {
1492
1546
  let checkedLayers = [];
1493
1547
 
1494
1548
  this._layerListData.forEach(layer => {
1495
- if (layer.visible) {
1549
+ if (layer.visible && this._isContainValue(serverType, layer.sourceType)) {
1496
1550
  checkedLayers.push(layer);
1497
1551
  }
1498
- });
1552
+ }, this);
1499
1553
 
1500
1554
  return checkedLayers;
1501
1555
  } //获取选中图层key集合
1502
1556
 
1503
1557
 
1504
- getLayerCheckedListKey(isCheck = true) {
1558
+ getLayerCheckedListKey(isCheck = true, serverType) {
1505
1559
  let checkedKeys = [];
1506
1560
 
1507
1561
  this._layerListData.forEach(layer => {
1508
- if (layer.visible === isCheck) {
1562
+ if (layer.visible === isCheck && this._isContainValue(serverType, layer.sourceType)) {
1509
1563
  checkedKeys.push(layer.guid);
1510
1564
  }
1511
- });
1565
+ }, this);
1512
1566
 
1513
1567
  return checkedKeys;
1514
1568
  }
@@ -1517,9 +1571,9 @@ class LayerManager {
1517
1571
  */
1518
1572
 
1519
1573
 
1520
- getLayerDataByLayerChecked() {
1574
+ getLayerDataByLayerChecked(serverType) {
1521
1575
  let layerData = [];
1522
- const layers_checked = this.getLayerCheckedList();
1576
+ const layers_checked = this.getLayerCheckedList(serverType);
1523
1577
  const layers_old = this._layerListData_old;
1524
1578
 
1525
1579
  for (let i = 0; i < layers_checked.length; i++) {
package/sightlineanalysis/index.js CHANGED
@@ -706,12 +706,11 @@ class SightlineAnalysisViewModel {
706
706
 
707
707
  this._removeEventListener && this._removeEventListener();
708
708
  this._removeEventListener = null;
709
- } //设置线宽
710
-
711
-
712
- setLineWidth(lineWith) {
713
- this._sightlineAnalysis.lineWith = Number(lineWith);
714
- } //设置可视颜色
709
+ } // //设置线宽
710
+ // setLineWidth(lineWith) {
711
+ // this._sightlineAnalysis.lineWith = Number(lineWith);
712
+ // }
713
+ //设置可视颜色
715
714
 
716
715
 
717
716
  setVisibleColor(visibleColor) {
@@ -772,7 +771,7 @@ const __default__ = {
772
771
  let collapseValue = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(""); // 获取组件传参
773
772
 
774
773
  let formItem = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.reactive)({
775
- lineWidth: props.settingParams && props.settingParams.lineWidth || 2,
774
+ // lineWidth: (props.settingParams && props.settingParams.lineWidth) || 2,
776
775
  visibleColor: props.settingParams && props.settingParams.visibleColor || "#67c23a",
777
776
  invisibleColor: props.settingParams && props.settingParams.invisibleColor || "#e6a23c",
778
777
  obstacleColor: props.settingParams && props.settingParams.obstacleColor || "#F56C6C",
@@ -800,10 +799,9 @@ const __default__ = {
800
799
 
801
800
  function paramsChanged(key) {
802
801
  switch (key) {
803
- case "lineWidth":
804
- viewModel.setLineWidth(formItem.lineWidth);
805
- break;
806
-
802
+ // case "lineWidth":
803
+ // viewModel.setLineWidth(formItem.lineWidth);
804
+ // break;
807
805
  case "visibleColor":
808
806
  viewModel.setVisibleColor(formItem.visibleColor);
809
807
  break;
@@ -853,16 +851,10 @@ const __default__ = {
853
851
  return (_ctx, _cache) => {
854
852
  const _component_kq_row = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-row");
855
853
 
856
- const _component_kq_slider = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-slider");
857
-
858
- const _component_kq_col = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-col");
859
-
860
- const _component_kq_input_number = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-input-number");
854
+ const _component_kq_color_picker = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-color-picker");
861
855
 
862
856
  const _component_kq_form_item = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-form-item");
863
857
 
864
- const _component_kq_color_picker = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-color-picker");
865
-
866
858
  const _component_kq_checkbox = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-checkbox");
867
859
 
868
860
  const _component_kq_form = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-form");
@@ -893,68 +885,14 @@ const __default__ = {
893
885
  "label-width": "120px",
894
886
  "label-position": "left"
895
887
  }, {
896
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, null, {
897
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_form_item, {
898
- label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).lineWidth
899
- }, {
900
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, {
901
- style: {
902
- "display": "flex"
903
- }
904
- }, {
905
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_col, {
906
- span: 16
907
- }, {
908
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_slider, {
909
- modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).lineWidth,
910
- "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).lineWidth = $event),
911
- min: 1,
912
- max: 10,
913
- onInput: _cache[1] || (_cache[1] = $event => paramsChanged('lineWidth'))
914
- }, null, 8
915
- /* PROPS */
916
- , ["modelValue"])]),
917
- _: 1
918
- /* STABLE */
919
-
920
- }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_col, {
921
- span: 8
922
- }, {
923
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_input_number, {
924
- modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).lineWidth,
925
- "onUpdate:modelValue": _cache[2] || (_cache[2] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).lineWidth = $event),
926
- min: 1,
927
- max: 10,
928
- "controls-position": "right",
929
- onInput: _cache[3] || (_cache[3] = $event => paramsChanged('lineWidth'))
930
- }, null, 8
931
- /* PROPS */
932
- , ["modelValue"])]),
933
- _: 1
934
- /* STABLE */
935
-
936
- })]),
937
- _: 1
938
- /* STABLE */
939
-
940
- })]),
941
- _: 1
942
- /* STABLE */
943
-
944
- }, 8
945
- /* PROPS */
946
- , ["label"])]),
947
- _: 1
948
- /* STABLE */
949
-
950
- }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, null, {
888
+ default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)(" <kq-row>\r\n <kq-form-item :label=\"language.lineWidth\">\r\n <kq-row style=\"display: flex\">\r\n <kq-col :span=\"16\">\r\n <kq-slider v-model=\"formItem.lineWidth\" :min=\"1\" :max=\"10\" @input=\"paramsChanged('lineWidth')\"></kq-slider>\r\n </kq-col>\r\n <kq-col :span=\"8\">\r\n <kq-input-number v-model=\"formItem.lineWidth\" :min=\"1\" :max=\"10\" controls-position=\"right\" @input=\"paramsChanged('lineWidth')\">\r\n </kq-input-number>\r\n </kq-col>\r\n </kq-row>\r\n </kq-form-item>\r\n </kq-row> "), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, null, {
951
889
  default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_form_item, {
952
890
  label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).visibleColor
953
891
  }, {
954
892
  default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_color_picker, {
955
893
  modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).visibleColor,
956
- "onUpdate:modelValue": _cache[4] || (_cache[4] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).visibleColor = $event),
957
- onChange: _cache[5] || (_cache[5] = $event => paramsChanged('visibleColor'))
894
+ "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).visibleColor = $event),
895
+ onChange: _cache[1] || (_cache[1] = $event => paramsChanged('visibleColor'))
958
896
  }, null, 8
959
897
  /* PROPS */
960
898
  , ["modelValue"])]),
@@ -973,8 +911,8 @@ const __default__ = {
973
911
  }, {
974
912
  default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_color_picker, {
975
913
  modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).invisibleColor,
976
- "onUpdate:modelValue": _cache[6] || (_cache[6] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).invisibleColor = $event),
977
- onChange: _cache[7] || (_cache[7] = $event => paramsChanged('invisibleColor'))
914
+ "onUpdate:modelValue": _cache[2] || (_cache[2] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).invisibleColor = $event),
915
+ onChange: _cache[3] || (_cache[3] = $event => paramsChanged('invisibleColor'))
978
916
  }, null, 8
979
917
  /* PROPS */
980
918
  , ["modelValue"])]),
@@ -993,8 +931,8 @@ const __default__ = {
993
931
  }, {
994
932
  default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_color_picker, {
995
933
  modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).obstacleColor,
996
- "onUpdate:modelValue": _cache[8] || (_cache[8] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).obstacleColor = $event),
997
- onChange: _cache[9] || (_cache[9] = $event => paramsChanged('obstacleColor'))
934
+ "onUpdate:modelValue": _cache[4] || (_cache[4] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).obstacleColor = $event),
935
+ onChange: _cache[5] || (_cache[5] = $event => paramsChanged('obstacleColor'))
998
936
  }, null, 8
999
937
  /* PROPS */
1000
938
  , ["modelValue"])]),
@@ -1010,8 +948,8 @@ const __default__ = {
1010
948
  }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)(" <kq-row style=\"display: flex\">\r\n <kq-col :span=\"12\">\r\n <kq-checkbox v-model=\"formItem.obstaclePoint\">{{ language.obstaclePoint }}</kq-checkbox>\r\n </kq-col>\r\n <kq-col :span=\"12\">\r\n <kq-checkbox v-model=\"formItem.highlightObstacle\">{{ language.highlightObstacle }}</kq-checkbox>\r\n </kq-col>\r\n </kq-row> "), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, null, {
1011
949
  default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_checkbox, {
1012
950
  modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).isLabel,
1013
- "onUpdate:modelValue": _cache[10] || (_cache[10] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).isLabel = $event),
1014
- onChange: _cache[11] || (_cache[11] = $event => paramsChanged('isLabel'))
951
+ "onUpdate:modelValue": _cache[6] || (_cache[6] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).isLabel = $event),
952
+ onChange: _cache[7] || (_cache[7] = $event => paramsChanged('isLabel'))
1015
953
  }, {
1016
954
  default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createTextVNode)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).showLabel), 1
1017
955
  /* TEXT */