@byteluck-fe/model-driven-controls 7.0.0-props.49 → 7.0.0-props.50

package/dist/esm/formControls/Address/property.js

@@ -91,14 +91,22 @@ var AddressControlPropertyRuntimeRules = /*#__PURE__*/ function(BaseControlPrope
         if (props.required && !props.isHide) {
             var valueValidate = {
                 type: 'object',
-                fields: {
-                    province: {
-                        type: 'string',
-                        required: props.required,
-                        message: getLocaleText('CMD.pleaseSelectProvince', null, '请选择省')
-                    }
-                }
+                fields: {}
             };
+            if (props.addressType.includes('country')) {
+                valueValidate.fields.country = {
+                    type: 'string',
+                    required: props.required,
+                    message: getLocaleText('CMD.pleaseSelectCountry', null, '请选择国家')
+                };
+            }
+            if (props.addressType.includes('province')) {
+                valueValidate.fields.province = {
+                    type: 'string',
+                    required: props.required,
+                    message: getLocaleText('CMD.pleaseSelectProvince', null, '请选择省')
+                };
+            }
             if (props.addressType.includes('city')) {
                 valueValidate.fields.city = {
                     type: 'string',
@@ -125,19 +133,22 @@ var AddressProperty = /*#__PURE__*/ function(BaseControlProperty) {
     function AddressProperty(props) {
         _class_call_check(this, AddressProperty);
         var _this;
-        var _ref, _ref1, _ref2, _ref3, _ref4;
+        var _ref, _ref1, _ref2, _ref3, _ref4, _ref5;
         _this = _call_super(this, AddressProperty, [
             props
-        ]), _define_property(_this, "defaultValueType", void 0), _define_property(_this, "defaultValue", void 0), _define_property(_this, "addressType", void 0);
+        ]), _define_property(_this, "defaultValueType", void 0), _define_property(_this, "defaultValue", void 0), _define_property(_this, "addressType", void 0), _define_property(_this, "countryScope", void 0);
         _this.caption = (_ref = props === null || props === void 0 ? void 0 : props.caption) !== null && _ref !== void 0 ? _ref : AddressControl.controlName;
         _this.defaultValueType = (_ref1 = props === null || props === void 0 ? void 0 : props.defaultValueType) !== null && _ref1 !== void 0 ? _ref1 : 'default';
-        _this.addressType = (_ref2 = props === null || props === void 0 ? void 0 : props.addressType) !== null && _ref2 !== void 0 ? _ref2 : [
+        _this.countryScope = (_ref2 = props === null || props === void 0 ? void 0 : props.countryScope) !== null && _ref2 !== void 0 ? _ref2 : [
+            'MDCT00000040'
+        ];
+        _this.addressType = (_ref3 = props === null || props === void 0 ? void 0 : props.addressType) !== null && _ref3 !== void 0 ? _ref3 : [
             'province',
             'city',
             'district'
         ];
-        _this.defaultValue = new AddressValue((_ref3 = props === null || props === void 0 ? void 0 : props.defaultValue) !== null && _ref3 !== void 0 ? _ref3 : {});
-        _this.placeholder = (_ref4 = props === null || props === void 0 ? void 0 : props.placeholder) !== null && _ref4 !== void 0 ? _ref4 : getLocaleText('CMD.pleaseChooseAddress', null, '请选择地址');
+        _this.defaultValue = new AddressValue((_ref4 = props === null || props === void 0 ? void 0 : props.defaultValue) !== null && _ref4 !== void 0 ? _ref4 : {});
+        _this.placeholder = (_ref5 = props === null || props === void 0 ? void 0 : props.placeholder) !== null && _ref5 !== void 0 ? _ref5 : getLocaleText('CMD.pleaseChooseAddress', null, '请选择地址');
         return _this;
     }
     return AddressProperty;

package/dist/esm/formControls/Address/schema.json

@@ -129,6 +129,16 @@
       "defaultValue": {
         "type": "object",
         "properties": {
+          "country": {
+            "type": "string",
+            "description": "国家编码",
+            "default": ""
+          },
+          "countryDisplay": {
+            "type": "string",
+            "description": "国家显示文字",
+            "default": ""
+          },
           "city": {
             "type": "string",
             "description": "市编码",
@@ -198,6 +208,11 @@
         },
         "description": "地址类型；country：国家；province：省；city：城市；district：区县；",
         "default": "['province', 'city', 'district']"
+      },
+      "internationalScope": {
+        "type": "boolean",
+        "description": "国际范围",
+        "default": false
       }
     },
     "required": []