Skip to content

Commit 577cb03

Browse files
tangqinGisertangqinGiser
committed
【fix】POISearchView.js 样式冲突和图层对象改变。
1 parent 52c033f commit 577cb03

File tree

13 files changed

+131
-144
lines changed

13 files changed

+131
-144
lines changed

‎dist/leaflet/iclient9-leaflet-es6.js

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* iclient9-leaflet.(http://iclient.supermap.io)
44
* Copyright© 2000 - 2018 SuperMap Software Co.Ltd
55
* license: Apache-2.0
6-
* version: v9.1.0-beta
6+
* version: v9.1.0
77
*
88
*/
99
/******/ (function(modules) { // webpackBootstrap
@@ -44,34 +44,19 @@
4444
/******/ // define getter function for harmony exports
4545
/******/ __webpack_require__.d = function(exports, name, getter) {
4646
/******/ if(!__webpack_require__.o(exports, name)) {
47-
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
47+
/******/ Object.defineProperty(exports, name, {
48+
/******/ configurable: false,
49+
/******/ enumerable: true,
50+
/******/ get: getter
51+
/******/ });
4852
/******/ }
4953
/******/ };
5054
/******/
5155
/******/ // define __esModule on exports
5256
/******/ __webpack_require__.r = function(exports) {
53-
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
54-
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
55-
/******/ }
5657
/******/ Object.defineProperty(exports, '__esModule', { value: true });
5758
/******/ };
5859
/******/
59-
/******/ // create a fake namespace object
60-
/******/ // mode & 1: value is a module id, require it
61-
/******/ // mode & 2: merge all properties of value into the ns
62-
/******/ // mode & 4: return value when already ns object
63-
/******/ // mode & 8|1: behave like require
64-
/******/ __webpack_require__.t = function(value, mode) {
65-
/******/ if(mode & 1) value = __webpack_require__(value);
66-
/******/ if(mode & 8) return value;
67-
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
68-
/******/ var ns = Object.create(null);
69-
/******/ __webpack_require__.r(ns);
70-
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
71-
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
72-
/******/ return ns;
73-
/******/ };
74-
/******/
7560
/******/ // getDefaultExport function for compatibility with non-harmony modules
7661
/******/ __webpack_require__.n = function(module) {
7762
/******/ var getter = module && module.__esModule ?
@@ -65104,7 +65089,7 @@ class NavTabsPage {
6510465089

6510565090
_initContainer(tabs) {
6510665091
const navTabsPage = document.createElement("div");
65107-
navTabsPage.setAttribute("class", "nav-tabs-page");
65092+
navTabsPage.setAttribute("class", "widgets-navtabs-page");
6510865093

6510965094
//关闭按钮
6511065095
const closeBtn = document.createElement("span");
@@ -65115,13 +65100,13 @@ class NavTabsPage {
6511565100
//标签
6511665101
const navTabsTitle = document.createElement("div");
6511765102
this.navTabsTitle = navTabsTitle;
65118-
navTabsTitle.setAttribute("class", "nav-tabs-title");
65103+
navTabsTitle.setAttribute("class", "widgets-navtabs-title");
6511965104
navTabsPage.appendChild(navTabsTitle);
6512065105

6512165106
//内容
6512265107
const navTabsContent = document.createElement("div");
6512365108
this.navTabsContent = navTabsContent;
65124-
navTabsContent.setAttribute("class", "nav-tabs-content");
65109+
navTabsContent.setAttribute("class", "widgets-navtabs-content");
6512565110
navTabsPage.appendChild(navTabsContent);
6512665111

6512765112
//若 tabs 初始传入值，则
@@ -83232,8 +83217,8 @@ var POISearchViewModel = external_L_default.a.Evented.extend({
8323283217
* @param {string} keyWord - 图层属性搜索关键字。
8323383218
*/
8323483219
searchFromLayer(keyWord, searchLayerName) {
83235-
if (this.dataModel[searchLayerName]) {
83236-
let resultFeatures = this.dataModel[searchLayerName].getFeaturesByKeyWord(keyWord);
83220+
if (this.dataModel.layers[searchLayerName]) {
83221+
let resultFeatures = this.dataModel.layers[searchLayerName].getFeaturesByKeyWord(keyWord);
8323783222
if (resultFeatures && resultFeatures.length > 0) {
8323883223
this.fire("searchlayersucceed", {result: resultFeatures});
8323983224
} else {
@@ -83257,8 +83242,8 @@ var POISearchViewModel = external_L_default.a.Evented.extend({
8325783242
* @param {string} layerName - 指定缩放的图层名。
8325883243
*/
8325983244
panToLayer(layerName) {
83260-
if (this.dataModel[layerName]) {
83261-
this.map.flyToBounds(this.dataModel[layerName].layer.getBounds());
83245+
if (this.dataModel.layers[layerName]) {
83246+
this.map.flyToBounds(this.dataModel.layers[layerName].layer.getBounds());
8326283247
}
8326383248
},
8326483249

@@ -83601,7 +83586,7 @@ var POISearchView = external_L_default.a.Control.extend({
8360183586
this._clearSearchResult();
8360283587
this.messageBox.closeView();
8360383588
navTabsPageObject.closeView();
83604-
const keyWord = this.poiInput.value;
83589+
const keyWord = this.poiInput.value.trim();
8360583590
if (keyWord === "") {
8360683591
this.messageBox.showView("搜索关键字不能为空，请输入搜索条件。");
8360783592
return;
@@ -83723,11 +83708,11 @@ var POISearchView = external_L_default.a.Control.extend({
8372383708
layerOption.appendChild(singleSelect);
8372483709

8372583710
//attributes-select todo 暂不支持该功能
83726-
const attributesSelect = (new WidgetSelect(layer.layer.attributeNames)).getElement();
83711+
// const attributesSelect = (new WidgetSelect(layer.layer.attributeNames)).getElement();
8372783712
//选择查询的字段 todo 限制图层查找属性功能待属性选择框优化后完善
83728-
attributesSelect.onchange = (e) => {
83713+
/*attributesSelect.onchange = (e) => {
8372983714
this.searchAttributes = e.target.value;
83730-
};
83715+
};*/
8373183716
// layerOption.appendChild(attributesSelect);
8373283717

8373383718
document.getElementsByClassName("poi-layers-body")[0].appendChild(layerOption);
@@ -84457,22 +84442,26 @@ external_L_default.a.supermap.widgets.dataFlow = dataFlowView;
8445784442
* This program are made available under the terms of the Apache License, Version 2.0
8445884443
* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
8445984444

84460-
84445+
84446+
84447+
8446184448
/**
8446284449
* @class L.supermap.widgets.GeoJSONLayersWithName
84463-
* @classdesc 含有 layerName 与 GeoJSON 图层的对象。
84450+
* @classdesc 含有 layerName 与 GeoJSON 图层的对象。
8446484451
* @param {Object} layerObject - 图层对象。
8446584452
* @param {string} layerObject.layerName - 图层名。
8446684453
* @param {L.GeoJSON} layerObject.layer - 图层。
8446784454
* @category Widgets
8446884455
*/
84469-
class GeoJSONLayersWithName{
84470-
constructor(layerObject){
84456+
class GeoJSONLayersWithName {
84457+
constructor(layerObject) {
8447184458
this.layerName = layerObject.layerName;
8447284459
this.layer = layerObject.layer;
8447384460
}
8447484461
}
8447584462

84463+
external_L_default.a.supermap.widgets.GeoJSONLayersWithName = GeoJSONLayersWithName;
84464+
8447684465
// CONCATENATED MODULE: ./src/leaflet/widgets/clientcomputation/ClientComputationViewModel.js
8447784466
/* Copyright© 2000 - 2018 SuperMap Software Co.Ltd. All rights reserved.
8447884467
* This program are made available under the terms of the Apache License, Version 2.0
@@ -89585,7 +89574,7 @@ module.exports = function(proj4){
8958589574
/* 74 */
8958689575
/***/ (function(module) {
8958789576

89588-
module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"http://localhost:4873/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"E:\\2018\\git\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"};
89577+
module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"http://registry.npm.taobao.org/proj4/download/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"G:\\iClient\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"};
8958989578

8959089579
/***/ }),
8959189580
/* 75 */

‎dist/leaflet/iclient9-leaflet-es6.min.js

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/leaflet/iclient9-leaflet.css

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy