@bchr/bchr-front-lib 0.3.116 → 0.3.120

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/base/widgets/stree/LeftOrgTreeRightPersonGridForSelectPsnModal.js

@@ -9,16 +9,12 @@ var _react = _interopRequireDefault(require("react"));
 
 var _treeview = _interopRequireDefault(require("@progress/kendo-treeview-react-wrapper/dist/npm/treeview"));
 
-var _antd = _interopRequireWildcard(require("antd"));
+var _antd = require("antd");
 
 var _kendoReactGrid = require("@progress/kendo-react-grid");
 
 var _bchrFrontLib = require("@bchr/bchr-front-lib");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
@@ -509,6 +505,7 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
         onSelectionChange: this.onGridRowSelectionChange,
         onHeaderSelectionChange: this.onGridHeaderSelectionChange
       }), this.props.selectType && this.props.selectType === 'single' ? /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, {
+        locked: true,
         field: "selected",
         title: "\u9009\u62E9",
         width: "55px",
@@ -519,8 +516,12 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
         },
         cell: function cell(props) {
           return /*#__PURE__*/_react["default"].createElement("td", {
-            className: "text-center"
-          }, /*#__PURE__*/_react["default"].createElement(_antd["default"], {
+            className: "text-center locked_column k-grid-content-sticky",
+            style: {
+              left: "0px",
+              right: "0px"
+            }
+          }, /*#__PURE__*/_react["default"].createElement(_antd.Radio, {
             name: "selectDef",
             defaultChecked: props.dataItem.selected,
             className: "grid-radio",

package/lib/services/HttpService.js

@@ -131,24 +131,22 @@ var HttpService = /*#__PURE__*/function () {
         rpcMethodName = "";
       }
 
-      if (!this.__checkJSONObjectSecurity(jsonObject)) {
-        if (jsonObject) {
-          ajaxOptions.data = jsonObject;
-        }
-
-        if (ajaxOptions.rpcMethodName) {
-          delete ajaxOptions.rpcMethodName;
-        }
+      if (jsonObject) {
+        ajaxOptions.data = jsonObject;
+      }
 
-        ajaxOptions.type = "post";
-        ajaxOptions.dataType = "json";
+      if (ajaxOptions.rpcMethodName) {
+        delete ajaxOptions.rpcMethodName;
+      }
 
-        if (!ajaxOptions.url) {
-          ajaxOptions.url = this.requestContextPath + rpcMethodName;
-        }
+      ajaxOptions.type = "post";
+      ajaxOptions.dataType = "json";
 
-        return _jquery["default"].ajax(ajaxOptions);
+      if (!ajaxOptions.url) {
+        ajaxOptions.url = this.requestContextPath + rpcMethodName;
       }
+
+      return _jquery["default"].ajax(ajaxOptions);
     }
   }, {
     key: "__postForMock",
@@ -324,7 +322,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 +362,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.116",
+  "version": "0.3.120",
   "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/base/widgets/stree/LeftOrgTreeRightPersonGridForSelectPsnModal.js

@@ -1,6 +1,6 @@
 import React from "react";
 import TreeView from "@progress/kendo-treeview-react-wrapper/dist/npm/treeview";
-import Radio, {Checkbox, Input, Modal} from "antd";
+import {Checkbox, Input, Radio} from "antd";
 import {Grid, GridColumn} from "@progress/kendo-react-grid";
 import {GridRowSequenceNumberCell, SmartMessage, HttpService, SModal} from "@bchr/bchr-front-lib";
 
@@ -445,14 +445,14 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component  {
                             onHeaderSelectionChange={this.onGridHeaderSelectionChange}
                         >
                             {
-                                this.props.selectType && this.props.selectType ==='single' ? <GridColumn field="selected" title="选择" width="55px" className={"text-center"}
+                                this.props.selectType && this.props.selectType ==='single' ? <GridColumn locked field="selected" title="选择" width="55px" className={"text-center"}
                                                                     sortable={false}
                                                                     headerCell={props => {
                                                                         return (<span>选择</span>)
                                                                     }}
                                                                     cell={(props) => {
                                                                         return (
-                                                                            <td className={"text-center"}>
+                                                                            <td className={"text-center locked_column k-grid-content-sticky"} style={{left: "0px", right: "0px"}}>
                                                                                 <Radio name='selectDef' defaultChecked={props.dataItem.selected}
                                                                                        className={"grid-radio"} key={props.dataIndex}
                                                                                        onChange={this.selectPsnRadiosChange.bind(this, props)}

package/src/services/HttpService.js

@@ -114,24 +114,22 @@ class HttpService {
             rpcMethodName = "";
         }
 
-        if (!this.__checkJSONObjectSecurity(jsonObject)) {
-            if (jsonObject) {
-                ajaxOptions.data = jsonObject;
-            }
-
-            if (ajaxOptions.rpcMethodName) {
-                delete ajaxOptions.rpcMethodName;
-            }
+        if (jsonObject) {
+            ajaxOptions.data = jsonObject;
+        }
 
-            ajaxOptions.type = "post";
-            ajaxOptions.dataType = "json";
+        if (ajaxOptions.rpcMethodName) {
+            delete ajaxOptions.rpcMethodName;
+        }
 
-            if (!ajaxOptions.url) {
-                ajaxOptions.url  = this.requestContextPath + rpcMethodName;
-            }
+        ajaxOptions.type = "post";
+        ajaxOptions.dataType = "json";
 
-            return $.ajax(ajaxOptions);
+        if (!ajaxOptions.url) {
+            ajaxOptions.url  = this.requestContextPath + rpcMethodName;
         }
+
+        return $.ajax(ajaxOptions);
     }
 
     __postForMock(mockOptions) {
@@ -303,7 +301,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 +339,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 + "】");
         }
     }