Merge branch 'fix/Process.address' into 'wrdp'

Merge of fix/Process.address 地址选择增加选择范围省市县设置 to wrdp

See merge request o2oa/o2oa!4099

o2web/source/x_component_cms_FormDesigner/Module/Address/address.html

@@ -20,6 +20,14 @@
                     <input type="radio" name="isReadonly" value="false" text{(!$.isReadonly)?'checked':''}/>{{$.lp.no}}
                 </td>
             </tr>
+            <tr>
+                <td class="editTableTitle">{{$.lp.selectRange}}:</td>
+                <td class="editTableValue">
+                    <input type="radio" name="selectRange" value="province" text{($.selectRange==='province')?'checked':''}/>{{$.lp.province}}
+                    <input type="radio" name="selectRange" value="city" text{($.selectRange==='city')?'checked':''}/>{{$.lp.city}}
+                    <input type="radio" name="selectRange" value="county" text{($.selectRange==='county' || !$.selectRange)?'checked':''}/>{{$.lp.county}}
+                </td>
+            </tr>
         </table>
 
         <div class="MWFMaplist" name="styles" title="{{$.lp.style}}"></div>

o2web/source/x_component_portal_PageDesigner/Module/Address/address.html

@@ -20,6 +20,14 @@
                     <input type="radio" name="isReadonly" value="false" text{(!$.isReadonly)?'checked':''}/>{{$.lp.no}}
                 </td>
             </tr>
+            <tr>
+                <td class="editTableTitle">{{$.lp.selectRange}}:</td>
+                <td class="editTableValue">
+                    <input type="radio" name="selectRange" value="province" text{($.selectRange==='province')?'checked':''}/>{{$.lp.province}}
+                    <input type="radio" name="selectRange" value="city" text{($.selectRange==='city')?'checked':''}/>{{$.lp.city}}
+                    <input type="radio" name="selectRange" value="county" text{($.selectRange==='county' || !$.selectRange)?'checked':''}/>{{$.lp.county}}
+                </td>
+            </tr>
         </table>
 
         <div class="MWFMaplist" name="styles" title="{{$.lp.style}}"></div>

o2web/source/x_component_process_FormDesigner/Module/Address/address.html

@@ -20,6 +20,14 @@
                     <input type="radio" name="isReadonly" value="false" text{(!$.isReadonly)?'checked':''}/>{{$.lp.no}}
                 </td>
             </tr>
+            <tr>
+                <td class="editTableTitle">{{$.lp.selectRange}}:</td>
+                <td class="editTableValue">
+                    <input type="radio" name="selectRange" value="province" text{($.selectRange==='province')?'checked':''}/>{{$.lp.province}}
+                    <input type="radio" name="selectRange" value="city" text{($.selectRange==='city')?'checked':''}/>{{$.lp.city}}
+                    <input type="radio" name="selectRange" value="county" text{($.selectRange==='county' || !$.selectRange)?'checked':''}/>{{$.lp.county}}
+                </td>
+            </tr>
         </table>
 
         <div class="MWFMaplist" name="styles" title="{{$.lp.style}}"></div>

o2web/source/x_component_process_FormDesigner/lp/en.js

@@ -923,7 +923,10 @@ MWF.xApplication.process.FormDesigner.LP = {
         "disable": "disable",
         "downloadTempalte": "Download Template",
         "downloadTempalteId": "Download template component ID",
-        "downloadTempalteIdNote": "You can create a component on the form and fill in the component ID here. The system will bind the click event of the download template to the node of the component."
+        "downloadTempalteIdNote": "You can create a component on the form and fill in the component ID here. The system will bind the click event of the download template to the node of the component.",
+        "province": "Province",
+        "city": "City",
+        "county": "County"
     },
     "actionBar": {
         "close":"Close",

o2web/source/x_component_process_FormDesigner/lp/zh-cn.js

@@ -927,7 +927,10 @@ MWF.xApplication.process.FormDesigner.LP = {
         "disable": "禁用",
         "downloadTempalte": "下载模板",
         "downloadTempalteId": "下载模板组件标识",
-        "downloadTempalteIdNote": "您可以在表单上创建一个组件，并在这里填写上组件标识，系统会在该组件的节点(node)绑定下载模板的click事件。"
+        "downloadTempalteIdNote": "您可以在表单上创建一个组件，并在这里填写上组件标识，系统会在该组件的节点(node)绑定下载模板的click事件。",
+        "province": "省",
+        "city": "省市",
+        "county": "省市县"
     },
     "actionBar": {
         "close":"关闭",

o2web/source/x_component_process_Xform/Address.js

@@ -104,6 +104,17 @@ MWF.xApplication.process.Xform.Address = MWF.APPAddress =  new Class(
         value = value.toLowerCase();
         var i = (this.combox.editItem) ? this.combox.editItem.getItemPosition() : this.combox.values.length;
         debugger;
+        if(this.json.selectRange==="province"){
+            if( i > 0 ){
+                if (callback) callback([]);
+                return;
+            }
+        }else if(this.json.selectRange==="city"){
+            if( i > 1 ){
+                if (callback) callback([]);
+                return;
+            }
+        }
         switch (i) {
             case 0: //省
                 o2.Actions.get("x_general_assemble_control").listProvince(function(json){