@kq_npm/client3d_webgl_vue 4.0.7-beta → 4.0.9-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.
package/adddata/index.js CHANGED
@@ -213,11 +213,15 @@ var util_ = __webpack_require__(9519);
213
213
  var message = __webpack_require__(1349);
214
214
  // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
215
215
  var const_image_ = __webpack_require__(9702);
216
+ ;// CONCATENATED MODULE: external "papaparse"
217
+ var external_papaparse_namespaceObject = require("papaparse");
218
+ var external_papaparse_default = /*#__PURE__*/__webpack_require__.n(external_papaparse_namespaceObject);
216
219
  ;// CONCATENATED MODULE: ./src/webgl/adddata/AddDataViewModel.js
217
220
 
218
221
 
219
222
 
220
223
 
224
+
221
225
  //添加数据逻辑类
222
226
 
223
227
  class AddDataViewModel {
@@ -241,13 +245,15 @@ class AddDataViewModel {
241
245
  style: Cesium.LabelStyle.FILL_AND_OUTLINE,
242
246
  eyeOffset: Cesium.Cartesian3.ZERO,
243
247
  pixelOffset: new Cesium.Cartesian2(0, -8),
244
- disableDepthTestDistance: Number.POSITIVE_INFINITY
248
+ disableDepthTestDistance: 10000000 // disableDepthTestDistance: Number.POSITIVE_INFINITY
249
+
245
250
  },
246
251
  billboard: {
247
252
  image: const_image_.BILLBOARD_IMAGE_URL,
248
253
  width: 12,
249
254
  height: 12,
250
- disableDepthTestDistance: Number.POSITIVE_INFINITY
255
+ disableDepthTestDistance: 10000000 // disableDepthTestDistance: Number.POSITIVE_INFINITY
256
+
251
257
  },
252
258
  polyline: {
253
259
  width: 2.0,
@@ -302,8 +308,7 @@ class AddDataViewModel {
302
308
  that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
303
309
 
304
310
 
305
- that._viewer.flyTo(ds);
306
-
311
+ that.flyToLayer(ds);
307
312
  resolve("success");
308
313
  var layer = {
309
314
  guid: ds.guid,
@@ -321,7 +326,7 @@ class AddDataViewModel {
321
326
  cb && cb(layer);
322
327
  });
323
328
  } else {
324
- reject(file.name + " service parse error.");
329
+ reject(file.name + " file parser error.");
325
330
  cb && cb("error");
326
331
  }
327
332
  });
