@sooloer/pages 0.1.15 → 0.1.17

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

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["label", "name", "type", "collapsed", "widgetProps", "labelWidth", "fieldRender", "required"],
+var _excluded = ["label", "name", "hideLabel", "type", "collapsed", "widgetProps", "labelWidth", "fieldRender", "required"],
   _excluded2 = ["placeholder", "options"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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; }
@@ -22,6 +22,8 @@ var Field = function Field(_ref) {
   var _ref$label = _ref.label,
     label = _ref$label === void 0 ? '' : _ref$label,
     name = _ref.name,
+    _ref$hideLabel = _ref.hideLabel,
+    hideLabel = _ref$hideLabel === void 0 ? false : _ref$hideLabel,
     _ref$type = _ref.type,
     type = _ref$type === void 0 ? 'input' : _ref$type,
     collapsed = _ref.collapsed,
@@ -54,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;
@@ -115,7 +116,9 @@ var Field = function Field(_ref) {
             width: '100%'
           },
           disabledDate: disabledDate
-        }, argProps));
+        }, argProps, {
+          placeholder: placeholder || [label, label]
+        }));
         break;
       case 'range':
       case 'digitRange':
@@ -133,8 +136,10 @@ var Field = function Field(_ref) {
   };
   return /*#__PURE__*/React.createElement(Item, _extends({}, argField, {
     name: name,
-    required: required,
-    label: labelRender(),
+    required: required
+  }, !hideLabel && {
+    label: labelRender()
+  }, {
     className: "sooloer-filter-field-item",
     labelCol: {
       flex: "".concat(labelWidth, "px")

package/dist/filter/demo/basic.js

@@ -29,6 +29,8 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(ProFilter, {
     fields: fields,
+    hideLabel: true,
+    gridColumns: 8,
     onReset: handleReset,
     onSearch: handleSearch
   });

package/dist/filter/index.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["fields", "maskable", "labelWidth", "resetText", "searchText", "resetButtonProps", "searchButtonProps", "initialValues", "gridColumns", "values", "wrappRef", "onReset", "onSearch", "onExpandChange", "onValuesChange"],
+var _excluded = ["fields", "maskable", "hideLabel", "labelWidth", "resetText", "searchText", "resetButtonProps", "searchButtonProps", "initialValues", "gridColumns", "values", "wrappRef", "onReset", "onSearch", "onExpandChange", "onValuesChange"],
   _excluded2 = ["disabled"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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; }
@@ -19,7 +19,7 @@ import { DownOutlined } from '@ant-design/icons';
 import { calculator, sum } from '@tmaito/utils';
 import { Button, Col, Form, Row, Space, Tooltip } from 'antd';
 import classnames from 'classnames';
-import React, { forwardRef, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import AutoSize from 'react-virtualized-auto-sizer';
 import Field from "./components/field";
 import "./index.less";
@@ -32,6 +32,8 @@ var ProFilter = function ProFilter(props, ref) {
     fields = _props$fields === void 0 ? [] : _props$fields,
     _props$maskable = props.maskable,
     maskable = _props$maskable === void 0 ? true : _props$maskable,
+    _props$hideLabel = props.hideLabel,
+    hideLabel = _props$hideLabel === void 0 ? false : _props$hideLabel,
     _props$labelWidth = props.labelWidth,
     labelWidth = _props$labelWidth === void 0 ? 98 : _props$labelWidth,
     _props$resetText = props.resetText,
@@ -44,7 +46,8 @@ var ProFilter = function ProFilter(props, ref) {
     searchButtonProps = _props$searchButtonPr === void 0 ? {} : _props$searchButtonPr,
     _props$initialValues = props.initialValues,
     initialValues = _props$initialValues === void 0 ? {} : _props$initialValues,
-    gridColumns = props.gridColumns,
+    _props$gridColumns = props.gridColumns,
+    gridColumns = _props$gridColumns === void 0 ? 4 : _props$gridColumns,
     _props$values = props.values,
     values = _props$values === void 0 ? {} : _props$values,
     wrappRef = props.wrappRef,
@@ -70,6 +73,9 @@ var ProFilter = function ProFilter(props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     span = _useState6[0],
     setSpan = _useState6[1];
+  useEffect(function () {
+    setSpan(gridColumns);
+  }, []);
   useImperativeHandle(ref, function () {
     return {
       form: form
@@ -265,7 +271,8 @@ var ProFilter = function ProFilter(props, ref) {
         maxWidth: calcFieldSpan(item)
       }
     }, /*#__PURE__*/React.createElement(Field, _extends({}, item, {
-      labelWidth: labelWidth
+      labelWidth: labelWidth,
+      hideLabel: hideLabel
     })));
   }), /*#__PURE__*/React.createElement(Col, {
     flex: "auto"
@@ -356,7 +363,8 @@ var ProFilter = function ProFilter(props, ref) {
         maxWidth: calcFieldSpan(item)
       }
     }, /*#__PURE__*/React.createElement(Field, _extends({}, item, {
-      labelWidth: labelWidth
+      labelWidth: labelWidth,
+      hideLabel: hideLabel
     })));
   }), moreFixedFields.map(function (item) {
     return /*#__PURE__*/React.createElement(Col, {
@@ -369,7 +377,8 @@ var ProFilter = function ProFilter(props, ref) {
         maxWidth: calcFieldSpan(item)
       }
     }, /*#__PURE__*/React.createElement(Field, _extends({}, item, {
-      labelWidth: labelWidth
+      labelWidth: labelWidth,
+      hideLabel: hideLabel
     })));
   }))), /*#__PURE__*/React.createElement("div", {
     className: classnames('sooloer-filter-field-more', {
@@ -389,7 +398,8 @@ var ProFilter = function ProFilter(props, ref) {
         maxWidth: calcFieldSpan(item)
       }
     }, /*#__PURE__*/React.createElement(Field, _extends({}, item, {
-      labelWidth: labelWidth
+      labelWidth: labelWidth,
+      hideLabel: hideLabel
     })));
   })))))), maskable && (wrappRef === null || wrappRef === void 0 ? void 0 : wrappRef.current) && /*#__PURE__*/React.createElement("div", {
     onClick: function onClick() {

package/dist/filter/typing.d.ts

@@ -75,6 +75,11 @@ export interface ProFilterProps<Values = any> {
      * @default 98
      */
     labelWidth?: number;
+    /**
+     * @description 是否隱藏显示标签
+     * @default false
+     */
+    hideLabel?: boolean;
     /**
      * @description 重置按钮的文本
      * @default 重置

package/package.json

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