@kdcloudjs/kdesign 1.3.2 → 1.3.5

package/lib/select/select.js

@@ -103,7 +103,6 @@ var InternalSelect = function InternalSelect(props, ref) {
       setInitValue = _useMergedState2[1];
 
   var realChildren = Array.isArray(options) ? options : (0, _reactChildren.toArray)(children); // options配置项和默认children
-  // console.log('real', realChildren)
 
   var innerRef = _react.default.useRef();
 
@@ -288,6 +287,7 @@ var InternalSelect = function InternalSelect(props, ref) {
         return (child === null || child === void 0 ? void 0 : child.value) === key;
       }
     })) || {};
+    var optionsObj = obj.props ? obj.props : obj || {};
 
     if (value !== undefined) {
       // onChange && onChange(labelInValue ? { value: key, label } : key)
@@ -304,13 +304,13 @@ var InternalSelect = function InternalSelect(props, ref) {
           (0, _splice.default)(optsArr).call(optsArr, idx, 1);
         } else {
           valArr.push(key);
-          optsArr.push({
+          optsArr.push((0, _extends2.default)((0, _extends2.default)({}, optionsObj), {
             value: key,
             label: obj.props ? (_a = obj.props) === null || _a === void 0 ? void 0 : _a.children : obj.label || key
-          });
+          }));
         }
 
-        onChange && onChange(labelInValue ? optsArr : valArr);
+        onChange && onChange(labelInValue ? optsArr : valArr, optsArr);
 
         if (!isSelected) {
           onDeselect && onDeselect(key); // 下拉项取消选中时调用，参数为选中项的value,多选模式下生效
@@ -320,7 +320,10 @@ var InternalSelect = function InternalSelect(props, ref) {
         onChange && onChange(labelInValue ? {
           value: key,
           label: label
-        } : key);
+        } : key, (0, _extends2.default)((0, _extends2.default)({}, optionsObj), {
+          value: key,
+          label: label
+        }));
       }
 
       onSelect && onSelect(key);
