@bchr/bchr-front-lib 0.3.114 → 0.3.118

package/lib/base/widgets/stree/LeftOrgTreeRightPersonGridForSelectPsnModal.js

@@ -105,8 +105,6 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
     });
 
     _defineProperty(_assertThisInitialized(_this2), "onSelect", function (event) {
-      debugger;
-
       var that = _assertThisInitialized(_this2);
 
       if (!event) {
@@ -180,6 +178,27 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
       }));
     });
 
+    _defineProperty(_assertThisInitialized(_this2), "selectPsnRadiosChange", function (e) {
+      var currentState = _this2.state;
+      var selectedPsnList = [];
+      var psnList = currentState.pagerData.data;
+
+      if (psnList && psnList.length > 0) {
+        psnList.forEach(function (dataItem) {
+          if (dataItem.pk == e.dataItem.pk) {
+            dataItem['selected'] = true;
+            selectedPsnList.push(dataItem);
+          } else {
+            dataItem['selected'] = false;
+          }
+        });
+
+        _this2.setState(_objectSpread(_objectSpread({}, currentState), {}, {
+          selectedPsnList: selectedPsnList
+        }));
+      }
+    });
+
     _this2.orgTreeRef = /*#__PURE__*/_react["default"].createRef();
 
     var _this = _assertThisInitialized(_this2);
