@bchr/bchr-front-lib 0.3.110 → 0.3.114

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

@@ -0,0 +1,559 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _treeview = _interopRequireDefault(require("@progress/kendo-treeview-react-wrapper/dist/npm/treeview"));
+
+var _antd = require("antd");
+
+var _kendoReactGrid = require("@progress/kendo-react-grid");
+
+var _bchrFrontLib = require("@bchr/bchr-front-lib");
+
+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); }
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+var Search = _antd.Input.Search;
+
+var LeftOrgTreeRightPersonGridForSelectPsnModal = /*#__PURE__*/function (_React$Component) {
+  _inherits(LeftOrgTreeRightPersonGridForSelectPsnModal, _React$Component);
+
+  var _super = _createSuper(LeftOrgTreeRightPersonGridForSelectPsnModal);
+
+  function LeftOrgTreeRightPersonGridForSelectPsnModal(_props) {
+    var _this2;
+
+    _classCallCheck(this, LeftOrgTreeRightPersonGridForSelectPsnModal);
+
+    _this2 = _super.call(this, _props);
+
+    _defineProperty(_assertThisInitialized(_this2), "buildQueryOrgTreeNodeURL", function (e) {
+      var parent_org_node_pk = 0;
+
+      if (_this2.orgTreeRef.current && _this2.orgTreeRef.current.widgetInstance) {
+        parent_org_node_pk = e.pk;
+      }
+
+      return _this2.http().getRequestPath("queryOrgDataByCurrentUserAuthOfLazyLoad?&parent_org_pk=".concat(parent_org_node_pk, "&org_expanded_level=").concat(_this2.props.org_expanded_level, "&is_implicit_auth=").concat(_this2.props.is_implicit_auth));
+    });
+
+    _defineProperty(_assertThisInitialized(_this2), "treeNodeTemplate", function (props) {
+      if (props.item.org_type == 1) {
+        return "<div class=\"tree-node-box\" key={props.item.pk}>\n                        <span class=\"iconfont icon-bchr-corporate-repor\"></span><span>".concat(props.item.name, "</span>\n                    </div>");
+      } else if (props.item.org_type == 2) {
+        return "<div class=\"tree-node-box\" key={props.item.pk}>\n                        <span class=\"iconfont icon-bchr-virtual-dept\"></span><span>".concat(props.item.name, "</span>\n                    </div>");
+      } else if (props.item.org_type == 3) {
+        return "<div class=\"tree-node-box\" key={props.item.pk}>\n                        <span class=\"iconfont icon-bchr-post-manage\"></span><span>".concat(props.item.name, "</span>\n                    </div>");
+      } else {
+        return "<div class=\"tree-node-box\" key={props.item.pk}>\n                        <span class=\"iconfont icon-bchr-person1\"></span><span>".concat(props.item.name, "</span>\n                    </div>");
+      }
+    });
+
+    _defineProperty(_assertThisInitialized(_this2), "onPersonSearch", function (e) {
+      var that = _assertThisInitialized(_this2);
+
+      Promise.all([function () {
+        var currentState = that.state;
+        var personNameKeyWords = currentState.personNameKeyWords;
+
+        if (!e && e.trim() == personNameKeyWords) {
+          return;
+        }
+
+        that.setState(_objectSpread(_objectSpread({}, currentState), {}, {
+          personNameKeyWords: e ? e.trim() : null
+        }));
+      }()]).then(_this2.queryPsnList);
+    });
+
+    _defineProperty(_assertThisInitialized(_this2), "onSelect", function (event) {
+      debugger;
+
+      var that = _assertThisInitialized(_this2);
+
+      if (!event) {
+        return;
+      }
+
+      Promise.all([function () {
+        var selectedOrgNode;
+
+        if (event.node) {
+          selectedOrgNode = that.orgTreeRef.current.widgetInstance.dataItem(event.node);
+        } else {
+          selectedOrgNode = event;
+        }
+
+        var currentState = that.state;
+        var gridOperator = {
+          skip: 0,
+          take: currentState.gridOperator.take
+        };
+        that.setState(_objectSpread(_objectSpread({}, currentState), {}, {
+          selectedOrg: selectedOrgNode,
+          gridOperator: gridOperator,
+          selectedPsnList: [],
+          isAllPsnSelected: false
+        }));
+      }()]).then(_this2.queryPsnList);
+    });
+
+    _defineProperty(_assertThisInitialized(_this2), "onGridHeaderSelectionChange", function () {
+      var currentState = _this2.state;
+      var pagerData = currentState.pagerData;
+      var isAllPsnSelected = !currentState.isAllPsnSelected;
+
+      if (pagerData.data && pagerData.data.length > 0) {
+        pagerData.data.forEach(function (dataItem) {
+          dataItem.selected = isAllPsnSelected;
+        });
+      }
+
+      _this2.setState(_objectSpread(_objectSpread({}, currentState), {}, {
+        pagerData: pagerData,
+        isAllPsnSelected: isAllPsnSelected,
+        selectedPsnList: []
+      }));
+    });
+
+    _defineProperty(_assertThisInitialized(_this2), "onGridRowSelectionChange", function (e) {
+      var selectedRowData = e.dataItem;
+      selectedRowData.selected = !selectedRowData.selected;
+      var currentState = _this2.state;
+      var selectedPsnList = [];
+      var psnList = currentState.pagerData.data;
+      var isAllPsnSelected = true;
+
+      if (psnList && psnList.length > 0) {
+        psnList.forEach(function (dataItem) {
+          if (dataItem.selected) {
+            selectedPsnList.push(dataItem);
+          }
+        });
+      }
+
+      if (selectedPsnList.length != currentState.pagerData.total) {
+        isAllPsnSelected = false;
+      }
+
+      _this2.setState(_objectSpread(_objectSpread({}, currentState), {}, {
+        selectedPsnList: selectedPsnList,
+        isAllPsnSelected: isAllPsnSelected
+      }));
+    });
+
+    _this2.orgTreeRef = /*#__PURE__*/_react["default"].createRef();
+
+    var _this = _assertThisInitialized(_this2);
+
+    _this2.state = {
+      selectedOrg: null,
+      gridOperator: {
+        skip: 0,
+        take: 20
+      },
+      pagerData: {
+        data: [],
+        total: 0
+      },
+      personNameKeyWords: null,
+      isAllPsnSelected: false,
+      selectedPsnList: [],
+      isInitSelectedRootOrg: false
+    };
+    _this2.dataSource = {
+      transport: {
+        read: {
+          url: _this2.buildQueryOrgTreeNodeURL,
+          dataType: "json",
+          Type: "POST"
+        }
+      },
+      schema: {
+        model: {
+          id: "pk",
+          hasChildren: "b_has_child"
+        }
+      },
+      requestEnd: function requestEnd(e) {
+        debugger;
+        var currentState = _this.state;
+
+        if (currentState.isInitSelectedRootOrg) {
+          return;
+        }
+
+        if (!e.response || e.response.length == 0) {
+          return;
+        }
+
+        if (_this.props.isDefaultSelectedFirstOrg) {
+          var expand_pk_path = e.response[0].pk_path.split("/");
+          expand_pk_path = expand_pk_path.slice(1, expand_pk_path.length - 1);
+          expand_pk_path.unshift(0);
+          var last_node_pk = expand_pk_path[expand_pk_path.length - 1];
+          var treeView = _this.orgTreeRef.current.widgetInstance;
+          treeView.expandPath(expand_pk_path, function () {
+            var nodeDataItem = treeView.dataSource.get(last_node_pk);
+
+            if (nodeDataItem && nodeDataItem.uid) {
+              var treeNodeEle = treeView.findByUid(nodeDataItem.uid);
+
+              if (treeNodeEle && treeNodeEle.length > 0) {
+                treeView.element.find(".searched").removeClass("searched");
+                treeNodeEle.find(".k-in:first").addClass("searched");
+              }
+
+              _this.scrollTreeView(treeView, nodeDataItem);
+
+              treeView.select(treeNodeEle);
+
+              _this.onSelect(nodeDataItem);
+            }
+          });
+        }
+
+        _this.setState(_objectSpread(_objectSpread({}, currentState), {}, {
+          isInitSelectedRootOrg: true
+        }));
+      }
+    };
+    _this2.queryPsnList = _this2.queryPsnList.bind(_assertThisInitialized(_this2));
+    _this2.onOk = _this2.onOk.bind(_assertThisInitialized(_this2));
+    return _this2;
+  }
+
+  _createClass(LeftOrgTreeRightPersonGridForSelectPsnModal, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {}
+  }, {
+    key: "getFunctionLetBasePath",
+    value: function getFunctionLetBasePath() {
+      if (!this.props.functionLetBasePath) {
+        throw new Error("请为组件注入属性【functionLetBasePath】");
+      }
+
+      return this.props.functionLetBasePath;
+    }
+  }, {
+    key: "scrollTreeView",
+    value: function scrollTreeView(treeView, nodeDataItem) {
+      var treeNodeEle = treeView.findByUid(nodeDataItem.uid);
+      var treeViewHeight = treeView.element.parent().height();
+      var treeViewTop = treeView.element.offset().top;
+      var treeNodeTop = treeNodeEle.offset().top;
+      var scrollTop = treeView.element.parent().scrollTop();
+      scrollTop = treeNodeTop - treeViewTop - treeViewHeight / 2;
+      treeView.element.parent().scrollTop(scrollTop);
+    }
+    /**
+     *  Lazy Loading URL
+     * @param e
+     * @returns {*}
+     */
+
+  }, {
+    key: "http",
+    value: function http() {
+      return new _bchrFrontLib.HttpService(this.props.appConfig.back_service_rpc_prefix + this.getFunctionLetBasePath(), this.props.appConfig);
+    }
+    /**
+     * 组织 Node Render
+     * @param props
+     * @returns {string}
+     */
+
+  }, {
+    key: "queryPsnList",
+
+    /**
+     * 查询人员数据
+     * @returns {Promise<void>}
+     */
+    value: function () {
+      var _queryPsnList = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        var that, currentState, selectedOrg, personNameKeyWords, gridOperator, isAllPsnSelected, selectedPsnList, newPagerData, queryOrgPkParems, queryPsnParams, i, selectedPsnItem, j, dataItem;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.prev = 0;
+                that = this;
+                currentState = that.state;
+                selectedOrg = currentState.selectedOrg;
+                personNameKeyWords = currentState.personNameKeyWords;
+                gridOperator = currentState.gridOperator;
+                isAllPsnSelected = currentState.isAllPsnSelected;
+                selectedPsnList = currentState.selectedPsnList;
+                newPagerData = {
+                  data: [],
+                  total: 0
+                };
+
+                if (!(selectedOrg && selectedOrg.pk)) {
+                  _context.next = 15;
+                  break;
+                }
+
+                queryOrgPkParems = {
+                  parent_org_pk: selectedOrg.pk,
+                  is_implicit_auth: that.props.is_implicit_auth
+                };
+                queryPsnParams = {
+                  parent_org_pk: selectedOrg.pk,
+                  is_implicit_auth: that.props.is_implicit_auth,
+                  person_name_key_words: personNameKeyWords,
+                  page_index: gridOperator.skip / gridOperator.take + 1,
+                  page_size: gridOperator.take
+                };
+                _context.next = 14;
+                return that.http().post("queryPersonListByOrgPksAndPersonName", queryPsnParams);
+
+              case 14:
+                newPagerData = _context.sent;
+
+              case 15:
+                if (newPagerData && newPagerData.data && newPagerData.data.length > 0) {
+                  if (isAllPsnSelected) {
+                    newPagerData.data.forEach(function (dataItem) {
+                      dataItem.selected = isAllPsnSelected;
+                    });
+                  } else {
+                    if (selectedPsnList && selectedPsnList.length > 0) {
+                      for (i in selectedPsnList) {
+                        selectedPsnItem = selectedPsnList[i];
+
+                        for (j in newPagerData.data) {
+                          dataItem = newPagerData.data[j];
+
+                          if (dataItem.pk == selectedPsnItem.pk) {
+                            dataItem.selected = true;
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+
+                this.setState(_objectSpread(_objectSpread({}, currentState), {}, {
+                  pagerData: _objectSpread({}, newPagerData)
+                }));
+                _context.next = 22;
+                break;
+
+              case 19:
+                _context.prev = 19;
+                _context.t0 = _context["catch"](0);
+                this.dealAjaxException(_context.t0);
+
+              case 22:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this, [[0, 19]]);
+      }));
+
+      function queryPsnList() {
+        return _queryPsnList.apply(this, arguments);
+      }
+
+      return queryPsnList;
+    }()
+    /**
+     * 页码&页大小发生变化
+     * @param e
+     */
+
+  }, {
+    key: "onDataStateChange",
+    value: function onDataStateChange(e) {
+      var that = this;
+      Promise.all([function () {
+        var currentState = that.state;
+        that.setState(_objectSpread(_objectSpread({}, currentState), {}, {
+          gridOperator: {
+            skip: e.data.skip,
+            take: e.data.take
+          }
+        }));
+      }()]).then(this.queryPsnList);
+    }
+    /**
+     * Header Select
+     */
+
+  }, {
+    key: "onOk",
+    value: function onOk() {
+      var selectedPsnList = this.state.selectedPsnList;
+
+      if (!selectedPsnList || selectedPsnList.length == 0) {
+        _bchrFrontLib.SmartMessage.info("请选择人员");
+
+        return;
+      } else {
+        this.props.onOk(selectedPsnList);
+      }
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this3 = this,
+          _React$createElement;
+
+      var treeViewMessages = {
+        retry: "重新加载",
+        requestFailed: "加载失败.",
+        loading: "正在加载中..."
+      };
+      return /*#__PURE__*/_react["default"].createElement(_antd.Modal, {
+        className: "left-org-tree-right-person-grid-modal ".concat(this.props.className ? this.props.className : ''),
+        title: "\u4EBA\u5458\u53C2\u7167",
+        visible: true,
+        centered: true,
+        width: '1000px',
+        onCancel: this.props.onCancel,
+        onOk: this.onOk
+      }, /*#__PURE__*/_react["default"].createElement(Search, {
+        className: "person-search-box",
+        placeholder: "\u4EBA\u5458\u641C\u7D22",
+        onSearch: this.onPersonSearch
+      }), /*#__PURE__*/_react["default"].createElement("div", {
+        className: "left-org-tree-right-person-grid-container"
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "left-org-tree-box"
+      }, /*#__PURE__*/_react["default"].createElement(_treeview["default"], {
+        dataSource: this.dataSource,
+        messages: treeViewMessages,
+        expandIcons: false,
+        dataTextField: "name",
+        template: this.treeNodeTemplate,
+        ref: this.orgTreeRef,
+        select: this.onSelect
+      })), /*#__PURE__*/_react["default"].createElement("div", {
+        className: "right-psn-grid-box"
+      }, /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.Grid, _extends({
+        data: this.state.pagerData.data,
+        total: this.state.pagerData.total
+      }, this.state.gridOperator, {
+        pageable: {
+          pageSizes: [20, 50, 100, 200],
+          type: 'numeric'
+        },
+        pageSize: 20,
+        sortable: true,
+        resizable: true,
+        selectedField: "selected",
+        onDataStateChange: this.onDataStateChange.bind(this),
+        onSelectionChange: this.onGridRowSelectionChange,
+        onHeaderSelectionChange: this.onGridHeaderSelectionChange
+      }), /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, {
+        locked: true,
+        field: "selected",
+        title: "\u9009\u62E9",
+        width: "50px",
+        className: "text-center locked",
+        headerClassName: "text-center",
+        sortable: false,
+        headerCell: function headerCell(props) {
+          return /*#__PURE__*/_react["default"].createElement(_antd.Checkbox, {
+            checked: _this3.state.isAllPsnSelected,
+            onChange: _this3.onGridHeaderSelectionChange
+          });
+        },
+        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.Checkbox, {
+            checked: props.dataItem.selected,
+            onChange: _this3.onGridRowSelectionChange.bind(_this3, props)
+          }));
+        }
+      }), /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, (_React$createElement = {
+        field: "sequence_number",
+        title: "\u5E8F\u53F7",
+        width: "50px",
+        className: "text-center",
+        headerClassName: "text-center"
+      }, _defineProperty(_React$createElement, "width", "55px"), _defineProperty(_React$createElement, "sortable", false), _defineProperty(_React$createElement, "cell", _bchrFrontLib.GridRowSequenceNumberCell), _React$createElement)), /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, {
+        field: "name",
+        title: "\u59D3\u540D",
+        className: "text-center",
+        headerClassName: "text-center",
+        width: "120px"
+      }), /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, {
+        field: "code",
+        title: "\u4EBA\u5458\u7F16\u7801",
+        className: "text-center",
+        headerClassName: "text-center",
+        width: "120px"
+      }), /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, {
+        field: "corp_ext_name",
+        title: "\u5355\u4F4D\u540D\u79F0",
+        className: "text-center",
+        headerClassName: "text-center",
+        width: "180px"
+      }), /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, {
+        field: "dept_ext_name",
+        title: "\u90E8\u95E8\u540D\u79F0",
+        className: "text-center",
+        headerClassName: "text-center",
+        width: "180px"
+      }), /*#__PURE__*/_react["default"].createElement(_kendoReactGrid.GridColumn, {
+        field: "post_ext_name",
+        title: "\u5C97\u4F4D\u540D\u79F0",
+        className: "text-center",
+        headerClassName: "text-center",
+        width: "180px"
+      })))));
+    }
+  }]);
+
+  return LeftOrgTreeRightPersonGridForSelectPsnModal;
+}(_react["default"].Component);
+
+var _default = LeftOrgTreeRightPersonGridForSelectPsnModal;
+exports["default"] = _default;

