dlt-for-react 1.0.5 → 1.0.7

package/README.md

@@ -6,13 +6,16 @@ npm publish
 
 ## 前端dlt-for-react依赖包版本更新记录
 
-##### 当前最新版本：1.0.5
+##### 当前最新版本：1.0.7
 
 ##### 安装依赖
 > cnpm install dlt-for-react --save
 
 ##### 版本修改记录
-
+#### V1.0.7—2023年10月12日
+1. 提交HqLsrySelector临时人员选择器组件
+#### V1.0.6—2023年10月9日
+1. 修改createUuid参数bug
 #### V1.0.4—2023年9月28日
 1. 补充KyBtnBox、KyCheckBox、KyCheckButton、KyCollapse、KyContainerFrame、KyEditableTable、KyEmpty、KyExcel、KyIcon、KyMore、KyTable及KyTitle组件
 #### V1.0.3—2023年9月28日

package/lib/components/HqSelector/HqLsrySelector/index.js

@@ -0,0 +1,343 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.HqLsrySelector = undefined;
+
+var _NHSelector2 = require('xgui-for-react/lib/components/NHSelector');
+
+var _NHSelector3 = _interopRequireDefault(_NHSelector2);
+
+var _tooltip = require('antd/lib/tooltip');
+
+var _tooltip2 = _interopRequireDefault(_tooltip);
+
+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/tooltip/style');
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * 人员选择器
+ * 用法如下：（记得先引入组件）
+
+// 人员分类择器显示
+this.HqLsrySelector.show([id]);
+
+<HqLsrySelector
+    label={'选择人员分类'}
+    isSinger={false}
+    ref={el => this.HqLsrySelector = el}
+    onSelect={this.onSelector}
+/>
+
+// 人员分类择器选中事件
+onSelector = (selectKeys, selectValue) => {
+    if (selectValue && selectValue.length > 0) {
+        let params = this.state.params;
+        const obj = selectValue[0];
+        params.gh = obj.GH;
+        params.xm = obj.XM;
+        this.setState({ params });
+    } else {
+        message.warn("请选择人员分类信息！")
+    }
+}
+
+ */
+var HqLsrySelector = exports.HqLsrySelector = function (_React$Component) {
+    (0, _inherits3.default)(HqLsrySelector, _React$Component);
+
+    function HqLsrySelector(props) {
+        (0, _classCallCheck3.default)(this, HqLsrySelector);
+
+        var _this = (0, _possibleConstructorReturn3.default)(this, (HqLsrySelector.__proto__ || (0, _getPrototypeOf2.default)(HqLsrySelector)).call(this, props));
+
+        _this.show = function (initValues) {
+            _this.HqLsrySelector.show(initValues);
+        };
+
+        _this.singerBottomShowRender = function (record) {
+            var gh = record.GH || record.gh;
+            var xm = record.XM || record.xm;
+            var dwmc = record.DWMC || record.dwmc;
+            var ksmc = record.KSMC || record.ksmc;
+            return _react2.default.createElement(
+                'span',
+                null,
+                _react2.default.createElement(
+                    'font',
+                    null,
+                    '(',
+                    ksmc || dwmc,
+                    ')-'
+                ),
+                _react2.default.createElement(
+                    'font',
+                    { style: { fontSize: "14px", color: "red" } },
+                    xm,
+                    '(',
+                    gh,
+                    ')'
+                )
+            );
+        };
+
+        _this.state = {};
+        return _this;
+    }
+
+    /**
+     * 单选时底部结果渲染
+     * @param record 选中的那条结果数据
+     */
+
+
+    (0, _createClass3.default)(HqLsrySelector, [{
+        key: 'render',
+        value: function render() {
+            var _this2 = this;
+
+            var columns = [{
+                key: 'gh',
+                title: '工号',
+                width: '80',
+                ellipsis: true,
+                render: function render(text, record) {
+                    return record.GH || record.gh;
+                }
+            }, {
+                key: 'xm',
+                title: '姓名',
+                minWidth: '100',
+                sorted: false,
+                ellipsis: true,
+                render: function render(text, record) {
+                    return record.XM || record.xm;
+                }
+            }, {
+                key: 'xb',
+                title: '性别',
+                minWidth: '80',
+                sorted: false,
+                ellipsis: true,
+                render: function render(text, record) {
+                    return record.XB || record.xb;
+                }
+            },
+            // {
+            //     key: 'title',
+            //     title: '职称',
+            //     minWidth: '100',
+            //     sorted: false,
+            //     render: (text, record, index) => {
+            //         let temp = record.TITLE || record.title;
+            //         if (temp && temp.length > 6) {
+            //             return (<font><Tooltip title={temp}>{temp.substring(0, 6)}...</Tooltip ></font>)
+            //         } else {
+            //             return (<font>{temp}</font>)
+            //         }
+            //     },
+            // },
+            // {
+            //     key: 'discipline',
+            //     title: '一级学科',
+            //     minWidth: '120',
+            //     sorted: false,
+            //     ellipsis: true,
+            //     render: (text, record, index) => {
+            //         let temp = record.DISCIPLINE || record.discipline;
+            //         if (temp && temp.length > 13) {
+            //             return (<font><Tooltip title={temp}>{temp.substring(0, 13)}...</Tooltip ></font>)
+            //         } else {
+            //             return (<font>{temp}</font>)
+            //         }
+            //     },
+            // },
+            // {
+            //     key: 'degree',
+            //     title: '最后学位',
+            //     minWidth: '120',
+            //     sorted: false,
+            //     render: (text, record, index) => {
+            //         let temp = record.DEGREE || record.degree;
+            //         if (temp && temp.length > 13) {
+            //             return (<font><Tooltip title={temp}>{temp.substring(0, 13)}...</Tooltip ></font>)
+            //         } else {
+            //             return (<font>{temp}</font>)
+            //         }
+            //     },
+            // },
+            {
+                key: 'ksmc',
+                title: '所属科室',
+                minWidth: '140',
+                sorted: false,
+                render: function render(text, record, index) {
+                    var temp = record.KSMC || record.ksmc;
+                    if (temp && temp.length > 13) {
+                        return _react2.default.createElement(
+                            'font',
+                            null,
+                            _react2.default.createElement(
+                                _tooltip2.default,
+                                { title: temp },
+                                temp.substring(0, 13),
+                                '...'
+                            )
+                        );
+                    } else {
+                        return _react2.default.createElement(
+                            'font',
+                            null,
+                            temp
+                        );
+                    }
+                }
+            }, {
+                key: 'dwmc',
+                title: '所属单位',
+                minWidth: '140',
+                sorted: false,
+                render: function render(text, record, index) {
+                    var temp = record.DWMC || record.dwmc;
+                    if (temp && temp.length > 13) {
+                        return _react2.default.createElement(
+                            'font',
+                            null,
+                            _react2.default.createElement(
+                                _tooltip2.default,
+                                { title: temp },
+                                temp.substring(0, 13),
+                                '...'
+                            )
+                        );
+                    } else {
+                        return _react2.default.createElement(
+                            'font',
+                            null,
+                            temp
+                        );
+                    }
+                }
+            }];
+            var _props = this.props,
+                mode = _props.mode,
+                treeWidth = _props.treeWidth,
+                tableWidth = _props.tableWidth,
+                resultWidth = _props.resultWidth,
+                _props$title = _props.title,
+                title = _props$title === undefined ? '后勤人员选择器' : _props$title,
+                _props$keyField = _props.keyField,
+                keyField = _props$keyField === undefined ? 'GH' : _props$keyField,
+                _props$titleField = _props.titleField,
+                titleField = _props$titleField === undefined ? 'XM' : _props$titleField,
+                _props$searchField = _props.searchField,
+                searchField = _props$searchField === undefined ? 'gh,xm,xb,ksmc,dwmc' : _props$searchField,
+                _props$searchWidth = _props.searchWidth,
+                searchWidth = _props$searchWidth === undefined ? '300' : _props$searchWidth,
+                _props$placeholder = _props.placeholder,
+                placeholder = _props$placeholder === undefined ? '职工号/姓名/性别/所属科室/所属单位' : _props$placeholder,
+                sign = _props.sign,
+                treeUrl = _props.treeUrl,
+                tableUrl = _props.tableUrl,
+                _props$baseUrl = _props.baseUrl,
+                baseUrl = _props$baseUrl === undefined ? 'api/hq-xtgl' : _props$baseUrl;
+
+            if (!sign && !treeUrl && !tableUrl) {
+                //没有设置方案说明此时使用默认的数据源调用
+                sign = 'ly_hq_selector_lsry';
+                treeUrl = baseUrl + '/proData/selector/tree/list'; //默认的路径，当没有设置方案的时候，就使用此路径查询数据
+                tableUrl = baseUrl + '/proData/selector/table/list'; //默认的路径，当没有设置方案的时候，就使用此路径查询数据
+            }
+            return _react2.default.createElement(
+                'div',
+                null,
+                _react2.default.createElement(_NHSelector3.default, {
+                    ref: function ref(form) {
+                        _this2.HqLsrySelector = form;
+                    },
+                    title: title,
+                    mode: mode,
+                    sign: sign,
+                    treeUrl: treeUrl,
+                    tableUrl: tableUrl,
+                    treeWidth: treeWidth,
+                    tableWidth: tableWidth,
+                    resultWidth: resultWidth,
+                    height: 500,
+                    isSinger: this.props.isSinger,
+                    columns: columns,
+                    keyField: keyField,
+                    titleField: titleField,
+                    searchField: searchField,
+                    searchWidth: searchWidth,
+                    placeholder: placeholder,
+                    onSelect: this.props.onSelect,
+                    tableParams: this.props.tableParams,
+                    tableSqlParams: this.props.tableSqlParams,
+                    treeParams: this.props.treeParams,
+                    treeSqlParams: this.props.treeSqlParams,
+                    treeShowIcon: true,
+                    singerBottomShowFlag: true,
+                    singerBottomShowRender: this.singerBottomShowRender,
+                    baseUrl: this.props.baseUrl,
+                    rangeFilter: this.props.rangeFilter,
+                    rangeFilterList: this.props.rangeFilterList
+                })
+            );
+        }
+    }]);
+    return HqLsrySelector;
+}(_react2.default.Component);
+
+HqLsrySelector.defaultProps = {
+    mode: "treeAndTable",
+    treeWidth: 250,
+    tableWidth: 600,
+    resultWidth: 150,
+    sign: undefined,
+    treeUrl: undefined,
+    tableUrl: undefined,
+    title: undefined,
+    keyField: undefined,
+    titleField: undefined,
+    searchField: undefined,
+    searchWidth: undefined,
+    placeholder: undefined,
+    isSinger: false, //是否是单选，true表示是单选，false表示是多选，默认为false
+    onSelect: function onSelect() {}, //选中结果的时候的回调方法
+    treeParams: {}, //树数据过滤参数
+    treeSqlParams: undefined, //树的sql语句内的参数
+    tableParams: {}, //列表数据过滤参数
+    tableSqlParams: undefined, //列表的sql语句内的参数
+    baseUrl: undefined, //请求路径的前缀，可通过改参数控制访问的后端服务，如果不设置，则会去访问当前前端服务对应的后端服务，例如：api/sm-bpm-expansion
+    rangeFilter: undefined, //是否开启职务范围过滤
+    rangeFilterList: undefined // 自定义职务过滤列表
+};
+
+exports.default = HqLsrySelector;