@@ -336,7 +339,10 @@ var InternalSelect = function InternalSelect(props, ref) {
       onChange && onChange(labelInValue ? {
         value: key,
         label: label
-      } : key);
+      } : key, (0, _extends2.default)((0, _extends2.default)({}, optionsObj), {
+        value: key,
+        label: label
+      }));
     } else {
       var _multipleRef$current2 = multipleRef.current,
           _selectedVal = _multipleRef$current2.selectedVal,
@@ -350,15 +356,15 @@ var InternalSelect = function InternalSelect(props, ref) {
       } else {
         _selectedVal.push(key);
 
-        _selectMulOpts.push({
+        _selectMulOpts.push((0, _extends2.default)((0, _extends2.default)({}, optionsObj), {
           value: key,
           label: obj.props ? (_c = obj.props) === null || _c === void 0 ? void 0 : _c.children : obj.label || key
-        });
+        }));
       } // setInitValue([...selectedVal])
 
 
       setMulOptions((0, _toConsumableArray2.default)(_selectMulOpts));
-      onChange && onChange(labelInValue ? _selectMulOpts : _selectedVal);
+      onChange && onChange(labelInValue ? _selectMulOpts : _selectedVal, _selectMulOpts);
 
       if (!isSelected) {
         onDeselect && onDeselect(key); // 下拉项取消选中时调用，参数为选中项的value,多选模式下生效
@@ -379,9 +385,9 @@ var InternalSelect = function InternalSelect(props, ref) {
 
     if ((realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) !== selectedVal.length) {
       (0, _map.default)(realChildren).call(realChildren, function (child) {
-        var _child$props = child.props,
-            value = _child$props.value,
-            children = _child$props.children;
+        var _ref = child.props || child,
+            value = _ref.value,
+            children = _ref.children;
 
         if (!(0, _includes.default)(selectedVal).call(selectedVal, value)) {
           selectedVal.push(value);
@@ -393,12 +399,12 @@ var InternalSelect = function InternalSelect(props, ref) {
       });
       setMulOptions((0, _toConsumableArray2.default)(selectMulOpts));
     } else {
-      multipleRef.current.selectedVal = [];
-      multipleRef.current.selectMulOpts = [];
+      multipleRef.current.selectedVal = selectedVal = [];
+      multipleRef.current.selectMulOpts = selectMulOpts = [];
       setMulOptions([]);
     }
 
-    onChange && onChange(labelInValue ? selectMulOpts : selectedVal);
+    onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
   }; // 筛选内容 ---可以优化，抽成hook
 
 
@@ -456,7 +462,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     (0, _splice.default)(selectedVal).call(selectedVal, idx, 1);
     (0, _splice.default)(selectMulOpts).call(selectMulOpts, idx, 1);
     setMulOptions((0, _toConsumableArray2.default)(selectMulOpts));
-    onChange && onChange(labelInValue ? selectMulOpts : selectedVal);
+    onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
     e.stopPropagation();
   }; // 渲染后缀图标
 
@@ -520,8 +526,15 @@ var InternalSelect = function InternalSelect(props, ref) {
     return (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) === 0 && /*#__PURE__*/_react.default.createElement("div", {
       className: emptyListCls
     }, emptyContent);
-  }; // 渲染下拉列表框
+  };
+
+  var isShowSearch = (0, _react.useCallback)(function () {
+    if (isMultiple) {
+      return showSearch !== null && showSearch !== void 0 ? showSearch : true;
+    }
 
+    return showSearch !== null && showSearch !== void 0 ? showSearch : false;
+  }, [showSearch, isMultiple]); // 渲染下拉列表框
 
   var renderContent = function renderContent() {
     var _a;
@@ -557,7 +570,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       className: dropDownCls,
       style: dropDownStyle,
       ref: dropDownRef
-    }, (showSearch || isMultiple) && /*#__PURE__*/_react.default.createElement("div", {
+    }, isShowSearch() && /*#__PURE__*/_react.default.createElement("div", {
       className: searchCls
     }, /*#__PURE__*/_react.default.createElement(_index.Input, {
       ref: searchRef,
@@ -679,8 +692,8 @@ var InternalSelect = function InternalSelect(props, ref) {
     var _a;
 
     if (selectRef === null || selectRef === void 0 ? void 0 : selectRef.current) {
-      var _ref = (_a = selectRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect(),
-          width = _ref.width;
+      var _ref2 = (_a = selectRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect(),
+          width = _ref2.width;
 
       return {
         width: (dropdownStyle === null || dropdownStyle === void 0 ? void 0 : dropdownStyle.width) || (width > 75 ? width : 75),

package/lib/style/core/reset.less

@@ -194,10 +194,10 @@ template {
 /**
  * Reset scrollbar style
  */
-::-webkit-scrollbar {
-  width: 10px !important;
-  height: 10px !important;
-}
+// ::-webkit-scrollbar {
+//   width: 10px !important;
+//   height: 10px !important;
+// }
 
 ::-webkit-scrollbar-button {
   width: 0;

package/lib/style/index.css

@@ -1779,10 +1779,6 @@ template {
 /**
  * Reset scrollbar style
  */
-::-webkit-scrollbar {
-  width: 10px !important;
-  height: 10px !important;
-}
 ::-webkit-scrollbar-button {
   width: 0;
   height: 0;

package/lib/table/feature/useRangeSelection.d.ts

@@ -0,0 +1,3 @@
+import { TableRangeSelection, TablePipeline } from '../interface';
+declare function useRangeSelection(pipeline: TablePipeline, rangeSelection?: TableRangeSelection): void;
+export default useRangeSelection;

package/lib/table/feature/useRangeSelection.js

@@ -0,0 +1,21 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+
+var _table = require("@kdcloudjs/table");
+
+function useRangeSelection(pipeline, rangeSelection) {
+  if (rangeSelection) {
+    pipeline.use(_table.features.rangeSelection((0, _extends2.default)({}, rangeSelection)));
+  }
+}
+
+var _default = useRangeSelection;
+exports.default = _default;

package/lib/table/interface.d.ts

@@ -1,6 +1,16 @@
+/// <reference types="react" />
 import { TableProps as BaseTableProps, TablePipeline as TP, ArtColumnStaticPart } from '@kdcloudjs/table';
-import { SortFeatureOptions, RowDetailFeatureOptions, FilterFeatureOptions, TreeModeFeatureOptions, ColumnDragOptions, ColumnResizeOptions, ContextMenuFeatureOptions } from '@kdcloudjs/table/es/table/pipeline/features';
-export interface TableProps extends BaseTableProps {
+import { SortFeatureOptions, RowDetailFeatureOptions, FilterFeatureOptions, TreeModeFeatureOptions, ColumnDragOptions, ColumnResizeOptions, ContextMenuFeatureOptions, RangeSelectionFeatureOptions } from '@kdcloudjs/table/es/table/pipeline/features';
+declare type TablePropsOfComponents = Pick<BaseTableProps, 'components'> & {
+    components?: {
+        /** 复选框 */
+        Checkbox?: React.ComponentType;
+        /** 单选框 */
+        Radio?: React.ComponentType;
+    };
+};
+declare type TablePropsOfExtend = Omit<BaseTableProps, 'components'>;
+export interface TableProps extends TablePropsOfExtend, TablePropsOfComponents {
     rowSelection?: TableRowSelection;
     prefixCls?: string;
     rowDetail?: TableRowDetail;
@@ -11,6 +21,7 @@ export interface TableProps extends BaseTableProps {
     columnDrag?: boolean | ColumnDragOptions;
     columnResize?: boolean | ColumnResizeOptions;
     contextMenu?: IContextMenu;
+    rangeSelection?: TableRangeSelection;
 }
 export declare type RowSelectionType = 'checkbox' | 'radio';
 export declare type RowSelectionFixed = 'start' | 'end';
@@ -32,3 +43,5 @@ export declare type TableSort = SortFeatureOptions;
 export declare type TableTreeMode = TreeModeFeatureOptions;
 export declare type TablePipeline = TP;
 export declare type IContextMenu = boolean | ContextMenuFeatureOptions;
+export declare type TableRangeSelection = RangeSelectionFeatureOptions;
+export {};

package/lib/table/table.js

@@ -51,6 +51,8 @@ var _columnDrag = _interopRequireDefault(require("./feature/columnDrag"));
 
 var _contextMenu = _interopRequireDefault(require("./feature/contextMenu"));
 
+var _useRangeSelection = _interopRequireDefault(require("./feature/useRangeSelection"));
+
 var _devwarning = _interopRequireDefault(require("../_utils/devwarning"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -84,6 +86,7 @@ function Table(props) {
       getRowProps = props.getRowProps,
       getTableProps = props.getTableProps,
       contextMenu = props.contextMenu,
+      rangeSelection = props.rangeSelection,
       cssVariables = props.cssVariables;
 
   var _useContext = (0, _react.useContext)(_ConfigContext.default),
@@ -94,19 +97,24 @@ function Table(props) {
   var tableCls = (0, _classnames.default)(tablePrefixCls, className);
   var pipeline = (0, _table.useTablePipeline)({
     components: {
-      Checkbox: _index.default,
-      Radio: _index2.default
+      Checkbox: (components === null || components === void 0 ? void 0 : components.Checkbox) || _index.default,
+      Radio: (components === null || components === void 0 ? void 0 : components.Radio) || _index2.default
     }
   }).primaryKey(primaryKey === undefined ? '' : primaryKey).input({
     columns: columns,
     dataSource: dataSource
   });
+
+  if (footerDataSource) {
+    pipeline.footerDataSource(footerDataSource);
+  }
   /* -------------------------------------------------------------------------- */
 
   /* features                                                                   */
 
   /* -------------------------------------------------------------------------- */
 
+
   (0, _rowSelection.default)(pipeline, rowSelection);
   (0, _rowDetail.default)(pipeline, rowDetail);
   (0, _filter2.default)(pipeline, filter);
@@ -116,6 +124,7 @@ function Table(props) {
   (0, _columnResize.default)(pipeline, columnResize);
   (0, _columnDrag.default)(pipeline, columnDrag);
   (0, _contextMenu.default)(pipeline, contextMenu);
+  (0, _useRangeSelection.default)(pipeline, rangeSelection);
   /* -------------------------------------------------------------------------- */
 
   /* after useTablePipeline, merge pipeline.getProps result                     */
@@ -139,18 +148,17 @@ function Table(props) {
     className: tableCls,
     style: style,
     isLoading: isLoading,
-    components: (0, _extends2.default)({
-      LoadingIcon: function LoadingIcon() {
+    components: {
+      LoadingIcon: (components === null || components === void 0 ? void 0 : components.LoadingIcon) || function () {
         return /*#__PURE__*/_react.default.createElement(_index3.Spin, {
           type: "container"
         });
       },
-      EmptyContent: function EmptyContent() {
+      EmptyContent: (components === null || components === void 0 ? void 0 : components.EmptyContent) || function () {
         return /*#__PURE__*/_react.default.createElement(_index3.Empty, null);
       }
-    }, components),
+    },
     useVirtual: useVirtual,
-    footerDataSource: footerDataSource,
     estimatedRowHeight: estimatedRowHeight,
     emptyCellHeight: emptyCellHeight,
     hasHeader: hasHeader,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.3.2",
+  "version": "1.3.5",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [
@@ -76,7 +76,7 @@
     "@babel/runtime": "^7.10.4",
     "@babel/runtime-corejs3": "^7.11.2",
     "@babel/standalone": "^7.14.3",
-    "@kdcloudjs/table": "^1.0.0",
+    "@kdcloudjs/table": "^1.1.0",
     "@popperjs/core": "^2.5.4",
     "async-validator": "^3.5.1",
     "axios": "^0.21.1",