package/lib/services/HttpService.js

@@ -364,10 +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) {
-        var p = Promise.reject(new Error("不安全的输入,请检查!!"));
-        p["catch"](function () {
-          throw new Error("不安全的输入,请检查!");
-        });
+        throw new Error("不安全的输入,请检查!");
       }
     }
   }, {

package/package.json

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

package/src/base/AppFormulaFunctions.js

@@ -48,13 +48,19 @@ window.AppFormulaFunctions = {
 
     // YH use 生活补贴标准级别
     lifeBTLevel : function (post_wa_rank_pk, work_place_pk) {
-        if (!post_wa_rank_pk || !work_place_pk || post_wa_rank_pk == "0") {
-            return null
+        if (!post_wa_rank_pk || !work_place_pk) {
+            console.log("lifeBTLevel param post_wa_rank_pk: " + post_wa_rank_pk + ",work_place_pk" + work_place_pk);
+            return null;
         }
 
         post_wa_rank_pk = post_wa_rank_pk + "";
         work_place_pk   = work_place_pk + "";
 
+        if (post_wa_rank_pk == "0" || post_wa_rank_pk == "0")
+        {
+            return null;
+        }
+
         // M8 和T6以上级别
         let postWaRankOfDeptLevelAndUp = [
             "601801", "601802", "601803", "601804", "601805", "601806", "601807", "601808",
@@ -93,6 +99,7 @@ window.AppFormulaFunctions = {
     // YH use 房补级别
     houseBTLevel : function (post_wa_rank_pk, work_place_pk, person_class_pk) {
         if (!post_wa_rank_pk || !work_place_pk || !person_class_pk) {
+            console.log("houseBTLevel param post_wa_rank_pk: " + post_wa_rank_pk + ",work_place_pk" + work_place_pk + ", person_class_pk=" + person_class_pk);
             return null
         }
 
@@ -105,7 +112,7 @@ window.AppFormulaFunctions = {
             return null;
         }
 
-        //100006、100011、101003、101006、103006、103011
+        //100006、100011、101003、101006、103006、103011 总共六类人员类别有房补
         let houseBTPersonClassPKs = ["100006", "100011", "101003", "101006", "103006", "103011"];
         if (houseBTPersonClassPKs.findIndex(item => item == person_class_pk) === -1) {
             return null;
@@ -179,13 +186,14 @@ window.AppFormulaFunctions = {
     // YH use 意外险级别
     accidentInsLevel : function (execute_wa_grade_pk) {
         if (!execute_wa_grade_pk) {
+            console.log("accidentInsLevel param execute_wa_grade_pk: " + execute_wa_grade_pk)
             return null;
         }
 
         execute_wa_grade_pk = execute_wa_grade_pk + "";
 
         if (execute_wa_grade_pk == "0") {
-            return null
+            return null;
         }
 
         // M1