@@ -214,7 +233,6 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
         }
       },
       requestEnd: function requestEnd(e) {
-        debugger;
         var currentState = _this.state;
 
         if (currentState.isInitSelectedRootOrg) {
@@ -445,7 +463,7 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
         requestFailed: "加载失败.",
         loading: "正在加载中..."
       };
-      return /*#__PURE__*/_react["default"].createElement(_antd.Modal, {
+      return /*#__PURE__*/_react["default"].createElement(_bchrFrontLib.SModal, {
         className: "left-org-tree-right-person-grid-modal ".concat(this.props.className ? this.props.className : ''),
         title: "\u4EBA\u5458\u53C2\u7167",
         visible: true,
@@ -486,7 +504,32 @@ var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$
         onDataStateChange: this.onDataStateChange.bind(this),
         onSelectionChange: this.onGridRowSelectionChange,
         onHeaderSelectionChange: this.onGridHeaderSelectionChange
-      }), /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, {
+      }), this.props.selectType && this.props.selectType === 'single' ? /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, {
+        locked: true,
+        field: "selected",
+        title: "\u9009\u62E9",
+        width: "55px",
+        className: "text-center",
+        sortable: false,
+        headerCell: function headerCell(props) {
+          return /*#__PURE__*/_react["default"].createElement("span", null, "\u9009\u62E9");
+        },
+        cell: function cell(props) {
+          return /*#__PURE__*/_react["default"].createElement("td", {
+            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",
+            key: props.dataIndex,
+            onChange: _this3.selectPsnRadiosChange.bind(_this3, props)
+          }));
+        }
+      }) : /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, {
         locked: true,
         field: "selected",
         title: "\u9009\u62E9",

package/lib/services/HttpService.js

@@ -131,24 +131,14 @@ var HttpService = /*#__PURE__*/function () {
         rpcMethodName = "";
       }
 
-      if (!this.__checkJSONObjectSecurity(jsonObject)) {
-        if (jsonObject) {
-          ajaxOptions.data = jsonObject;
-        }
-
-        if (ajaxOptions.rpcMethodName) {
-          delete ajaxOptions.rpcMethodName;
-        }
-
-        ajaxOptions.type = "post";
-        ajaxOptions.dataType = "json";
-
-        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 +314,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 +354,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.114",
+  "version": "0.3.118",
   "description": "bchr front lib",
   "main": "lib/index.js",
   "scripts": {

package/src/base/widgets/stree/LeftOrgTreeRightPersonGridForSelectPsnModal.js

@@ -1,8 +1,8 @@
 import React from "react";
 import TreeView from "@progress/kendo-treeview-react-wrapper/dist/npm/treeview";
-import {Checkbox, Input, Modal} from "antd";
+import {Checkbox, Input, Radio} from "antd";
 import {Grid, GridColumn} from "@progress/kendo-react-grid";
-import {GridRowSequenceNumberCell, SmartMessage, HttpService} from "@bchr/bchr-front-lib";
+import {GridRowSequenceNumberCell, SmartMessage, HttpService, SModal} from "@bchr/bchr-front-lib";
 
 
 
@@ -46,7 +46,6 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component  {
                 }
             },
             requestEnd: function (e) {
-                debugger
                 let currentState = _this.state;
 
                 if (currentState.isInitSelectedRootOrg) {
@@ -194,7 +193,6 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component  {
      * @param event
      */
     onSelect = (event) => {
-        debugger
         let that = this;
 
         if (!event) {
@@ -363,6 +361,28 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component  {
         })
     }
 
+    selectPsnRadiosChange = (e) => {
+        let currentState = this.state;
+        let selectedPsnList = [];
+        let psnList = currentState.pagerData.data;
+
+        if (psnList && psnList.length > 0) {
+            psnList.forEach(dataItem => {
+                if (dataItem.pk == e.dataItem.pk) {
+                    dataItem['selected'] = true;
+                    selectedPsnList.push(dataItem)
+                } else {
+                    dataItem['selected'] = false;
+                }
+            });
+
+            this.setState({
+                ...currentState,
+                selectedPsnList
+            })
+        }
+    }
+
     onOk() {
         let {selectedPsnList} = this.state;
 
@@ -383,7 +403,7 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component  {
         };
 
         return (
-            <Modal className={`left-org-tree-right-person-grid-modal ${this.props.className? this.props.className : ''}`}
+            <SModal className={`left-org-tree-right-person-grid-modal ${this.props.className? this.props.className : ''}`}
                    title="人员参照"
                    visible={true}
                    centered
@@ -424,16 +444,32 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component  {
                             onSelectionChange={this.onGridRowSelectionChange}
                             onHeaderSelectionChange={this.onGridHeaderSelectionChange}
                         >
-                            <GridColumn locked field="selected" title="选择" width="50px" className={"text-center locked"}
-                                        headerClassName={"text-center"} sortable={false} headerCell={props => {
-                                return <Checkbox checked={this.state.isAllPsnSelected} onChange={this.onGridHeaderSelectionChange}></Checkbox>
-                            }}
-                                        cell={props => {
-                                            return <td className={"text-center locked_column k-grid-content-sticky"} style={{left: "0px", right: "0px"}}>
-                                                <Checkbox checked={props.dataItem.selected} onChange={this.onGridRowSelectionChange.bind(this, props)}></Checkbox>
-                                            </td>
-                                        }}
-                            />
+                            {
+                                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 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)}
+                                                                                ></Radio>
+                                                                            </td>)
+                                                                    }}/>  : <GridColumn locked field="selected" title="选择" width="50px" className={"text-center locked"}
+                                                                                    headerClassName={"text-center"} sortable={false} headerCell={props => {
+                                    return <Checkbox checked={this.state.isAllPsnSelected} onChange={this.onGridHeaderSelectionChange}></Checkbox>
+                                }}
+                                                                                    cell={props => {
+                                                                                        return <td className={"text-center locked_column k-grid-content-sticky"} style={{left: "0px", right: "0px"}}>
+                                                                                            <Checkbox checked={props.dataItem.selected} onChange={this.onGridRowSelectionChange.bind(this, props)}></Checkbox>
+                                                                                        </td>
+                                                                                    }}
+                                />
+
+                            }
                             <GridColumn field="sequence_number" title="序号" width="50px" className={"text-center"} headerClassName={"text-center"} width="55px" sortable={false} cell={GridRowSequenceNumberCell}/>
                             <GridColumn field="name" title="姓名" className={"text-center"} headerClassName={"text-center"} width="120px" />
                             <GridColumn field="code" title="人员编码" className={"text-center"} headerClassName={"text-center"} width="120px" />
@@ -443,7 +479,7 @@ class LeftOrgTreeRightPersonGridForSelectPsnModal extends React.Component  {
                         </Grid>
                     </div>
                 </div>
-            </Modal>
+            </SModal>
         )
     }
 }

package/src/services/HttpService.js

@@ -114,24 +114,14 @@ class HttpService {
             rpcMethodName = "";
         }
 
-        if (!this.__checkJSONObjectSecurity(jsonObject)) {
-            if (jsonObject) {
-                ajaxOptions.data = jsonObject;
-            }
-
-            if (ajaxOptions.rpcMethodName) {
-                delete ajaxOptions.rpcMethodName;
-            }
-
-            ajaxOptions.type = "post";
-            ajaxOptions.dataType = "json";
-
-            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 +293,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 +331,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 + "】");
         }
     }