@bchr/bchr-front-lib 0.3.118 → 0.3.122

package/lib/base/layout/ui_tpl/form/FormForModify.js

@@ -336,7 +336,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
           label: dataItem.label,
           name: dataItem.name,
           rules: [{
-            required: !dataItem.b_disabled && dataItem.required
+            required: !dataItem.b_readonly && dataItem.required
           }]
         }, dataItem.render));
       }
@@ -641,7 +641,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
           required: !dataItem.b_readonly && b_required,
           message: "请填写" + name,
           whitespace: true,
-          validator: _this2.validator.bind(_assertThisInitialized(_this2), !dataItem.b_disabled && b_required, ui_render_type)
+          validator: _this2.validator.bind(_assertThisInitialized(_this2), !dataItem.b_readonly && b_required, ui_render_type)
         }, {
           required: false,
           message: name + "格式不正确",
@@ -649,7 +649,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
           validator: _this2.formatValidator.bind(_assertThisInitialized(_this2)),
           pattern: regexp_pattern
         }],
-        hasFeedback: !dataItem.b_disabled && b_required,
+        hasFeedback: !dataItem.b_readonly && b_required,
         valuePropName: valuePropName ? valuePropName : "value"
       }, component));
     });

package/lib/services/HttpService.js

@@ -131,6 +131,14 @@ var HttpService = /*#__PURE__*/function () {
         rpcMethodName = "";
       }
 
+      if (jsonObject) {
+        ajaxOptions.data = jsonObject;
+      }
+
+      if (ajaxOptions.rpcMethodName) {
+        delete ajaxOptions.rpcMethodName;
+      }
+
       ajaxOptions.type = "post";
       ajaxOptions.dataType = "json";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bchr/bchr-front-lib",
-  "version": "0.3.118",
+  "version": "0.3.122",
   "description": "bchr front lib",
   "main": "lib/index.js",
   "scripts": {

package/src/base/layout/ui_tpl/form/FormForModify.js

@@ -326,7 +326,7 @@ class FormForModify extends React.Component{
                             key={form_id + "_" + dataItem.code}
                             label={dataItem.label}
                             name={dataItem.name}
-                            rules={[{ required: !dataItem.b_disabled && dataItem.required}]}
+                            rules={[{ required: !dataItem.b_readonly && dataItem.required}]}
                         >
                             {dataItem.render}
                         </Form.Item>
@@ -728,10 +728,10 @@ class FormForModify extends React.Component{
                     name={code}
                     initialValue={initialValue}
                     rules={[
-                        {required: (!dataItem.b_readonly && b_required), message: ("请填写" + name), whitespace: true, validator: this.validator.bind(this, (!dataItem.b_disabled && b_required), ui_render_type)},
+                        {required: (!dataItem.b_readonly && b_required), message: ("请填写" + name), whitespace: true, validator: this.validator.bind(this, (!dataItem.b_readonly && b_required), ui_render_type)},
                         {required: false, message: (name + "格式不正确"), whitespace: true, validator: this.formatValidator.bind(this), pattern: regexp_pattern}
                     ]}
-                    hasFeedback={(!dataItem.b_disabled && b_required)}
+                    hasFeedback={(!dataItem.b_readonly && b_required)}
                     valuePropName={valuePropName ? valuePropName : "value"}
                 >
                     {component}

package/src/services/HttpService.js

@@ -114,6 +114,14 @@ class HttpService {
             rpcMethodName = "";
         }
 
+        if (jsonObject) {
+            ajaxOptions.data = jsonObject;
+        }
+
+        if (ajaxOptions.rpcMethodName) {
+            delete ajaxOptions.rpcMethodName;
+        }
+
         ajaxOptions.type = "post";
         ajaxOptions.dataType = "json";