@bchr/bchr-front-lib 0.3.117 → 0.3.121

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

@@ -324,7 +324,7 @@ var HttpService = /*#__PURE__*/function () {
       var containsHTML = /<(noframes|noscript|object|script|video).*?<\/\2>/i.test(str);
 
       if (containsHTML) {
-        throw new Error("不安全的输入,请检查!");
+        throw new Error("不安全的输入,请检查!【" + str + "】");
       }
     }
   }, {
@@ -364,7 +364,7 @@ var HttpService = /*#__PURE__*/function () {
       var containsHTML = /<(br|basefont|hr|input|source|frame|param|area|meta|!--|col|link|option|base|img|wbr|!DOCTYPE).*?>|<(a|abbr|acronym|address|applet|article|aside|audio|b|bdi|bdo|big|blockquote|body|button|canvas|caption|center|cite|code|colgroup|command|datalist|dd|del|details|dfn|dialog|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frameset|head|header|hgroup|h1|h2|h3|h4|h5|h6|html|i|iframe|ins|kbd|keygen|label|legend|li|map|mark|menu|meter|nav|noframes|noscript|object|ol|optgroup|output|p|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|small|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video).*?<\/\2>/i.test(str);
 
       if (containsHTML) {
-        throw new Error("不安全的输入,请检查!");
+        throw new Error("不安全的输入,请检查!【" + str + "】");
       }
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bchr/bchr-front-lib",
-  "version": "0.3.117",
+  "version": "0.3.121",
   "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

@@ -303,7 +303,7 @@ class HttpService {
 
         let containsHTML = /<(noframes|noscript|object|script|video).*?<\/\2>/i.test(str);
         if (containsHTML) {
-            throw new Error("不安全的输入,请检查!");
+            throw new Error("不安全的输入,请检查!【" + str + "】");
         }
     }
 
@@ -341,7 +341,7 @@ class HttpService {
 
         let containsHTML = /<(br|basefont|hr|input|source|frame|param|area|meta|!--|col|link|option|base|img|wbr|!DOCTYPE).*?>|<(a|abbr|acronym|address|applet|article|aside|audio|b|bdi|bdo|big|blockquote|body|button|canvas|caption|center|cite|code|colgroup|command|datalist|dd|del|details|dfn|dialog|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frameset|head|header|hgroup|h1|h2|h3|h4|h5|h6|html|i|iframe|ins|kbd|keygen|label|legend|li|map|mark|menu|meter|nav|noframes|noscript|object|ol|optgroup|output|p|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|small|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video).*?<\/\2>/i.test(str);
         if (containsHTML) {
-            throw new Error("不安全的输入,请检查!");
+            throw new Error("不安全的输入,请检查!【" + str + "】");
         }
     }