@@ -344,8 +349,129 @@ class AddDataViewModel {
344
349
  that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
345
350
 
346
351
 
347
- that._viewer.flyTo(ds);
352
+ that.flyToLayer(ds);
353
+ resolve("success");
354
+ var layer = {
355
+ guid: ds.guid,
356
+ name: name,
357
+ visible: true,
358
+ serverType: "datasource",
359
+ lsType: "ls",
360
+ url: res,
361
+ addType: "geojson",
362
+ shapeType: that._layerManager.getShapeType(ds)
363
+ };
364
+
365
+ that._layerManager.addTempLayerNode(layer);
366
+
367
+ cb && cb(layer);
368
+ });
369
+ } else {
370
+ reject(file.name + " file parser error.");
371
+ cb && cb("error");
372
+ }
373
+ });
374
+ } else if (ext === "csv") {
375
+ (0,util_.readFile)(file, res => {
376
+ var features = external_papaparse_default().parse(res, {
377
+ skipEmptyLines: true,
378
+ header: true
379
+ }).data;
380
+ let _featureCollection = {
381
+ type: "FeatureCollection",
382
+ features: []
383
+ };
384
+
385
+ for (var i = 0; i < features.length; i++) {
386
+ let item = features[i];
387
+ let lat = null;
388
+ let lng = null;
389
+ let properties = {};
390
+
391
+ for (var j in item) {
392
+ if (j.toUpperCase().indexOf("LAT") != -1) {
393
+ lat = item[j];
394
+ } else if (j.toUpperCase().indexOf("LNG") != -1 || j.toUpperCase().indexOf("LON") != -1) {
395
+ lng = item[j];
396
+ } else if (j.toUpperCase() === "X") {
397
+ lat = item[j];
398
+ } else if (j.toUpperCase() === "Y") {
399
+ lng = item[j];
400
+ } else {
401
+ properties[j] = item[j];
402
+ }
403
+ } // 点数据
404
+
405
+
406
+ if (lat && lng) {
407
+ let _point = {
408
+ type: "Feature",
409
+ geometry: {
410
+ type: "Point",
411
+ coordinates: [Number(lng), Number(lat)]
412
+ },
413
+ properties: properties
414
+ };
415
+
416
+ _featureCollection.features.push(_point);
417
+ } else {}
418
+ }
419
+
420
+ if (_featureCollection.features.length > 0) {
421
+ var ds = new Cesium.Kq3dGeoJsonDataSource(name);
422
+ ds.load(_featureCollection, that._geojsonStyle).then(ds => {
423
+ ds.entities.values.forEach(entity => {
424
+ if (entity.polygon) {
425
+ entity.polyline = {
426
+ positions: entity.polygon.hierarchy._value.positions,
427
+ width: that._geojsonStyle.polygon.outlineWidth,
428
+ material: that._geojsonStyle.polygon.outlineColor
429
+ };
430
+ }
431
+ });
432
+
433
+ that._viewer.dataSources.add(ds);
434
+
435
+ that.flyToLayer(ds);
436
+ resolve("success");
437
+ var layer = {
438
+ guid: ds.guid,
439
+ name: name,
440
+ visible: true,
441
+ serverType: "datasource",
442
+ lsType: "ls",
443
+ url: _featureCollection,
444
+ addType: "geojson",
445
+ shapeType: that._layerManager.getShapeType(ds)
446
+ };
447
+
448
+ that._layerManager.addTempLayerNode(layer);
449
+
450
+ cb && cb(layer);
451
+ });
452
+ } else {
453
+ reject(file.name + " file parser error.");
454
+ cb && cb("error");
455
+ }
456
+ });
457
+ } else if (ext === "xls" || ext === "xlsx") {
458
+ (0,util_.readExcel)(file, this._language, res => {
459
+ if (res) {
460
+ var ds = new Cesium.Kq3dGeoJsonDataSource(name);
461
+ ds.load(res, that._geojsonStyle).then(ds => {
462
+ ds.entities.values.forEach(entity => {
463
+ if (entity.polygon) {
464
+ entity.polyline = {
465
+ positions: entity.polygon.hierarchy._value.positions,
466
+ width: that._geojsonStyle.polygon.outlineWidth,
467
+ material: that._geojsonStyle.polygon.outlineColor
468
+ };
469
+ }
470
+ });
471
+
472
+ that._viewer.dataSources.add(ds);
348
473
 
474
+ that.flyToLayer(ds);
349
475
  resolve("success");
350
476
  var layer = {
351
477
  guid: ds.guid,
@@ -363,7 +489,8 @@ class AddDataViewModel {
363
489
  cb && cb(layer);
364
490
  });
365
491
  } else {
366
- reject(file.name + " service parse error.");
492
+ reject(file.name + " file parser error.");
493
+ cb && cb("error");
367
494
  }
368
495
  });
369
496
  } else {
@@ -417,8 +544,7 @@ class AddDataViewModel {
417
544
  that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
418
545
 
419
546
 
420
- that._viewer.flyTo(ds);
421
-
547
+ that.flyToLayer(ds);
422
548
  resolve("success");
423
549
  var layer = {
424
550
  guid: ds.guid,
@@ -451,8 +577,7 @@ class AddDataViewModel {
451
577
  ds.load(data).then(ds => {
452
578
  that._viewer.dataSources.add(ds);
453
579
 
454
- that._viewer.flyTo(ds);
455
-
580
+ that.flyToLayer(ds);
456
581
  resolve("success");
457
582
  var layer = {
458
583
  guid: ds.guid,
@@ -480,8 +605,7 @@ class AddDataViewModel {
480
605
  ds.load(file).then(ds => {
481
606
  that._viewer.dataSources.add(ds);
482
607
 
483
- that._viewer.flyTo(ds);
484
-
608
+ that.flyToLayer(ds);
485
609
  resolve("success");
486
610
  var layer = {
487
611
  guid: ds.guid,
@@ -513,8 +637,7 @@ class AddDataViewModel {
513
637
  that._viewer.dataSources.add(Cesium.CzmlDataSource.load(ret, {
514
638
  name: name
515
639
  })).then(ds => {
516
- that._viewer.flyTo(ds);
517
-
640
+ that.flyToLayer(ds);
518
641
  resolve("success");
519
642
  var layer = {
520
643
  guid: ds.guid,
@@ -554,7 +677,7 @@ class AddDataViewModel {
554
677
  } //解析数据源
555
678
 
556
679
 
557
- parseDataSource(options, cb) {
680
+ parseDataSource(options, cb, loadCustom) {
558
681
  options = options || {};
559
682
 
560
683
  if (options.url && options.url !== "") {
@@ -573,13 +696,13 @@ class AddDataViewModel {
573
696
  } catch (error) {
574
697
  (0,message/* default */.Z)({
575
698
  message: this._language.errorUrlAddress,
576
- type: "error"
699
+ type: "warning"
577
700
  });
578
701
  return;
579
702
  }
580
703
 
581
704
  if (options.type === "kml") {
582
- this.parseService(options, cb);
705
+ this.parseService(options, cb, loadCustom);
583
706
  return;
584
707
  }
585
708
 
@@ -589,17 +712,17 @@ class AddDataViewModel {
589
712
  if (data.status !== 200) {
590
713
  (0,message/* default */.Z)({
591
714
  message: this._language.serviceNotAvailable,
592
- type: "error"
715
+ type: "warning"
593
716
  });
594
717
  } else {
595
718
  try {
596
- this.parseService(options, cb);
719
+ this.parseService(options, cb, loadCustom);
597
720
  } catch {}
598
721
  }
599
722
  }).catch(() => {
600
723
  (0,message/* default */.Z)({
601
724
  message: this._language.serviceNotAvailable,
602
- type: "error"
725
+ type: "warning"
603
726
  });
604
727
  });
605
728
  } else {
@@ -611,7 +734,7 @@ class AddDataViewModel {
611
734
  } //解析服务
612
735
 
613
736
 
614
- parseService(options, cb) {
737
+ parseService(options, cb, loadCustom) {
615
738
  let that = this;
616
739
  let url = options.url;
617
740
  let type = options.type || "";
@@ -827,7 +950,7 @@ class AddDataViewModel {
827
950
  });
828
951
  promiseList.push(promise);
829
952
  } else if (layers[i] instanceof Cesium.Kq3dS3MTilesLayer) {
830
- serverType = "s3m";
953
+ serverType = "3dtiles";
831
954
  addType = "s3m";
832
955
  url = layers[i]._url;
833
956
  }
@@ -924,6 +1047,14 @@ class AddDataViewModel {
924
1047
  break;
925
1048
 
926
1049
  case "kqgismapserver":
1050
+ if (loadCustom) {
1051
+ loadCustom({
1052
+ name,
1053
+ url
1054
+ });
1055
+ return;
1056
+ }
1057
+
927
1058
  node = {
928
1059
  guid: Cesium.createGuid(),
929
1060
  name: name,
@@ -947,7 +1078,7 @@ class AddDataViewModel {
947
1078
  if (mapInfo.resultcode === "error") {
948
1079
  (0,message/* default */.Z)({
949
1080
  message: mapInfo.message,
950
- type: "error"
1081
+ type: "warning"
951
1082
  });
952
1083
  return;
953
1084
  }
@@ -1002,7 +1133,9 @@ class AddDataViewModel {
1002
1133
  case "arcgismapserver":
1003
1134
  layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dArcGISMapServerImageryProvider({
1004
1135
  name: name,
1005
- url: url
1136
+ url: url,
1137
+ usePreCachedTilesIfAvailable: false //使用export请求可支持自定义比例尺
1138
+
1006
1139
  }));
1007
1140
  this.flyToLayer(layer);
1008
1141
  node = {
@@ -1176,8 +1309,7 @@ class AddDataViewModel {
1176
1309
  that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
1177
1310
 
1178
1311
 
1179
- that._viewer.flyTo(ds);
1180
-
1312
+ that.flyToLayer(ds);
1181
1313
  node = {
1182
1314
  guid: ds.guid,
1183
1315
  name: name,
@@ -1211,8 +1343,7 @@ class AddDataViewModel {
1211
1343
  this._viewer.dataSources.add(ds); // ds.autoAvoid(this._viewer);
1212
1344
 
1213
1345
 
1214
- this._viewer.flyTo(ds);
1215
-
1346
+ that.flyToLayer(ds);
1216
1347
  node = {
1217
1348
  guid: ds.guid,
1218
1349
  name: name,
@@ -1248,8 +1379,7 @@ class AddDataViewModel {
1248
1379
 
1249
1380
  this._viewer.dataSources.add(ds);
1250
1381
 
1251
- this._viewer.flyTo(ds);
1252
-
1382
+ that.flyToLayer(ds);
1253
1383
  node = {
1254
1384
  guid: ds.guid,
1255
1385
  name: name,
@@ -1276,8 +1406,7 @@ class AddDataViewModel {
1276
1406
  ds.load(url).then(ds => {
1277
1407
  this._viewer.dataSources.add(ds);
1278
1408
 
1279
- this._viewer.flyTo(ds);
1280
-
1409
+ that.flyToLayer(ds);
1281
1410
  node = {
1282
1411
  guid: ds.guid,
1283
1412
  name: name,
@@ -1299,8 +1428,7 @@ class AddDataViewModel {
1299
1428
  ds.load(url).then(ds => {
1300
1429
  this._viewer.dataSources.add(ds);
1301
1430
 
1302
- this._viewer.flyTo(ds);
1303
-
1431
+ that.flyToLayer(ds);
1304
1432
  node = {
1305
1433
  guid: ds.guid,
1306
1434
  name: name,
@@ -1363,7 +1491,7 @@ class AddDataViewModel {
1363
1491
  destination: tileset.rectangle
1364
1492
  });
1365
1493
  });
1366
- } else if (layer instanceof Cesium.GeoJsonDataSource || layer instanceof Cesium.Kq3dGeoJsonDataSource) {
1494
+ } else if (layer instanceof Cesium.GeoJsonDataSource || layer instanceof Cesium.Kq3dGeoJsonDataSource || layer instanceof Cesium.Kq3dEsriGeoJsonDataSource) {
1367
1495
  let offset = new Cesium.HeadingPitchRange(0, Cesium.Math.toRadians(-90), 0);
1368
1496
  viewer.flyTo(layer, {
1369
1497
  offset
@@ -1443,7 +1571,6 @@ const _hoisted_12 = {
1443
1571
 
1444
1572
 
1445
1573
 
1446
- //accept=".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.csv,.xls,.xlsx,.txt"
1447
1574
 
1448
1575
  const __default__ = {
1449
1576
  name: "Kq3dAddData"
@@ -1480,6 +1607,11 @@ const __default__ = {
1480
1607
  type: Function,
1481
1608
  default: null
1482
1609
  },
1610
+ // 自定义加载函数, 只对KQGIS REST服务生效, earthstudio使用
1611
+ loadCustom: {
1612
+ type: Function,
1613
+ default: null
1614
+ },
1483
1615
  // 是否生成HeaderTemp
1484
1616
  showHeaderTemp: {
1485
1617
  type: Boolean,
@@ -1514,6 +1646,7 @@ const __default__ = {
1514
1646
  expose
1515
1647
  }) {
1516
1648
  const props = __props;
1649
+ let accept = ".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.csv,.xls,.xlsx,.txt";
1517
1650
  let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({});
1518
1651
  let selectTypeIndex = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(0); //URL服务支持的数据源类型
1519
1652
 
@@ -1572,104 +1705,104 @@ const __default__ = {
1572
1705
  return [// {
1573
1706
  // type: 'kq3dimageryfile',
1574
1707
  // name: language.value.ImagertyTileFile,
1575
- // namePlaceholder: language.value.unnamedLayer,
1708
+ // namePlaceholder: language.value.optional,
1576
1709
  // urlPlaceholder: language.value.format +':http://<host>:<port>/xxx/<servername>/info.xml',
1577
1710
  // description: language.value.imagertyTileFiledescription
1578
1711
  // }, {
1579
1712
  // type: 'obterrain',
1580
1713
  // name: language.value.ObTerrainTileFile,
1581
- // namePlaceholder: language.value.unnamedLayer,
1714
+ // namePlaceholder: language.value.optional,
1582
1715
  // urlPlaceholder: language.value.format +':http://<host>:<port>/xxx/<servername>/info.xml',
1583
1716
  // description: language.value.imagertyObTerrainTileFiledescription
1584
1717
  // },
1585
1718
  {
1586
1719
  type: "kqgis3dserver",
1587
1720
  name: language.value.KQGIS3DServer,
1588
- namePlaceholder: language.value.unnamedLayer,
1721
+ namePlaceholder: language.value.optional,
1589
1722
  urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/realspace",
1590
1723
  description: language.value.imagerty3DServerdescription
1591
1724
  }, {
1592
1725
  type: "kqgismapserver",
1593
1726
  name: language.value.KQGISMapServer,
1594
- namePlaceholder: language.value.unnamedLayer,
1727
+ namePlaceholder: language.value.optional,
1595
1728
  urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map",
1596
1729
  description: language.value.imagertyMapServerdescription
1597
1730
  }, {
1598
1731
  type: "kqgisimageserver",
1599
1732
  name: language.value.KQGISImageServer,
1600
- namePlaceholder: language.value.unnamedLayer,
1733
+ namePlaceholder: language.value.optional,
1601
1734
  urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/image",
1602
1735
  description: language.value.imagertyImageServerdescription
1603
1736
  }, {
1604
1737
  type: "kqgisdataflowserver",
1605
1738
  name: language.value.KQGISDataflowServer,
1606
- namePlaceholder: language.value.unnamedLayer,
1739
+ namePlaceholder: language.value.optional,
1607
1740
  urlPlaceholder: language.value.format + ":http://<host>:<port>/streaming/rest/services/<servername>/dataflow",
1608
1741
  description: language.value.imagertyDataflowServerdescription
1609
1742
  }, {
1610
1743
  type: "kqgistileserver",
1611
1744
  name: language.value.KQGISTileServer,
1612
- namePlaceholder: language.value.unnamedLayer,
1745
+ namePlaceholder: language.value.optional,
1613
1746
  urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile",
1614
1747
  description: language.value.imagertyTileServerdescription
1615
1748
  }, {
1616
1749
  type: "kqgisaggregationserver",
1617
1750
  name: language.value.KQGISAggregationServer,
1618
- namePlaceholder: language.value.unnamedLayer,
1751
+ namePlaceholder: language.value.optional,
1619
1752
  urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts",
1620
1753
  description: language.value.imagertyAggregationServerdescription
1621
1754
  }, {
1622
1755
  type: "s3m",
1623
1756
  name: language.value.S3M,
1624
- namePlaceholder: language.value.unnamedLayer,
1757
+ namePlaceholder: language.value.optional,
1625
1758
  urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx/realspace/datas/xxx/config",
1626
1759
  description: language.value.imagertyS3Mdescription
1627
1760
  }, {
1628
1761
  type: "arcgismapserver",
1629
1762
  name: language.value.ArcGISMapServer,
1630
- namePlaceholder: language.value.unnamedLayer,
1763
+ namePlaceholder: language.value.optional,
1631
1764
  urlPlaceholder: language.value.format + ":http://<host>:<port>/ArcGIS/rest/services/<servername>/MapServer",
1632
1765
  description: language.value.imagertyArcGISMapServerdescription
1633
1766
  }, {
1634
1767
  type: "wms",
1635
1768
  name: language.value.OGCWMS,
1636
- namePlaceholder: language.value.unnamedLayer,
1769
+ namePlaceholder: language.value.optional,
1637
1770
  urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wms",
1638
1771
  description: language.value.imagertyOGCWMSdescription
1639
1772
  }, {
1640
1773
  type: "wmts",
1641
1774
  name: language.value.OGCWMTS,
1642
- namePlaceholder: language.value.unnamedLayer,
1775
+ namePlaceholder: language.value.optional,
1643
1776
  urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts",
1644
1777
  description: language.value.imagertyOGCWMTSdescription
1645
1778
  }, {
1646
1779
  type: "3dtiles",
1647
1780
  name: language.value.Cesium3DTilesFile,
1648
- namePlaceholder: language.value.unnamedLayer,
1781
+ namePlaceholder: language.value.optional,
1649
1782
  urlPlaceholder: language.value.format + ":http://<host>:<port>/tileset.json",
1650
1783
  description: language.value.imagerty3DTilesFiledescription
1651
1784
  }, {
1652
1785
  type: "stkterrain",
1653
1786
  name: language.value.StkTerrainTileFile,
1654
- namePlaceholder: language.value.unnamedLayer,
1787
+ namePlaceholder: language.value.optional,
1655
1788
  urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx/<foldername>/",
1656
1789
  description: language.value.imagertyStkTerrainTileFiledescription
1657
1790
  }, {
1658
1791
  type: "geojson",
1659
1792
  name: language.value.GeoJson,
1660
- namePlaceholder: language.value.unnamedLayer,
1793
+ namePlaceholder: language.value.optional,
1661
1794
  urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
1662
1795
  description: language.value.imagertyGeoJsondescription
1663
1796
  }, {
1664
1797
  type: "arcjson",
1665
1798
  name: language.value.ArcJson,
1666
- namePlaceholder: language.value.unnamedLayer,
1799
+ namePlaceholder: language.value.optional,
1667
1800
  urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.json",
1668
1801
  description: language.value.imagertyArcJsondescription
1669
1802
  }, {
1670
1803
  type: "mvt",
1671
1804
  name: language.value.MVT,
1672
- namePlaceholder: language.value.unnamedLayer,
1805
+ namePlaceholder: language.value.optional,
1673
1806
  urlPlaceholder: language.value.format + ":http://<host>:<port>/mvt/style.json",
1674
1807
  description: language.value.imagertyMVTdescription
1675
1808
  }
@@ -1682,13 +1815,13 @@ const __default__ = {
1682
1815
  }, {
1683
1816
  type: 'kml',
1684
1817
  name: language.value.KML,
1685
- namePlaceholder: language.value.unnamedLayer,
1818
+ namePlaceholder: language.value.optional,
1686
1819
  urlPlaceholder: language.value.format +': http://<host>:<port>/xxx/<servername>/xxx.kml',
1687
1820
  description: language.value.imagertyKMLdescription
1688
1821
  }, {
1689
1822
  type: 'czml',
1690
1823
  name: language.value.CZML,
1691
- namePlaceholder: language.value.unnamedLayer,
1824
+ namePlaceholder: language.value.optional,
1692
1825
  urlPlaceholder: language.value.format +': http://<host>:<port>/xxx/<servername>/xxx.czml',
1693
1826
  description: language.value.imagertyCZMLdescription
1694
1827
  }*/
@@ -1776,7 +1909,7 @@ const __default__ = {
1776
1909
  type: dataSourceType.value.type,
1777
1910
  url: dataSource.url,
1778
1911
  name: dataSource.name
1779
- }, props.loadCallback);
1912
+ }, props.loadCallback, props.loadCustom);
1780
1913
  } // 重置
1781
1914
 
1782
1915
 
@@ -1859,7 +1992,7 @@ const __default__ = {
1859
1992
  "auto-upload": false,
1860
1993
  "file-list": (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(fileList),
1861
1994
  "onUpdate:file-list": _cache[0] || (_cache[0] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.isRef)(fileList) ? fileList.value = $event : fileList = $event),
1862
- accept: ".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.txt",
1995
+ accept: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(accept),
1863
1996
  "on-change": changeFile,
1864
1997
  ref_key: "upload_ref",
1865
1998
  ref: upload_ref
@@ -1872,7 +2005,7 @@ const __default__ = {
1872
2005
 
1873
2006
  }, 8
1874
2007
  /* PROPS */
1875
- , ["file-list"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(fileList).length === 0]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_4, [((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)(external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.Fragment, null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.renderList)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(operatorArray), (rowItem, i) => {
2008
+ , ["file-list", "accept"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(fileList).length === 0]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_4, [((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)(external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.Fragment, null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.renderList)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(operatorArray), (rowItem, i) => {
1876
2009
  return (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createBlock)(_component_kq_row, {
1877
2010
  key: i,
1878
2011
  gutter: 20
@@ -1927,7 +2060,7 @@ const __default__ = {
1927
2060
  action: "",
1928
2061
  "show-file-list": false,
1929
2062
  "auto-upload": false,
1930
- accept: ".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.txt",
2063
+ accept: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(accept),
1931
2064
  ref_key: "upload_btn_ref",
1932
2065
  ref: upload_btn_ref,
1933
2066
  class: "kq3d-add-data-footer-upload",
@@ -1949,9 +2082,9 @@ const __default__ = {
1949
2082
  _: 1
1950
2083
  /* STABLE */
1951
2084
 
1952
- }, 512
1953
- /* NEED_PATCH */
1954
- ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
2085
+ }, 8
2086
+ /* PROPS */
2087
+ , ["accept"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
1955
2088
  onClick: _cache[1] || (_cache[1] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => removeFiles(), ["stop"])),
1956
2089
  title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).clearFiles,
1957
2090
  type: "primary"
@@ -2053,7 +2186,7 @@ const __default__ = {
2053
2186
 
2054
2187
  }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
2055
2188
  default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
2056
- label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).layerName
2189
+ label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).nodeName
2057
2190
  }, {
2058
2191
  default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_input, {
2059
2192
  modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(dataSource).name,
@@ -363,8 +363,9 @@ const __default__ = {
363
363
  gis_utils_.utils.getWebMap(null, scenceView => {
364
364
  if (scenceView) {
365
365
  changSelectTerrain();
366
- viewModel = new BaseterrainGalleryViewModel/* default */.Z(scenceView._viewer);
367
- viewModel.setTerrainType(currentIndex.value);
366
+ viewModel = new BaseterrainGalleryViewModel/* default */.Z(scenceView._viewer); // 初始化无地形时不需要设置地形, 如果将地形设置为无地形可能会影响其他功能添加的地形
367
+
368
+ if (currentIndex.value != 2) viewModel.setTerrainType(currentIndex.value);
368
369
  }
369
370
  });
370
371
  });