dlt-for-react 1.1.17 → 1.1.18

package/README.md

@@ -8,7 +8,7 @@ npm publish
 
 ## 前端 dlt-for-react 依赖包版本更新记录
 
-##### 当前最新版本：1.1.17
+##### 当前最新版本：1.1.18
 
 ##### 安装依赖
 
@@ -16,7 +16,7 @@ npm publish
 
 ##### 版本修改记录
 
-#### V1.1.17—2024 年 3 月 14 日
+#### V1.1.16~18—2024 年 3 月 14 日
 
 1. 新增 HqConfirm 组件
 2. 新增 HqSelect 组件
@@ -28,9 +28,12 @@ npm publish
 8. 新增 HqStuSelector 组件
 9. 新增 HqTeaSelector 组件
 10. 新增 HqMultiSelect 组件
-11. 将 KyInputRender 组件 更名为 HqInputRender 组件
-12. 将 KyInputPicker 组件 更名为 HqInputPicker 组件
-13. 初步将 xgui-for-react 依赖组件移除
+11. 新增 HqButton 组件
+12. 新增 HqSwitch 组件
+13. 将 KyInputRender 组件 更名为 HqInputRender 组件
+14. 将 KyInputPicker 组件 更名为 HqInputPicker 组件
+15. 初步将 xgui-for-react 依赖组件移除
+16. 解决 KyTableCardList 引入依赖错误的问题
 
 #### V1.1.15—2024 年 3 月 1 日
 

package/lib/components/HqButton/index.js

@@ -0,0 +1,95 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _button = require("antd/lib/button");
+
+var _button2 = _interopRequireDefault(_button);
+
+var _objectWithoutProperties2 = require("babel-runtime/helpers/objectWithoutProperties");
+
+var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
+
+var _getPrototypeOf = require("babel-runtime/core-js/object/get-prototype-of");
+
+var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
+
+var _classCallCheck2 = require("babel-runtime/helpers/classCallCheck");
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _createClass2 = require("babel-runtime/helpers/createClass");
+
+var _createClass3 = _interopRequireDefault(_createClass2);
+
+var _possibleConstructorReturn2 = require("babel-runtime/helpers/possibleConstructorReturn");
+
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require("babel-runtime/helpers/inherits");
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
+require("antd/lib/button/style");
+
+var _react = require("react");
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require("prop-types");
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+var _index = require("../../index");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var HqButton = function (_React$Component) {
+  (0, _inherits3.default)(HqButton, _React$Component);
+
+  function HqButton(props) {
+    (0, _classCallCheck3.default)(this, HqButton);
+
+    var _this = (0, _possibleConstructorReturn3.default)(this, (HqButton.__proto__ || (0, _getPrototypeOf2.default)(HqButton)).call(this, props));
+
+    _this.state = {};
+    return _this;
+  }
+
+  (0, _createClass3.default)(HqButton, [{
+    key: "render",
+    value: function render() {
+      var _props = this.props,
+          auth = _props.auth,
+          restProps = (0, _objectWithoutProperties3.default)(_props, ["auth"]);
+
+
+      var isTrue = Boolean(!auth || (0, _index.hasAuth)(auth));
+      if (isTrue) {
+        return _react2.default.createElement(
+          _button2.default,
+          restProps,
+          this.props.children
+        );
+      } else {
+        return null;
+      }
+    }
+  }]);
+  return HqButton;
+}(_react2.default.Component);
+
+//属性默认值
+
+
+HqButton.defaultProps = {
+  auth: undefined
+};
+
+//属性检查
+HqButton.propTypes = {
+  auth: _propTypes2.default.string //权限标志
+};
+exports.default = HqButton;

package/lib/components/HqSwitch/index.js

