@ccs-ui/rc-pro 1.1.25-beta-25 → 1.1.25-beta-27

package/es/date-picker/index.js

@@ -17,7 +17,7 @@ function CcsDatePicker(_ref) {
     onChange = _ref.onChange,
     restProps = _objectWithoutProperties(_ref, _excluded);
   var handleOnChange = function handleOnChange(_, dateString) {
-    if (onChange) onChange(dateString);
+    if (onChange) onChange(dateString || undefined);
   };
   var dateValue = typeof value === 'string' ? dayjs(value) : value;
   return /*#__PURE__*/_jsx(DatePicker, _objectSpread({
@@ -38,7 +38,7 @@ function RangePicker(_ref2) {
     return null;
   };
   var handleOnChange = function handleOnChange(_, dateString) {
-    if (onChange) onChange(dateString);
+    if (onChange) onChange(dateString || undefined);
   };
   return /*#__PURE__*/_jsx(DatePicker.RangePicker, _objectSpread({
     value: getDateValue(),

package/es/pro-table/head.d.ts

@@ -4,8 +4,6 @@ import { CcsProTableProps } from './table';
 type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formInitValues' | 'expandForm' | 'title' | 'formItemLabelWidth'> & {
     /** 更多查询条件 */
     hasMore?: boolean;
-    /** 标题边框 */
-    titleBordered?: boolean;
     form: FormInstance<any>;
     children?: ReactElement;
     /** table 操作栏 */
@@ -13,5 +11,5 @@ type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formIni
     onSearch: () => void;
 };
 /** 操作按钮、查询，重置、列筛选、 */
-declare function HeadComponent<T>({ form, title, toolbar, children, expandForm, titleBordered, formItems, formInitValues, formItemLabelWidth, tableOperation, onSearch, }: PropsType<T>): import("react/jsx-runtime").JSX.Element;
+declare function HeadComponent<T>({ form, title, toolbar, children, expandForm, formItems, formInitValues, formItemLabelWidth, tableOperation, onSearch, }: PropsType<T>): import("react/jsx-runtime").JSX.Element;
 export default HeadComponent;

package/es/pro-table/head.js

@@ -1,9 +1,3 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -30,7 +24,6 @@ function HeadComponent(_ref) {
     children = _ref.children,
     _ref$expandForm = _ref.expandForm,
     expandForm = _ref$expandForm === void 0 ? false : _ref$expandForm,
-    titleBordered = _ref.titleBordered,
     _ref$formItems = _ref.formItems,
     formItems = _ref$formItems === void 0 ? [] : _ref$formItems,
     formInitValues = _ref.formInitValues,
@@ -86,7 +79,9 @@ function HeadComponent(_ref) {
       children: isExpand ? '收起' : '展开'
     }), /*#__PURE__*/_jsx(Button, {
       type: "primary",
-      htmlType: "submit",
+      onClick: function onClick() {
+        return form.submit();
+      },
       children: "\u67E5\u8BE2"
     }), toolbar ? null : tableOperation]
   });
@@ -155,9 +150,6 @@ function HeadComponent(_ref) {
   var onResize = function onResize() {
     resizeFn();
   };
-
-  // table是否有边框
-  var hasBorder = titleBordered === true;
   var formStyles = {
     flexWrap: isExpand ? 'wrap' : 'nowrap'
   };
@@ -168,18 +160,15 @@ function HeadComponent(_ref) {
         onResize: onResize
       }), /*#__PURE__*/_jsx(Card, {
         className: "ccs-pl-adaptation",
-        style: _objectSpread({
-          borderRadius: 0,
+        style: {
           boxShadow: 'none'
-        }, hasBorder ? {
-          borderBottom: 0
-        } : {}),
+        },
         styles: {
           body: {
             padding: 16
           }
         },
-        bordered: hasBorder,
+        bordered: false,
         title: title,
         children: /*#__PURE__*/_jsxs(Form, {
           initialValues: formInitValues,
@@ -220,6 +209,7 @@ function HeadComponent(_ref) {
       style: {
         borderRadius: 0,
         borderLeft: 0,
+        borderBottom: 0,
         borderRight: 0
       },
       children: [/*#__PURE__*/_jsx("div", {

package/es/pro-table/index.less

@@ -57,11 +57,11 @@
     display: flex;
     flex-wrap: wrap;
     gap: 16px 10px;
-    overflow: auto;
+    overflow: hidden;
 
-    &::-webkit-scrollbar {
-      display: none;
-    }
+    // &::-webkit-scrollbar {
+    //   display: none;
+    // }
   }
 
   .ant-form-item {
@@ -188,6 +188,33 @@
       white-space: nowrap;
     }
   }
+
+  .ant-table-wrapper .ant-table > .ant-table-container {
+    & > .ant-table-header > table > thead > tr {
+      & > th:last-child {
+        border-inline-end: 0;
+        border-start-start-radius: 0;
+        border-start-end-radius: 0;
+      }
+      & > th:first-child {
+        border-start-start-radius: 0;
+      }
+    }
+    & > .ant-table-body > table > tbody > tr > td:last-child {
+      border-inline-end: 0;
+    }
+  }
+
+  .ant-table-wrapper .ant-table > .ant-table-container {
+    border-inline-start: 0;
+    border-top: 0;
+  }
+  .ant-table-wrapper table {
+    border-radius: 0;
+  }
+  .ant-table-wrapper .ant-table .ant-table-header {
+    border-radius: 0;
+  }
 }
 
 // modal drawer ccs-pl 中取消table content padding

package/es/pro-table/search.js

@@ -88,7 +88,6 @@ function SearchComponent(props) {
       onClick: function onClick() {
         return form.submit();
       },
-      htmlType: "submit",
       style: {
         marginRight: 4
       },

package/es/pro-table/table.js

@@ -508,9 +508,16 @@ var InternalProTable = function InternalProTable(props) {
     },
     children: toolbarExtra
   });
+  var rootStyle = style || {};
+  if (table !== null && table !== void 0 && table.bordered) {
+    rootStyle = _objectSpread({
+      border: "1px solid ".concat(token.colorBorderSecondary),
+      borderRadius: 4
+    }, rootStyle);
+  }
   var render = /*#__PURE__*/_jsxs("div", {
     className: classNames(classPrefix, className, _defineProperty({}, 'dark-table', isDark)),
-    style: style,
+    style: rootStyle,
     children: [!(!formItems.length && !toolbar) && isAuth && props.formItemLayout !== 'adaptation' ? /*#__PURE__*/_jsx(SearchComponent, {
       form: form,
       title: title,
@@ -536,7 +543,6 @@ var InternalProTable = function InternalProTable(props) {
       children: newToolbarExtra
     }) : /*#__PURE__*/_jsx(HeadComponent, {
       form: form,
-      titleBordered: table === null || table === void 0 ? void 0 : table.bordered,
       toolbar: newToolbar,
       formItems: formItems,
       expandForm: expandForm,

package/es/table/index.js

@@ -13,7 +13,6 @@ import { Table, Tooltip, theme } from 'antd';
 import classNames from 'classnames';
 import { useImperativeHandle, useRef } from 'react';
 import { Resizable } from 'react-resizable';
-import CcsResult from "../result";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 var DEFAULT_PAGE = {
@@ -206,12 +205,8 @@ var CustomTable = function CustomTable(props) {
         rowSelection: rowSelection ? _objectSpread(_objectSpread({}, rowSelection), {}, {
           columnWidth: 60
         }) : undefined,
-        columns: filterColumns(),
-        locale: {
-          emptyText: /*#__PURE__*/_jsx(CcsResult.NoData, {
-            iconWidth: 80
-          })
-        }
+        columns: filterColumns()
+        // locale={{ emptyText: <CcsResult.NoData iconWidth={80} /> }}
       }, restProps), {}, {
         size: restProps.size || 'middle',
         className: classNames(_defineProperty(_defineProperty(_defineProperty({}, 'ccs-table-nodata', !totalNum), 'ccs-table-wrapper', !rowSelection), "className", className)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.25-beta-25",
+  "version": "1.1.25-beta-27",
   "description": "验证码组件兼容暗黑模式;proTable封装rowselection代码;proTable添加自适应布局模式;",
   "license": "MIT",
   "author": {