package/lib/index.js

@@ -220,6 +220,15 @@ Object.defineProperty(exports, 'KyBtnBox', {
     }
 });
 
+var _HqLsrySelector = require('./components/HqSelector/HqLsrySelector');
+
+Object.defineProperty(exports, 'HqLsrySelector', {
+    enumerable: true,
+    get: function get() {
+        return _interopRequireDefault(_HqLsrySelector).default;
+    }
+});
+
 var _getSize = require('./utils/getSize.js');
 
 Object.defineProperty(exports, 'getSize', {

package/lib/utils/NHCore.js

@@ -61,6 +61,9 @@ function SuitHeight(node) {
 
 //获取UUID
 var createUuid = exports.createUuid = function createUuid() {
+  var len = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 32;
+  var radix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 16;
+
   var chars = '0123456789abcdefghijklmnopqrstuvwxyz'.split('');
   var uuid = [],
       i;
@@ -267,7 +270,7 @@ var validateCode = exports.validateCode = function () {
     }, _callee, undefined, [[0, 12]]);
   }));
 
-  return function validateCode(_x, _x2, _x3) {
+  return function validateCode(_x3, _x4, _x5) {
     return _ref.apply(this, arguments);
   };
 }();

package/lib/utils/createUuid.js

@@ -5,6 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 //获取UUID
 var createUuid = function createUuid() {
+  var len = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 32;
+  var radix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 16;
+
   var chars = '0123456789abcdefghijklmnopqrstuvwxyz'.split('');
   var uuid = [],
       i;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlt-for-react",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "dlt for react",
   "main": "lib/index.js",
   "scripts": {

package/lib/components/DragM/index.js

@@ -1,127 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
-
-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);
-
-var _react = require('react');
-
-var _react2 = _interopRequireDefault(_react);
-
-var _propTypes = require('prop-types');
-
-var _propTypes2 = _interopRequireDefault(_propTypes);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var DragM = function (_React$Component) {
-    (0, _inherits3.default)(DragM, _React$Component);
-
-    function DragM() {
-        var _ref;
-
-        var _temp, _this, _ret;
-
-        (0, _classCallCheck3.default)(this, DragM);
-
-        for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-            args[_key] = arguments[_key];
-        }
-
-        return _ret = (_temp = (_this = (0, _possibleConstructorReturn3.default)(this, (_ref = DragM.__proto__ || (0, _getPrototypeOf2.default)(DragM)).call.apply(_ref, [this].concat(args))), _this), _this.position = {
-            startX: 0,
-            startY: 0,
-            dx: 0,
-            dy: 0,
-            tx: 0,
-            ty: 0
-        }, _this.start = function (event) {
-            if (event.button != 0) {
-                //只允许左键，右键问题在于不选择conextmenu就不会触发mouseup事件
-                return;
-            }
-            document.addEventListener('mousemove', _this.docMove);
-            _this.position.startX = event.pageX - _this.position.dx;
-            _this.position.startY = event.pageY - _this.position.dy;
-        }, _this.docMove = function (event) {
-            var tx = event.pageX - _this.position.startX;
-            var ty = event.pageY - _this.position.startY;
-            var transformStr = 'translate(' + tx + 'px,' + ty + 'px)';
-            _this.props.updateTransform(transformStr, tx, ty, _this.tdom);
-            _this.position.dx = tx;
-            _this.position.dy = ty;
-        }, _this.docMouseUp = function (event) {
-            document.removeEventListener('mousemove', _this.docMove);
-        }, _temp), (0, _possibleConstructorReturn3.default)(_this, _ret);
-    }
-
-    (0, _createClass3.default)(DragM, [{
-        key: 'componentDidMount',
-        value: function componentDidMount() {
-            this.tdom.addEventListener('mousedown', this.start);
-            //用document移除对mousemove事件的监听
-            document.addEventListener('mouseup', this.docMouseUp);
-        }
-    }, {
-        key: 'componentWillUnmount',
-        value: function componentWillUnmount() {
-            this.tdom.removeEventListener('mousedown', this.start);
-            document.removeEventListener('mouseup', this.docMouseUp);
-            document.removeEventListener('mousemove', this.docMove);
-        }
-    }, {
-        key: 'render',
-        value: function render() {
-            var _this2 = this;
-
-            var children = this.props.children;
-
-            var newStyle = (0, _extends3.default)({}, children.props.style, {
-                cursor: 'move',
-                userSelect: 'none'
-            });
-            return _react2.default.cloneElement(_react2.default.Children.only(children), {
-                ref: function ref(tdom) {
-                    return _this2.tdom = tdom;
-                },
-                style: newStyle
-            });
-        }
-    }]);
-    return DragM;
-}(_react2.default.Component);
-
-DragM.propTypes = {
-    children: _propTypes2.default.element.isRequired
-};
-DragM.defaultProps = {
-    //默认是移动children dom,覆盖该方法，可以把tranform行为同步给外部
-    updateTransform: function updateTransform(transformStr, tx, ty, tdom) {
-        tdom.style.transform = transformStr;
-    }
-};
-exports.default = DragM;