Skip to content

Commit ee09110

Browse files
songyumengsongyumeng
committed
fix文件大小写错误
1 parent d0110c3 commit ee09110

20 files changed

+1328
-686
lines changed

‎dist/classic/iclient-classic-es6.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,8 @@ __webpack_require__.r(__webpack_exports__);
487487

488488
// CONCATENATED MODULE: ./src/common/SuperMap.js
489489
var SuperMap = window.SuperMap = window.SuperMap || {};
490+
SuperMap.Widgets = window.SuperMap.Widgets || {};
491+
490492
// CONCATENATED MODULE: ./src/common/commontypes/Pixel.js
491493

492494

‎dist/classic/iclient-classic-es6.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/classic/iclient-classic.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ Object.defineProperty(exports, "__esModule", {
103103
value: true
104104
});
105105
var SuperMap = exports.SuperMap = window.SuperMap = window.SuperMap || {};
106+
SuperMap.Widgets = window.SuperMap.Widgets || {};
106107

107108
/***/ }),
108109
/* 1 */

‎dist/classic/iclient-classic.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,34 @@
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, {
48-
/******/ configurable: false,
49-
/******/ enumerable: true,
50-
/******/ get: getter
51-
/******/ });
47+
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
5248
/******/ }
5349
/******/ };
5450
/******/
5551
/******/ // define __esModule on exports
5652
/******/ __webpack_require__.r = function(exports) {
53+
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
54+
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
55+
/******/ }
5756
/******/ Object.defineProperty(exports, '__esModule', { value: true });
5857
/******/ };
5958
/******/
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+
/******/
6075
/******/ // getDefaultExport function for compatibility with non-harmony modules
6176
/******/ __webpack_require__.n = function(module) {
6277
/******/ var getter = module && module.__esModule ?
@@ -79295,7 +79310,7 @@ var OpenFileViewModel = external_L_default.a.Evented.extend({
7929579310
}, (data) => {
7929679311
//将数据统一转换为 geoJson 格式加载到底图
7929779312
me._newLayerToMap(me._processDatas(type, data));
79298-
}, (error) => {
79313+
}, () => {
7929979314
me.fire("openfilefail", {messageType: "failure", message: "打开文件失败！"});
7930079315
// throw new Error("Incorrect data format: " + error);
7930179316
}, this);
@@ -83092,7 +83107,7 @@ module.exports = function(proj4){
8309283107
/* 74 */
8309383108
/***/ (function(module) {
8309483109

83095-
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"};
83110+
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"};
8309683111

8309783112
/***/ }),
8309883113
/* 75 */

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/leaflet/iclient9-leaflet.js

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,34 @@
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, {
48-
/******/ configurable: false,
49-
/******/ enumerable: true,
50-
/******/ get: getter
51-
/******/ });
47+
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
5248
/******/ }
5349
/******/ };
5450
/******/
5551
/******/ // define __esModule on exports
5652
/******/ __webpack_require__.r = function(exports) {
53+
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
54+
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
55+
/******/ }
5756
/******/ Object.defineProperty(exports, '__esModule', { value: true });
5857
/******/ };
5958
/******/
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+
/******/
6075
/******/ // getDefaultExport function for compatibility with non-harmony modules
6176
/******/ __webpack_require__.n = function(module) {
6277
/******/ var getter = module && module.__esModule ?
@@ -29158,7 +29173,7 @@ var OpenFileViewModel = exports.OpenFileViewModel = _leaflet2["default"].Evented
2915829173
}, function (data) {
2915929174
//将数据统一转换为 geoJson 格式加载到底图
2916029175
me._newLayerToMap(me._processDatas(type, data));
29161-
}, function (error) {
29176+
}, function () {
2916229177
me.fire("openfilefail", { messageType: "failure", message: "打开文件失败！" });
2916329178
// throw new Error("Incorrect data format: " + error);
2916429179
}, this);
@@ -72824,7 +72839,7 @@ module.exports = function (proj4) {
7282472839
/* 392 */
7282572840
/***/ (function(module) {
7282672841

72827-
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"};
72842+
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"};
7282872843

7282972844
/***/ }),
7283072845
/* 393 */

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 105 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24965,6 +24965,8 @@ __webpack_require__.r(__webpack_exports__);
2496524965

2496624966
// CONCATENATED MODULE: ./src/common/SuperMap.js
2496724967
var SuperMap = window.SuperMap = window.SuperMap || {};
24968+
SuperMap.Widgets = window.SuperMap.Widgets || {};
24969+
2496824970
// CONCATENATED MODULE: ./src/common/REST.js
2496924971

2497024972

@@ -83648,30 +83650,125 @@ const FileTypes = {
8364883650
const FileConfig = {
8364983651
fileMaxSize: 10 * 1024 * 1024
8365083652
};
83651-
// CONCATENATED MODULE: ./src/common/widgets/openFile/fileModel.js
83653+
// CONCATENATED MODULE: ./src/common/widgets/openFile/FileModel.js
8365283654

8365383655

8365483656
/**
83655-
* @description 文件数据微件数据模型，用于存储一些数据或状态，todo 结构待完善
83657+
* @class SuperMap.FileModel
83658+
* @description 文件数据微件数据模型，用于存储一些文件数据或状态，todo 结构待完善
8365683659
*/
83657-
class fileModel_FileModel {
83660+
class FileModel_FileModel {
8365883661
constructor(options) {
8365983662
this.FileTypes = FileTypes;
8366083663
this.FileConfig = FileConfig;
8366183664
this.map = options && options.map ? options.map : null;
8366283665
this.loadFileObject = [];
8366383666
}
8366483667

83668+
/**
83669+
* @function SuperMap.FileModel.prototype.set
83670+
* @description 设置属性值
83671+
* @param {string} key - 属性名称
83672+
* @param {string|Object} value - 属性值
83673+
*/
8366583674
set(key, value) {
8366683675
this[key] = value;
8366783676
}
8366883677

83678+
/**
83679+
* @function SuperMap.FileModel.prototype.get
83680+
* @description 获取数据值
83681+
* @param {string} key - 属性名称
83682+
* @return {string|Object} value - 返回属性值
83683+
*/
8366983684
get(key) {
8367083685
return this[key];
8367183686
}
8367283687

8367383688
}
83674-
// CONCATENATED MODULE: ./src/common/widgets/util/util.js
83689+
// CONCATENATED MODULE: ./src/common/widgets/messageBox/MessageBox.js
83690+
83691+
83692+
/**
83693+
* @class SuperMap.Widgets.MessageBox
83694+
* @classdesc MessageBox 微件，信息框提示
83695+
* @category Control Widgets
83696+
*/
83697+
class MessageBox {
83698+
83699+
constructor() {
83700+
this._initView();
83701+
}
83702+
83703+
_initView() {
83704+
//原生js形式
83705+
const messageBoxContainer = document.createElement("div");
83706+
messageBoxContainer.hidden = true;
83707+
messageBoxContainer.setAttribute("class", "messageBoxContainer border-bottom-orange");
83708+
83709+
//图标
83710+
const iconContainer = document.createElement("div");
83711+
iconContainer.setAttribute("class", "icon");
83712+
this.icon = document.createElement("span");
83713+
this.icon.setAttribute("class", "supermapol-icons-message-warning");
83714+
iconContainer.appendChild(this.icon);
83715+
messageBoxContainer.appendChild(iconContainer);
83716+
83717+
//内容：
83718+
const messageBox = document.createElement("div");
83719+
messageBox.setAttribute("class", "messageBox");
83720+
messageBox.innerHTML = "";
83721+
messageBoxContainer.appendChild(messageBox);
83722+
this.messageBox = messageBox;
83723+
83724+
//关闭按钮
83725+
const cancelContainer = document.createElement("div");
83726+
cancelContainer.setAttribute("class", "cancelContainer");
83727+
const cancelBtn = document.createElement("button");
83728+
cancelBtn.setAttribute("class", "cancelBtn");
83729+
cancelBtn.innerHTML = "x";
83730+
cancelBtn.onclick = this.closeView.bind(this);
83731+
cancelContainer.appendChild(cancelBtn);
83732+
messageBoxContainer.appendChild(cancelContainer);
83733+
83734+
this.messageBoxContainer = messageBoxContainer;
83735+
document.body.appendChild(this.messageBoxContainer);
83736+
}
83737+
83738+
/**
83739+
* @function SuperMap.Widgets.MessageBox.prototype.closeView
83740+
* @description 关闭提示框
83741+
*/
83742+
closeView() {
83743+
this.messageBoxContainer.hidden = true;
83744+
}
83745+
83746+
/**
83747+
* @function SuperMap.Widgets.MessageBox.prototype.showView
83748+
* @description 显示提示框
83749+
* @param {string} message - 提示框显示内容
83750+
* @param {string}[type="warring"] 提示框类型，如 "warring", "failure", "success", 默认为"warring"
83751+
*/
83752+
showView(message, type = 'warring') {
83753+
//设置提示框的样式：
83754+
if (type === "success") {
83755+
this.icon.setAttribute("class", "supermapol-icons-message-success");
83756+
this.messageBoxContainer.setAttribute("class", "messageBoxContainer border-bottom-green");
83757+
83758+
} else if (type === "failure") {
83759+
this.icon.setAttribute("class", "supermapol-icons-message-failure");
83760+
this.messageBoxContainer.setAttribute("class", "messageBoxContainer border-bottom-red");
83761+
} else if (type === "warring") {
83762+
this.icon.setAttribute("class", "supermapol-icons-message-warning");
83763+
this.messageBoxContainer.setAttribute("class", "messageBoxContainer border-bottom-orange");
83764+
}
83765+
this.messageBox.innerHTML = message;
83766+
this.messageBoxContainer.hidden = false;
83767+
}
83768+
}
83769+
83770+
SuperMap.Widgets.MessageBox = MessageBox;
83771+
// CONCATENATED MODULE: ./src/common/widgets/util/Util.js
8367583772

8367683773

8367783774
let widgetsUtil = {
@@ -83827,12 +83924,16 @@ let FileReaderUtil = {
8382783924

8382883925
//组件
8382983926

83927+
//提示框微件
83928+
8383083929
//工具类
8383183930

8383283931

8383383932

8383483933

8383583934

83935+
83936+
8383683937
// CONCATENATED MODULE: ./src/common/index.js
8383783938

8383883939

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

Lines changed: 1 addition & 1 deletion
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