@bchr/bchr-front-lib 0.3.150 → 0.3.151

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

@@ -1420,18 +1420,22 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "onValuesChange",
     value: function onValuesChange(changedValues, allValues) {
+      var fieldCodeKeyMap = this.state.fieldCodeKeyMap;
+
       for (var attr in changedValues) {
         var value = changedValues[attr];
+        var fieldCodeUIItem = fieldCodeKeyMap[attr];
+        var ui_render_type = fieldCodeUIItem.ui_render_type;
 
-        if (attr.endsWith("_date")) {
-          value = value ? value.valueOf() : "";
-        } else if (attr.indexOf('_date$') !== -1) {
+        if (_consts.UI_RENDER_TYPE.DATE == ui_render_type) {
           value = value ? value.format("YYYY-MM-DD") : "";
+        } else if (_consts.UI_RENDER_TYPE.DATE_YEAR == ui_render_type) {
+          value = value ? value.format("YYYY") : "";
+        } else if (_consts.UI_RENDER_TYPE.DATE_MONTH == ui_render_type) {
+          value = value ? value.format(value._f) : "";
         }
 
-        if (value instanceof _moment["default"] && value._f === 'YYYY' || value instanceof _moment["default"] && value._f === 'YYYYMM') {
-          value = value ? value.format(value._f) : '';
-        } else if (value instanceof Array) {
+        if (value instanceof Array) {
           value = value ? value.join(",") : null;
         }
 

package/lib/services/HttpService.js

@@ -129,27 +129,26 @@ var HttpService = /*#__PURE__*/function () {
 
       if (!rpcMethodName) {
         rpcMethodName = "";
-      } // if (!this.__checkJSONObjectSecurity(jsonObject)) {
-      //
-      // }
+      }
 
+      if (!this.__checkJSONObjectSecurity(jsonObject)) {
+        if (jsonObject) {
+          ajaxOptions.data = jsonObject;
+        }
 
-      if (jsonObject) {
-        ajaxOptions.data = jsonObject;
-      }
+        if (ajaxOptions.rpcMethodName) {
+          delete ajaxOptions.rpcMethodName;
+        }
 
-      if (ajaxOptions.rpcMethodName) {
-        delete ajaxOptions.rpcMethodName;
-      }
+        ajaxOptions.type = "post";
+        ajaxOptions.dataType = "json";
 
-      ajaxOptions.type = "post";
-      ajaxOptions.dataType = "json";
+        if (!ajaxOptions.url) {
+          ajaxOptions.url = this.requestContextPath + rpcMethodName;
+        }
 
-      if (!ajaxOptions.url) {
-        ajaxOptions.url = this.requestContextPath + rpcMethodName;
+        return _jquery["default"].ajax(ajaxOptions);
       }
-
-      return _jquery["default"].ajax(ajaxOptions);
     }
   }, {
     key: "__postForMock",
@@ -265,12 +264,11 @@ var HttpService = /*#__PURE__*/function () {
 
       if (_jquery["default"].isPlainObject(ajaxOptions.data)) {
         jsonObject = ajaxOptions.data;
-      } // if (!this.__checkJSONObjectSecurity(jsonObject)) {
-      //
-      // }
-
+      }
 
-      return this.postJSONWithNotCareSecurity(options, jsonObject, mockOptions);
+      if (!this.__checkJSONObjectSecurity(jsonObject)) {
+        return this.postJSONWithNotCareSecurity(options, jsonObject, mockOptions);
+      }
     }
   }, {
     key: "postJSONAllowHTML",
@@ -363,7 +361,7 @@ var HttpService = /*#__PURE__*/function () {
         return;
       }
 
-      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|svg).*?<\/\2>/i.test(str);
+      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("不安全的输入,请检查!");

package/package.json

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

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

@@ -1338,18 +1338,22 @@ class FormForModify extends React.Component{
     }
 
     onValuesChange(changedValues, allValues) {
+        let {fieldCodeKeyMap} = this.state;
         for (let attr in changedValues) {
             let value = changedValues[attr];
 
-            if (attr.endsWith("_date")) {
-                value = value ? value.valueOf() : "";
-            }else if (attr.indexOf('_date$') !== -1) {
+            let fieldCodeUIItem  = fieldCodeKeyMap[attr];
+            let {ui_render_type} = fieldCodeUIItem;
+
+            if (UI_RENDER_TYPE.DATE == ui_render_type) {
                 value = value ? value.format("YYYY-MM-DD") : "";
+            } else if (UI_RENDER_TYPE.DATE_YEAR == ui_render_type) {
+                value = value ? value.format("YYYY") : "";
+            } else if (UI_RENDER_TYPE.DATE_MONTH == ui_render_type) {
+                value = value ? value.format(value._f) : "";
             }
 
-            if ((value instanceof moment && value._f === 'YYYY') || (value instanceof moment && value._f === 'YYYYMM')) {
-                value = value ? value.format(value._f) : '';
-            } else if (value instanceof Array) {
+            if (value instanceof Array) {
                 value = value ? value.join(",") : null;
             }
 

package/src/services/HttpService.js

@@ -114,25 +114,24 @@ class HttpService {
             rpcMethodName = "";
         }
 
-        // if (!this.__checkJSONObjectSecurity(jsonObject)) {
-        //
-        // }
-        if (jsonObject) {
-            ajaxOptions.data = jsonObject;
-        }
+        if (!this.__checkJSONObjectSecurity(jsonObject)) {
+            if (jsonObject) {
+                ajaxOptions.data = jsonObject;
+            }
 
-        if (ajaxOptions.rpcMethodName) {
-            delete ajaxOptions.rpcMethodName;
-        }
+            if (ajaxOptions.rpcMethodName) {
+                delete ajaxOptions.rpcMethodName;
+            }
 
-        ajaxOptions.type = "post";
-        ajaxOptions.dataType = "json";
+            ajaxOptions.type = "post";
+            ajaxOptions.dataType = "json";
 
-        if (!ajaxOptions.url) {
-            ajaxOptions.url  = this.requestContextPath + rpcMethodName;
-        }
+            if (!ajaxOptions.url) {
+                ajaxOptions.url  = this.requestContextPath + rpcMethodName;
+            }
 
-        return $.ajax(ajaxOptions);
+            return $.ajax(ajaxOptions);
+        }
     }
 
     __postForMock(mockOptions) {
@@ -251,11 +250,9 @@ class HttpService {
             jsonObject = ajaxOptions.data;
         }
 
-        // if (!this.__checkJSONObjectSecurity(jsonObject)) {
-        //
-        // }
-
-        return this.postJSONWithNotCareSecurity(options, jsonObject, mockOptions);
+        if (!this.__checkJSONObjectSecurity(jsonObject)) {
+            return this.postJSONWithNotCareSecurity(options, jsonObject, mockOptions);
+        }
     }
 
     postJSONAllowHTML(options, jsonObject, mockOptions) {
@@ -342,7 +339,7 @@ class HttpService {
             return;
         }
 
-        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|svg).*?<\/\2>/i.test(str);
+        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("不安全的输入,请检查!");
         }