@sooloer/pages 0.1.16 → 0.1.18

package/README.md

@@ -1,7 +1,6 @@
 # @sooloer/pages
 
-[![NPM version](https://img.shields.io/npm/v/@sooloer/pages.svg?style=flat)](https://npmjs.org/package/@sooloer/pages)
-[![NPM downloads](http://img.shields.io/npm/dm/@sooloer/pages.svg?style=flat)](https://npmjs.org/package/@sooloer/pages)
+[![NPM version](https://img.shields.io/npm/v/@sooloer/pages.svg?style=flat)](https://npmjs.org/package/@sooloer/pages) [![NPM downloads](http://img.shields.io/npm/dm/@sooloer/pages.svg?style=flat)](https://npmjs.org/package/@sooloer/pages)
 
 A react library developed with dumi
 

package/dist/filter/components/field/index.js

@@ -56,17 +56,16 @@ var Field = function Field(_ref) {
 
   // 筛选项
   var itemRender = function itemRender() {
-    var _widgetProps$allowCle4;
+    var _widgetProps$allowCle3;
     if (fieldRender) {
       return fieldRender;
     }
     var _widgetProps$allowCle = _objectSpread(_objectSpread({}, widgetProps), {}, {
-        allowClear: required ? true : (_widgetProps$allowCle4 = widgetProps === null || widgetProps === void 0 ? void 0 : widgetProps.allowClear) !== null && _widgetProps$allowCle4 !== void 0 ? _widgetProps$allowCle4 : true
+        allowClear: required ? true : (_widgetProps$allowCle3 = widgetProps === null || widgetProps === void 0 ? void 0 : widgetProps.allowClear) !== null && _widgetProps$allowCle3 !== void 0 ? _widgetProps$allowCle3 : true
       }),
-      _widgetProps$allowCle2 = _widgetProps$allowCle.placeholder,
-      placeholder = _widgetProps$allowCle2 === void 0 ? '' : _widgetProps$allowCle2,
-      _widgetProps$allowCle3 = _widgetProps$allowCle.options,
-      options = _widgetProps$allowCle3 === void 0 ? [] : _widgetProps$allowCle3,
+      placeholder = _widgetProps$allowCle.placeholder,
+      _widgetProps$allowCle2 = _widgetProps$allowCle.options,
+      options = _widgetProps$allowCle2 === void 0 ? [] : _widgetProps$allowCle2,
       argProps = _objectWithoutProperties(_widgetProps$allowCle, _excluded2);
     var optionRender = widgetProps.optionRender;
     var node = null;
@@ -117,7 +116,9 @@ var Field = function Field(_ref) {
             width: '100%'
           },
           disabledDate: disabledDate
-        }, argProps));
+        }, argProps, {
+          placeholder: placeholder || [label, label]
+        }));
         break;
       case 'range':
       case 'digitRange':

package/dist/filter/demo/basic.js

@@ -8,10 +8,11 @@ export default (function () {
     label: '发票代码',
     name: 'invoiceCode'
   }, {
-    label: '发票类型',
+    label: '选择发票类型',
     name: 'invoiceType',
     type: 'select',
     widgetProps: {
+      placeholder: '请选择',
       options: [{
         label: '电子专票',
         value: 1

package/dist/table/table/index.js

@@ -46,6 +46,7 @@ var ElTable = function ElTable(_ref) {
     onGlobalCheckboxChange = _ref.onGlobalCheckboxChange,
     extraAction = _ref.extraAction,
     args = _objectWithoutProperties(_ref, _excluded);
+  var headerRef = /*#__PURE__*/React.createRef();
   var _useState = useState('small'),
     _useState2 = _slicedToArray(_useState, 2),
     size = _useState2[0],
@@ -58,6 +59,10 @@ var ElTable = function ElTable(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     sortColumns = _useState6[0],
     setSortColumns = _useState6[1];
+  var _useState7 = useState(39),
+    _useState8 = _slicedToArray(_useState7, 2),
+    tableHeaderHeight = _useState8[0],
+    setTableHeaderHeight = _useState8[1];
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   useEffect(function () {
@@ -75,15 +80,11 @@ var ElTable = function ElTable(_ref) {
       return !(item !== null && item !== void 0 && item.hideInTable || false);
     });
   }, [sortColumns]);
-  var tableHeaderHeight = useMemo(function () {
-    if (size === 'large') {
-      return 56;
-    }
-    if (size === 'middle') {
-      return 48;
+  useEffect(function () {
+    if (headerRef !== null && headerRef !== void 0 && headerRef.current) {
+      setTableHeaderHeight(headerRef.current.offsetHeight);
     }
-    return 40;
-  }, [size]);
+  }, [headerRef]);
   var paginationConfig = useMemo(function () {
     if (pagination !== false) {
       return _objectSpread({
@@ -163,7 +164,15 @@ var ElTable = function ElTable(_ref) {
     className: classnames('sooloer-table', {
       'pagination-hidden': pagination === false
     }),
-    columns: showColumns,
+    columns: _toConsumableArray(showColumns.map(function (row, index) {
+      return _objectSpread(_objectSpread({}, row), !index && {
+        onHeaderCell: function onHeaderCell() {
+          return {
+            ref: headerRef
+          };
+        }
+      });
+    })),
     dataSource: dataSource,
     style: {
       height: height

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sooloer/pages",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",