@@ -0,0 +1,280 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _switch = require("antd/lib/switch");
+
+var _switch2 = _interopRequireDefault(_switch);
+
+var _getPrototypeOf = require("babel-runtime/core-js/object/get-prototype-of");
+
+var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
+
+var _classCallCheck2 = require("babel-runtime/helpers/classCallCheck");
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _createClass2 = require("babel-runtime/helpers/createClass");
+
+var _createClass3 = _interopRequireDefault(_createClass2);
+
+var _possibleConstructorReturn2 = require("babel-runtime/helpers/possibleConstructorReturn");
+
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require("babel-runtime/helpers/inherits");
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
+require("antd/lib/switch/style");
+
+var _react = require("react");
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require("prop-types");
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+var _NHFetch = require("../../utils/NHFetch");
+
+var _NHFetch2 = _interopRequireDefault(_NHFetch);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var pathUrl = "/proData/selectDataList";
+
+/**
+ * @Description: 开关选择器
+ * @author weishihuai
+ * @date 2019/3/7 9:13
+ *
+ * 使用说明:
+ * 1. 使用sign标识从后台查询数据源时，以'DMK_'加上对应代码库标识,如: sign={'DMK_XTGL_SFM'};
+ * 2. 可使用dataSource自定义数据源,格式如: [{"VALUE":"1","LABEL":"是"},{"VALUE":"0","LABEL":"否"}];
+ * 3. 可以使用checkedChildren/unCheckedChildren指定选中/未选中时文本;
+ *  注意: 如果同时配置了sign/dataSource/(checkedChildren/unCheckedChildren),文本取值优先级顺序: sign > dataSource > (checkedChildren/unCheckedChildren)
+ * 4. onChange = (checked,value)父组件回调方法 : checked表示是否选中boolean值(true/false), value表示当前选择器的值('1'/'0');
+ * 5. 使用示例:
+ * <HqSwitch
+ *      onChange={this.onSwitchChange}
+ *      loading={false}
+ *      disabled={false}
+ *      size={'default'}
+ *      sign={'DMK_XTGL_SFM'}
+ *      dataSource={[{"VALUE":"1","LABEL":"是"},{"VALUE":"0","LABEL":"否"}]}
+ *      checkedChildren={'启用'}
+ *      unCheckedChildren={'禁用'}
+ *      onClick={this.onClick}/>
+ */
+
+var HqSwitch = function (_React$Component) {
+  (0, _inherits3.default)(HqSwitch, _React$Component);
+
+  function HqSwitch(props) {
+    (0, _classCallCheck3.default)(this, HqSwitch);
+
+    var _this = (0, _possibleConstructorReturn3.default)(this, (HqSwitch.__proto__ || (0, _getPrototypeOf2.default)(HqSwitch)).call(this, props));
+
+    _initialiseProps.call(_this);
+
+    var _this$props = _this.props,
+        _this$props$checkedCh = _this$props.checkedChildren,
+        checkedChildren = _this$props$checkedCh === undefined ? "" : _this$props$checkedCh,
+        _this$props$unChecked = _this$props.unCheckedChildren,
+        unCheckedChildren = _this$props$unChecked === undefined ? "" : _this$props$unChecked,
+        checked = _this$props.checked;
+
+    _this.state = {
+      checkedChildren: checkedChildren, //选中时文本
+      unCheckedChildren: unCheckedChildren, //未选中文本
+      currentValue: "", //当前选中的值
+      checked: checked //当前选中状态
+    };
+    return _this;
+  }
+
+  (0, _createClass3.default)(HqSwitch, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      var sign = this.props.sign;
+
+      this.getDataSource(sign);
+    }
+  }, {
+    key: "UNSAFE_componentWillReceiveProps",
+    value: function UNSAFE_componentWillReceiveProps(nextProps) {
+      if ("dataSource" in nextProps) {
+        var dataSource = nextProps.dataSource;
+        if (dataSource && dataSource.length > 0) {
+          this.buildCheckedChildren(dataSource);
+        }
+      }
+    }
+
+    //加载数据源
+
+
+    //使用自定义数据源
+
+
+    //值改变回调方法
+
+
+    //点击事件回调方法
+
+  }, {
+    key: "render",
+    value: function render() {
+      var _state = this.state,
+          _state$checkedChildre = _state.checkedChildren,
+          checkedChildren = _state$checkedChildre === undefined ? "" : _state$checkedChildre,
+          _state$unCheckedChild = _state.unCheckedChildren,
+          unCheckedChildren = _state$unCheckedChild === undefined ? "" : _state$unCheckedChild,
+          checked = _state.checked;
+      var _props = this.props,
+          defaultChecked = _props.defaultChecked,
+          loading = _props.loading,
+          size = _props.size,
+          disabled = _props.disabled;
+
+      return _react2.default.createElement(
+        "div",
+        null,
+        _react2.default.createElement(_switch2.default, {
+          defaultChecked: defaultChecked,
+          checkedChildren: checkedChildren,
+          unCheckedChildren: unCheckedChildren,
+          loading: loading,
+          size: size,
+          checked: checked,
+          disabled: disabled,
+          onChange: this.onSwitchChange,
+          onClick: this.onSwitchClick
+        })
+      );
+    }
+  }]);
+  return HqSwitch;
+}(_react2.default.Component);
+
+//默认属性
+
+
+var _initialiseProps = function _initialiseProps() {
+  var _this2 = this;
+
+  this.getPropsCheckedText = function () {
+    var _props2 = _this2.props,
+        _props2$checkedChildr = _props2.checkedChildren,
+        checkedChildren = _props2$checkedChildr === undefined ? "" : _props2$checkedChildr,
+        _props2$unCheckedChil = _props2.unCheckedChildren,
+        unCheckedChildren = _props2$unCheckedChil === undefined ? "" : _props2$unCheckedChil;
+
+    _this2.setState({
+      checkedChildren: checkedChildren,
+      unCheckedChildren: unCheckedChildren
+    });
+  };
+
+  this.getDataSource = function (sign) {
+    if (sign) {
+      (0, _NHFetch2.default)(pathUrl, "GET", { sign: sign, t: new Date().getTime() }).then(function (res) {
+        if (res) {
+          var data = res.data;
+          if (data) {
+            _this2.buildCheckedChildren(data);
+          } else {
+            _this2.getCustomDataSource();
+          }
+        }
+      });
+    } else {
+      _this2.getCustomDataSource();
+    }
+  };
+
+  this.getCustomDataSource = function () {
+    var _props$dataSource = _this2.props.dataSource,
+        dataSource = _props$dataSource === undefined ? [] : _props$dataSource;
+
+    if (dataSource && dataSource.length > 0) {
+      _this2.buildCheckedChildren(dataSource);
+    } else {
+      _this2.getPropsCheckedText();
+    }
+  };
+
+  this.buildCheckedChildren = function (data) {
+    data.map(function (item) {
+      var itemVal = item.VALUE || item.value;
+      var itemLabel = item.LABEL || item.label;
+      if (itemVal === "1") {
+        _this2.setState({
+          checkedChildren: itemLabel
+        });
+      } else {
+        _this2.setState({
+          unCheckedChildren: itemLabel
+        });
+      }
+    });
+  };
+
+  this.onSwitchChange = function (checked) {
+    var onChange = _this2.props.onChange;
+
+    _this2.setState({
+      currentValue: checked ? "1" : "0",
+      checked: checked
+    }, function () {
+      if (onChange && typeof onChange === "function") {
+        onChange(checked, _this2.state.currentValue);
+      }
+    });
+  };
+
+  this.onSwitchClick = function (checked) {
+    var onClick = _this2.props.onClick;
+
+    _this2.setState({
+      currentValue: checked ? "1" : "0",
+      checked: checked
+    }, function () {
+      if (onClick && typeof onClick === "function") {
+        onClick(checked, _this2.state.currentValue);
+      }
+    });
+  };
+};
+
+HqSwitch.defaultProps = {
+  loading: false,
+  size: "default",
+  disabled: false,
+  onChange: function onChange() {},
+  onClick: function onClick() {}
+};
+
+//属性检查
+HqSwitch.propTypes = {
+  sign: _propTypes2.default.string, //数据源标识
+  onChange: _propTypes2.default.func, //变化时回调函数
+  onClick: _propTypes2.default.func, //点击时回调函数
+  checkedChildren: _propTypes2.default.string, //选中时的内容
+  unCheckedChildren: _propTypes2.default.string, //未选中的内容
+  defaultChecked: _propTypes2.default.bool, //初始是否选中
+  loading: _propTypes2.default.bool, //加载中的开关
+  disabled: _propTypes2.default.bool, //是否禁用
+  size: _propTypes2.default.string, //开关大小,可选值: default/small,默认为default
+  dataSource: _propTypes2.default.arrayOf(
+  //自定义数据源
+  _propTypes2.default.shape({
+    value: _propTypes2.default.string,
+    label: _propTypes2.default.node
+  }))
+};
+
+exports.default = HqSwitch;

