@kdcloudjs/kdesign 1.6.32 → 1.6.33

package/es/date-picker/date-picker.js

@@ -85,7 +85,6 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
       onClick = datePickerProps.onClick,
       _onOk = datePickerProps.onOk; // ref
 
-  var panelDivRef = React.useRef(null);
   var inputDivRefDefault = React.useRef(null);
   var inputDivRef = ref || inputDivRefDefault;
   var popperRefDefault = React.useRef(null);
@@ -244,9 +243,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
     if (!openValue) {
       setSelectedValue(dateValue);
 
-      if (valueText === '') {
-        triggerTextChange('');
-      } else if (valueText !== text) {
+      if (valueText !== text) {
         resetText();
       }
     } else {
@@ -399,7 +396,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
 
   var inputProps = {
     inputRef: inputRef,
-    panelDivRef: panelDivRef,
+    panelDivRef: popperRef,
     id: id,
     autoFocus: autoFocus,
     allowClear: allowClear,

package/es/table/feature/colGroupExtendable.d.ts

@@ -0,0 +1,4 @@
+import { colGroupExtendOption } from '@kdcloudjs/table/es/table/pipeline/features';
+import { TablePipeline } from '../interface';
+declare function colGroupExtendable(pipeline: TablePipeline, columnGroupExtend: colGroupExtendOption): void;
+export default colGroupExtendable;

package/es/table/feature/colGroupExtendable.js

@@ -0,0 +1,9 @@
+import { features } from '@kdcloudjs/table';
+
+function colGroupExtendable(pipeline, columnGroupExtend) {
+  if (columnGroupExtend) {
+    pipeline.use(features.colGroupExtendable(columnGroupExtend));
+  }
+}
+
+export default colGroupExtendable;

package/es/table/interface.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { TableProps as BaseTableProps, TablePipeline as TP, ArtColumnStaticPart } from '@kdcloudjs/table';
-import { SortFeatureOptions, RowDetailFeatureOptions, FilterFeatureOptions, TreeModeFeatureOptions, ColumnDragOptions, ColumnResizeOptions, ContextMenuFeatureOptions, RangeSelectionFeatureOptions } from '@kdcloudjs/table/es/table/pipeline/features';
+import { SortFeatureOptions, RowDetailFeatureOptions, FilterFeatureOptions, TreeModeFeatureOptions, ColumnDragOptions, ColumnResizeOptions, ContextMenuFeatureOptions, RangeSelectionFeatureOptions, colGroupExtendOption } from '@kdcloudjs/table/es/table/pipeline/features';
 declare type TablePropsOfComponents = Pick<BaseTableProps, 'components'> & {
     components?: {
         /** 复选框 */
@@ -31,6 +31,7 @@ export interface TableProps extends TablePropsOfExtend, TablePropsOfComponents {
     columnResize?: boolean | ColumnResizeOptions;
     contextMenu?: IContextMenu;
     rangeSelection?: TableRangeSelection;
+    columnGroupExtend?: colGroupExtendOption;
 }
 export declare type RowSelectionType = 'checkbox' | 'radio';
 export declare type RowSelectionFixed = 'start' | 'end';

package/es/table/table.js

@@ -21,6 +21,7 @@ import useRangeSelection from './feature/useRangeSelection';
 import useＭergeCellHover from './feature/mergeCellHover';
 import devWarning from '../_utils/devwarning';
 import useFooterDataSource from './feature/useFooterDataSource';
+import usecolGroupExtendable from './feature/colGroupExtendable';
 var Table = /*#__PURE__*/forwardRef(function (props, ref) {
   var columns = props.columns,
       dataSource = props.dataSource,
@@ -52,7 +53,9 @@ var Table = /*#__PURE__*/forwardRef(function (props, ref) {
       cssVariables = props.cssVariables,
       stickyScrollHeight = props.stickyScrollHeight,
       scrollbarWidth = props.scrollbarWidth,
-      scrollLoad = props.scrollLoad;
+      scrollLoad = props.scrollLoad,
+      _props$columnGroupExt = props.columnGroupExtend,
+      columnGroupExtend = _props$columnGroupExt === void 0 ? {} : _props$columnGroupExt;
 
   var _useContext = useContext(ConfigContext),
       getPrefixCls = _useContext.getPrefixCls,
@@ -106,6 +109,7 @@ var Table = /*#__PURE__*/forwardRef(function (props, ref) {
   useRangeSelection(pipeline, rangeSelection);
   useＭergeCellHover(pipeline);
   useFooterDataSource(pipeline, footerDataSource);
+  usecolGroupExtendable(pipeline, columnGroupExtend);
   /* -------------------------------------------------------------------------- */
 
   /* after useTablePipeline, merge pipeline.getProps result                     */

package/lib/date-picker/date-picker.js

@@ -122,8 +122,6 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
       onClick = datePickerProps.onClick,
       _onOk = datePickerProps.onOk; // ref
 
-  var panelDivRef = _react.default.useRef(null);
-
   var inputDivRefDefault = _react.default.useRef(null);
 
   var inputDivRef = ref || inputDivRefDefault;
@@ -285,9 +283,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
     if (!openValue) {
       setSelectedValue(dateValue);
 
-      if (valueText === '') {
-        triggerTextChange('');
-      } else if (valueText !== text) {
+      if (valueText !== text) {
         resetText();
       }
     } else {
@@ -439,7 +435,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
 
   var inputProps = {
     inputRef: inputRef,
-    panelDivRef: panelDivRef,
+    panelDivRef: popperRef,
     id: id,
     autoFocus: autoFocus,
     allowClear: allowClear,

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

@@ -0,0 +1,4 @@
+import { colGroupExtendOption } from '@kdcloudjs/table/es/table/pipeline/features';
+import { TablePipeline } from '../interface';
+declare function colGroupExtendable(pipeline: TablePipeline, columnGroupExtend: colGroupExtendOption): void;
+export default colGroupExtendable;

package/lib/table/feature/colGroupExtendable.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _table = require("@kdcloudjs/table");
+
+function colGroupExtendable(pipeline, columnGroupExtend) {
+  if (columnGroupExtend) {
+    pipeline.use(_table.features.colGroupExtendable(columnGroupExtend));
+  }
+}
+
+var _default = colGroupExtendable;
+exports.default = _default;

package/lib/table/interface.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { TableProps as BaseTableProps, TablePipeline as TP, ArtColumnStaticPart } from '@kdcloudjs/table';
-import { SortFeatureOptions, RowDetailFeatureOptions, FilterFeatureOptions, TreeModeFeatureOptions, ColumnDragOptions, ColumnResizeOptions, ContextMenuFeatureOptions, RangeSelectionFeatureOptions } from '@kdcloudjs/table/es/table/pipeline/features';
+import { SortFeatureOptions, RowDetailFeatureOptions, FilterFeatureOptions, TreeModeFeatureOptions, ColumnDragOptions, ColumnResizeOptions, ContextMenuFeatureOptions, RangeSelectionFeatureOptions, colGroupExtendOption } from '@kdcloudjs/table/es/table/pipeline/features';
 declare type TablePropsOfComponents = Pick<BaseTableProps, 'components'> & {
     components?: {
         /** 复选框 */
@@ -31,6 +31,7 @@ export interface TableProps extends TablePropsOfExtend, TablePropsOfComponents {
     columnResize?: boolean | ColumnResizeOptions;
     contextMenu?: IContextMenu;
     rangeSelection?: TableRangeSelection;
+    columnGroupExtend?: colGroupExtendOption;
 }
 export declare type RowSelectionType = 'checkbox' | 'radio';
 export declare type RowSelectionFixed = 'start' | 'end';

package/lib/table/table.js

@@ -59,6 +59,8 @@ var _devwarning = _interopRequireDefault(require("../_utils/devwarning"));
 
 var _useFooterDataSource = _interopRequireDefault(require("./feature/useFooterDataSource"));
 
+var _colGroupExtendable = _interopRequireDefault(require("./feature/colGroupExtendable"));
+
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -94,7 +96,9 @@ var Table = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       cssVariables = props.cssVariables,
       stickyScrollHeight = props.stickyScrollHeight,
       scrollbarWidth = props.scrollbarWidth,
-      scrollLoad = props.scrollLoad;
+      scrollLoad = props.scrollLoad,
+      _props$columnGroupExt = props.columnGroupExtend,
+      columnGroupExtend = _props$columnGroupExt === void 0 ? {} : _props$columnGroupExt;
 
   var _useContext = (0, _react.useContext)(_ConfigContext.default),
       getPrefixCls = _useContext.getPrefixCls,
@@ -148,6 +152,7 @@ var Table = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _useRangeSelection.default)(pipeline, rangeSelection);
   (0, _mergeCellHover.default)(pipeline);
   (0, _useFooterDataSource.default)(pipeline, footerDataSource);
+  (0, _colGroupExtendable.default)(pipeline, columnGroupExtend);
   /* -------------------------------------------------------------------------- */
 
   /* after useTablePipeline, merge pipeline.getProps result                     */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.6.32",
+  "version": "1.6.33",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [