amis 2.3.1 → 2.4.0

package/lib/renderers/Form/InputCity.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -11,11 +11,64 @@ var tslib = require('tslib');
 var React = require('react');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
+var getCityFromCode = function (_a) {
+    var _b;
+    var value = _a.value, db = _a.db, _c = _a.delimiter, delimiter = _c === void 0 ? ',' : _c;
+    var result = {
+        code: 0,
+        province: '',
+        provinceCode: 0,
+        city: '',
+        cityCode: 0,
+        district: '',
+        districtCode: 0,
+        street: ''
+    };
+    if (!db || !value) {
+        return result;
+    }
+    var code = (value && value.code) ||
+        (typeof value === 'number' && value) ||
+        (typeof value === 'string' && /(\d{6})/.test(value) && RegExp.$1);
+    if (code && db[code]) {
+        code = parseInt(code, 10);
+        result.code = code;
+        var provinceCode = code - (code % 10000);
+        if (db[provinceCode]) {
+            result.provinceCode = provinceCode;
+            result.province = db[provinceCode];
+        }
+        var cityCode = code - (code % 100);
+        if (cityCode !== provinceCode && db[cityCode]) {
+            result.cityCode = cityCode;
+            result.city = db[cityCode];
+        }
+        else if (~((_b = db.city[provinceCode]) === null || _b === void 0 ? void 0 : _b.indexOf(code))) {
+            result.cityCode = code;
+            result.city = db[code];
+        }
+        if (code % 100) {
+            result.district = db[code];
+            result.districtCode = code;
+        }
+    }
+    if (value && value.street) {
+        result.street = value.street;
+    }
+    else if (typeof value === 'string' && ~value.indexOf(delimiter)) {
+        result.street = value.slice(value.indexOf(delimiter) + delimiter.length);
+    }
+    return result;
+};
+var loadDb = function (callback) {
+    Promise.resolve().then(function() {return new Promise(function(fullfill) {require(['amis-ui/lib/components/CityDB'], function(mod) {fullfill(tslib.__importStar(mod))})})}).then(callback);
+};
 var CityPicker = /** @class */ (function (_super) {
     tslib.__extends(CityPicker, _super);
     function CityPicker() {
@@ -49,7 +102,7 @@ var CityPicker = /** @class */ (function (_super) {
             callback === null || callback === void 0 ? void 0 : callback();
             return;
         }
-        Promise.resolve().then(function() {return new Promise(function(fullfill) {require(['amis-ui/lib/components/CityDB'], function(mod) {fullfill(tslib.__importStar(mod))})})}).then(function (db) {
+        loadDb(function (db) {
             _this.setState({
                 db: tslib.__assign(tslib.__assign({}, db.default), { province: db.province, city: db.city, district: db.district })
             }, callback);
@@ -129,55 +182,17 @@ var CityPicker = /** @class */ (function (_super) {
         this.syncOut();
     };
     CityPicker.prototype.syncIn = function (props) {
-        var _a;
         if (props === void 0) { props = this.props; }
         var db = this.state.db;
         var value = props.value, delimiter = props.delimiter;
         if (!db) {
             return;
         }
-        var state = {
-            code: 0,
-            province: '',
-            provinceCode: 0,
-            city: '',
-            cityCode: 0,
-            district: '',
-            districtCode: 0,
-            street: ''
-        };
-        var code = (value && value.code) ||
-            (typeof value === 'number' && value) ||
-            (typeof value === 'string' && /(\d{6})/.test(value) && RegExp.$1);
-        if (code && db[code]) {
-            code = parseInt(code, 10);
-            state.code = code;
-            var provinceCode = code - (code % 10000);
-            if (db[provinceCode]) {
-                state.provinceCode = provinceCode;
-                state.province = db[provinceCode];
-            }
-            var cityCode = code - (code % 100);
-            if (cityCode !== provinceCode && db[cityCode]) {
-                state.cityCode = cityCode;
-                state.city = db[cityCode];
-            }
-            else if (~((_a = db.city[provinceCode]) === null || _a === void 0 ? void 0 : _a.indexOf(code))) {
-                state.cityCode = code;
-                state.city = db[code];
-            }
-            if (code % 100) {
-                state.district = db[code];
-                state.districtCode = code;
-            }
-        }
-        if (value && value.street) {
-            state.street = value.street;
-        }
-        else if (typeof value === 'string' && ~value.indexOf(delimiter)) {
-            state.street = value.slice(value.indexOf(delimiter) + delimiter.length);
-        }
-        this.setState(state);
+        this.setState(getCityFromCode({
+            value: value,
+            delimiter: delimiter,
+            db: db
+        }));
     };
     CityPicker.prototype.syncOut = function () {
         var _a = this.props, onChange = _a.onChange, allowStreet = _a.allowStreet, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter;
@@ -286,7 +301,11 @@ var ThemedCity = amisCore.themeable(amisCore.localeable(CityPicker));
 var LocationControl = /** @class */ (function (_super) {
     tslib.__extends(LocationControl, _super);
     function LocationControl() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.state = {
+            db: null
+        };
+        return _this;
     }
     LocationControl.prototype.doAction = function (action, data, throwErrors) {
         var _a = this.props, resetValue = _a.resetValue, onChange = _a.onChange;
@@ -300,14 +319,12 @@ var LocationControl = /** @class */ (function (_super) {
     };
     LocationControl.prototype.handleChange = function (value) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, onChange, rendererEvent;
+            var _a, dispatchEvent, onChange, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, onChange = _a.onChange;
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.createObject(data, {
-                                value: value
-                            }))];
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, onChange = _a.onChange;
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -319,6 +336,30 @@ var LocationControl = /** @class */ (function (_super) {
             });
         });
     };
+    LocationControl.prototype.renderStatic = function (displayValue) {
+        var _this = this;
+        if (displayValue === void 0) { displayValue = ''; }
+        var _a = this.props, value = _a.value, delimiter = _a.delimiter;
+        if (!this.state.db) {
+            loadDb(function (db) {
+                _this.setState({
+                    db: tslib.__assign(tslib.__assign({}, db.default), { province: db.province, city: db.city, district: db.district })
+                });
+            });
+            return React__default["default"].createElement(amisUi.Spinner, { size: 'sm' });
+        }
+        if (!value) {
+            return React__default["default"].createElement(React__default["default"].Fragment, null, displayValue);
+        }
+        var _b = getCityFromCode({
+            value: value,
+            delimiter: delimiter,
+            db: this.state.db
+        }), province = _b.province, city = _b.city, district = _b.district, street = _b.street;
+        return (React__default["default"].createElement(React__default["default"].Fragment, null, [province, city, district, street]
+            .filter(function (v) { return !!v; })
+            .join(delimiter)));
+    };
     LocationControl.prototype.render = function () {
         var _a = this.props, value = _a.value, allowCity = _a.allowCity, allowDistrict = _a.allowDistrict, extractValue = _a.extractValue, joinValues = _a.joinValues, allowStreet = _a.allowStreet, disabled = _a.disabled, searchable = _a.searchable, env = _a.env, useMobileUI = _a.useMobileUI;
         var mobileUI = useMobileUI && amisCore.isMobile();
@@ -336,6 +377,12 @@ var LocationControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
     ], LocationControl.prototype, "handleChange", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], LocationControl.prototype, "render", null);
     return LocationControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {