@bchr/bchr-front-lib 0.3.148 → 0.3.151

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

@@ -484,7 +484,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
               initialValue = initialValue || [];
 
               if (_typeof(initialValue) !== "object") {
-                initialValue = initialValue ? JSON.parse(initialValue) : [];
+                initialValue = initialValue ? initialValue.split(",") : [];
               }
             } else {
               if (typeof initialValue === 'number') {
@@ -514,7 +514,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
               initialValue = data[code] || [];
 
               if (_typeof(initialValue) !== "object") {
-                initialValue = initialValue ? JSON.parse(initialValue) : [];
+                initialValue = initialValue ? initialValue.split(",") : [];
               }
             } else {
               initialValue = data[code] && data[code] > 0 ? data[code] + "" : null;
@@ -1220,7 +1220,8 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
     value: function treeSelectOnChange(ref, config, callback, value, label, extra) {
       var display_code = config.display_code;
       label = extra.allCheckedNodes.map(function (item) {
-        var props = item.node.props;
+        var node = item.node;
+        var props = node ? item.node.props : item.node;
         var ext_attr_value = props.ext_attr_value,
             title = props.title;
 
@@ -1419,17 +1420,23 @@ 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) : '';
+        if (value instanceof Array) {
+          value = value ? value.join(",") : null;
         }
 
         this.props.data[attr] = value;

package/lib/base/layout/ui_tpl/modal/FormModifyModal.js

@@ -42,7 +42,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var ButtonGroup = _antd.Button.Group;
 
 var FormModifyModal = function FormModifyModal(props, ref) {
-  (0, _react.useImperativeMethods)(ref, function () {
+  (0, _react.useImperativeHandle)(ref, function () {
     return {
       closeLoading: closeLoading
     };

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.148",
+  "version": "0.3.151",
   "description": "bchr front lib",
   "main": "lib/index.js",
   "scripts": {

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

@@ -528,7 +528,7 @@ class FormForModify extends React.Component{
                     if (b_multiple) {
                         initialValue = initialValue || [];
                         if (typeof initialValue !== "object") {
-                            initialValue = initialValue ? JSON.parse(initialValue) : [];
+                            initialValue = initialValue ? initialValue.split(",") : [];
                         }
                     }
                     else {
@@ -568,7 +568,7 @@ class FormForModify extends React.Component{
                     if (b_multiple) {
                         initialValue = data[code] || [];
                         if (typeof initialValue !== "object") {
-                            initialValue = initialValue ? JSON.parse(initialValue) : [];
+                            initialValue = initialValue ? initialValue.split(",") : [];
                         }
                     }
                     else {
@@ -1041,7 +1041,8 @@ class FormForModify extends React.Component{
         let {display_code} = config;
 
         label = extra.allCheckedNodes.map(item => {
-            let props = item.node.props;
+            let node = item.node;
+            let props = node ? item.node.props : item.node;
             let {ext_attr_value, title} = props;
 
             if (ext_attr_value != null && ext_attr_value.length > 0 && title.indexOf(ext_attr_value) === 0) {
@@ -1337,17 +1338,23 @@ 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) : '';
+            if (value instanceof Array) {
+                value = value ? value.join(",") : null;
             }
 
             this.props.data[attr] = value;

package/src/base/layout/ui_tpl/modal/FormModifyModal.js

@@ -1,4 +1,4 @@
-import React, {useEffect, useState, forwardRef, useImperativeMethods} from 'react';
+import React, {useEffect, useState, forwardRef, useImperativeHandle} from 'react';
 import SModal from "../../modal/SModal";
 import {Button, message, Spin} from "antd";
 import FormForModify from "../form/FormForModify";
@@ -7,7 +7,7 @@ import $ from 'jquery';
 const ButtonGroup = Button.Group;
 const FormModifyModal = (props, ref) => {
 
-    useImperativeMethods(ref, () => ({
+    useImperativeHandle(ref, () => ({
         closeLoading
     }));
 

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("不安全的输入,请检查!");
         }