package/lib/components/KyTableCardList/index.js

@@ -123,23 +123,11 @@ var _react = require("react");
 
 var _react2 = _interopRequireDefault(_react);
 
-var _NHCore = require("../../utils/NHCore");
-
 var _classnames = require("classnames");
 
 var _classnames2 = _interopRequireDefault(_classnames);
 
-var _NHFetch = require("../../utils/NHFetch");
-
-var _NHFetch2 = _interopRequireDefault(_NHFetch);
-
-var _getLoginUser = require("../../utils/getLoginUser");
-
-var _getLoginUser2 = _interopRequireDefault(_getLoginUser);
-
-var _createUuid = require("../../utils/createUuid");
-
-var _createUuid2 = _interopRequireDefault(_createUuid);
+var _index = require("../../index");
 
 require("../../../assets/components/KyTableCardList/index.less");
 
@@ -159,10 +147,11 @@ var _KyIcon2 = _interopRequireDefault(_KyIcon);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var Search = _input2.default.Search; /*******
-                                      * @description: 科研卡片表格-KyTableCardList
-                                      * @author: 琴时
-                                      */
+/*******
+ * @description: 科研卡片表格-KyTableCardList
+ * @author: 琴时
+ */
+var Search = _input2.default.Search;
 
 var KyTableCardList = function (_React$Component) {
   (0, _inherits3.default)(KyTableCardList, _React$Component);
@@ -176,7 +165,7 @@ var KyTableCardList = function (_React$Component) {
       //如果需要自适应高度
       if (!_this.props.autoHeightFlag && document.getElementsByClassName(_this.state.className)) {
         var lastHeight = _this.state.height;
-        var height = (0, _NHCore.getSuitHeight)(document.getElementsByClassName(_this.state.className)[0]);
+        var height = (0, _index.getSuitHeight)(document.getElementsByClassName(_this.state.className)[0]);
         height = _this.props.windowH - 64;
         var titleHeight = _this.props.titleHeight || _this.props.titleHeight === 0 ? _this.props.titleHeight : 40;
         //如果不显示头部，则头部的高度为0
@@ -207,7 +196,7 @@ var KyTableCardList = function (_React$Component) {
       };
       var url_final = baseUrl + "/proData/gridList";
       url_final = url || url_final;
-      (0, _NHFetch2.default)(url_final, "POST", params).then(function (res) {
+      (0, _index.NHFetch)(url_final, "POST", params).then(function (res) {
         if (res) {
           _this.setState({
             hightSearchData: res.data ? res.data.list : []
@@ -303,7 +292,7 @@ var KyTableCardList = function (_React$Component) {
           onDataLoadFinish = _this$props2.onDataLoadFinish;
 
       baseUrl = url || baseUrl || window.baseUrl || "";
-      (0, _NHFetch2.default)(baseUrl + "/proData/gridList", "POST", params).then(function (res) {
+      (0, _index.NHFetch)(baseUrl + "/proData/gridList", "POST", params).then(function (res) {
         _this.setState({
           data: res.data ? res.data.list : [],
           selectedRowKeys: [],
@@ -360,7 +349,7 @@ var KyTableCardList = function (_React$Component) {
 
       //如果启用职位范围过滤
       if (rangeFilter) {
-        var userId = (0, _getLoginUser2.default)() ? (0, _getLoginUser2.default)().userId : "";
+        var userId = (0, _index.getLoginUser)() ? (0, _index.getLoginUser)().userId : "";
         params.rangeFilter = { id: userId };
       }
       return params;
@@ -505,7 +494,7 @@ var KyTableCardList = function (_React$Component) {
 
     _this.getAction = function (row, action) {
       var action1 = action.filter(function (item) {
-        return (item.auth === undefined || (0, _NHCore.hasAuth)(item.auth)) && (item.isShow === undefined || item.isShow(row));
+        return (item.auth === undefined || (0, _index.hasAuth)(item.auth)) && (item.isShow === undefined || item.isShow(row));
       });
       var action2 = action1.splice(2);
       var dom = action1.map(function (item, index) {
@@ -561,7 +550,7 @@ var KyTableCardList = function (_React$Component) {
         );
         var temp = _react2.default.createElement(
           _react2.default.Fragment,
-          { key: (0, _createUuid2.default)() },
+          { key: (0, _index.createUuid)() },
           _react2.default.createElement(_divider2.default, { className: "border", type: "vertical" }),
           _react2.default.createElement(
             _dropdown2.default,
@@ -606,7 +595,7 @@ var KyTableCardList = function (_React$Component) {
       },
       height: _this.props.height, //列表的高度
       width: undefined, //列表的宽度
-      className: (0, _createUuid2.default)(),
+      className: (0, _index.createUuid)(),
       tySearchAllField: "", //通用查询的所有字段
       searchValue: "", //通用查询的值
       searchField: "", //通用查询的字段

package/lib/index.js

@@ -373,6 +373,24 @@ Object.defineProperty(exports, "HqMultiSelect", {
   }
 });
 
+var _HqButton = require("./components/HqButton");
+
+Object.defineProperty(exports, "HqButton", {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_HqButton).default;
+  }
+});
+
+var _HqSwitch = require("./components/HqSwitch");
+
+Object.defineProperty(exports, "HqSwitch", {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_HqSwitch).default;
+  }
+});
+
 var _equalsObj = require("./utils/equalsObj.js");
 
 Object.defineProperty(exports, "equalsObj", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlt-for-react",
-  "version": "1.1.17",
+  "version": "1.1.18",
   "description": "dlt for react",
   "main": "lib/index.js",
   "scripts": {
@@ -84,4 +84,4 @@
     "urlencode": "^1.1.0",
     "xgui-for-react": "^3.0.0"
   }
-}
+}