@teamix/pro 1.2.10 → 1.2.14

package/es/card/index.js

@@ -1,5 +1,5 @@
 var _excluded = ["context"],
-    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "description", "extra", "actions", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
+    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "tags", "description", "extra", "actions", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "empty", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -13,9 +13,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -25,14 +25,16 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import React from 'react';
 import classnames from 'classnames';
+import Result from '@teamix/result';
 import { Card as BasicCard, Balloon } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
-import { baseClass } from '@teamix/utils';
+import { baseClass, getMessage, renderTags } from '@teamix/utils';
 import { ProSkeletonRaw } from '../skeleton';
 import { ProActionGroup } from '../actions';
 import { formatSpacing, getColClassAndStyle } from './utils';
 import ProCardDivider from './divider';
 import ProCardSelectable from './selectable';
+import ProCardTab from './tab';
 import './index.scss';
 export * from './card-container';
 var cls = baseClass('teamix-pro-card');
@@ -74,6 +76,7 @@ export var ProCard = function ProCard(props) {
       subTitle = props.subTitle,
       tooltip = props.tooltip,
       tooltipIcon = props.tooltipIcon,
+      tags = props.tags,
       description = props.description,
       extra = props.extra,
       actions = props.actions,
@@ -86,6 +89,7 @@ export var ProCard = function ProCard(props) {
       compacted = props.compacted,
       centered = props.centered,
       loading = props.loading,
+      empty = props.empty,
       borderColor = props.borderColor,
       backgroundColor = props.backgroundColor,
       contentClassName = props.contentClassName,
@@ -176,7 +180,7 @@ export var ProCard = function ProCard(props) {
   }, _defineProperty(_classnames, "border-".concat(borderColor), borderColor), _defineProperty(_classnames, "compacted", compacted), _defineProperty(_classnames, "hoverable", hoveredShadow), _classnames));
   var cardContentClassName = classnames(cls('content'), contentClassName, getFlexDirectionClassName(direction, split), (_classnames2 = {
     'contain-pro-card': containProCard
-  }, _defineProperty(_classnames2, "split-".concat(split), split), _defineProperty(_classnames2, 'flex-wrap', wrap), _defineProperty(_classnames2, "centered", centered), _classnames2));
+  }, _defineProperty(_classnames2, "split-".concat(split), split), _defineProperty(_classnames2, 'flex-wrap', wrap), _defineProperty(_classnames2, "centered", centered || empty), _classnames2));
   var cardContentMargin = containProCard && !split ? {
     marginRight: -horizonal,
     marginLeft: -horizonal,
@@ -211,7 +215,7 @@ export var ProCard = function ProCard(props) {
     }, /*#__PURE__*/React.createElement(Balloon.Tooltip, {
       align: "t",
       trigger: tooltipTrigger
-    }, tooltip)), description && /*#__PURE__*/React.createElement("div", {
+    }, tooltip)), tags && renderTags(tags, 'small'), description && /*#__PURE__*/React.createElement("div", {
       className: cls('title-description')
     }, description));
   };
@@ -236,7 +240,16 @@ export var ProCard = function ProCard(props) {
   }, loading && /*#__PURE__*/React.createElement(ProSkeletonRaw.Card.Content, null), !loading && /*#__PURE__*/React.createElement("div", {
     className: cardContentClassName,
     style: cardContentStyle
-  }, childrenModified)));
+  }, empty && /*#__PURE__*/React.createElement("div", {
+    className: cls('empty')
+  }, childrenModified ? childrenModified : /*#__PURE__*/React.createElement(Result, {
+    theme: "hybridcloud-container",
+    img: "noData",
+    title: getMessage('noData'),
+    style: {
+      padding: '50px 0 60px'
+    }
+  })), !empty && childrenModified)));
 };
 ProCard.defaultProps = {
   bordered: true,
@@ -245,5 +258,6 @@ ProCard.defaultProps = {
 };
 ProCard.Divider = ProCardDivider;
 ProCard.Selectable = ProCardSelectable;
+ProCard.Tab = ProCardTab;
 ProCard.isProCard = true;
 export default ProCard;

package/es/card/index.scss

@@ -153,6 +153,25 @@
     }
   }
 
+  &-tab {
+    margin-top: calc(0px - var(--s-2));
+
+    & > .next-tabs-bar {
+      border-bottom: none;
+    }
+
+    & > .next-tabs-content {
+      padding-top: var(--s-5, 20px);
+    }
+  }
+
+  &-empty {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    color: var(--color-text1-8, #848484);
+  }
+
   & > .next-card-actions {
     & > .teamix-pro-actions {
       & > .next-btn {

package/es/card/selectable.js

@@ -1,8 +1,8 @@
 var _excluded = ["selected", "onSelect", "className", "onClick"];
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/es/card/tab.d.ts

@@ -0,0 +1,6 @@
+import { TabProps } from '@alicloudfe/components/types/tab';
+declare const ProCardTab: {
+    (props: TabProps): JSX.Element;
+    Item: typeof import("@alifd/next/types/tab").Item;
+};
+export default ProCardTab;

package/es/card/tab.js

@@ -0,0 +1,27 @@
+var _excluded = ["className"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+import React from 'react';
+import classnames from 'classnames';
+import { Tab } from '@alicloudfe/components';
+
+var ProCardTab = function ProCardTab(props) {
+  var className = props.className,
+      others = _objectWithoutProperties(props, _excluded);
+
+  return /*#__PURE__*/React.createElement(Tab, _objectSpread({
+    className: classnames('teamix-pro-card-tab', className)
+  }, others));
+};
+
+ProCardTab.Item = Tab.Item;
+export default ProCardTab;

package/es/form/Components/Editable/index.js

@@ -1,6 +1,6 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/es/form/Components/FormGroup/index.js

@@ -5,9 +5,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/es/form/Components/LightFilter/componentMap.d.ts

@@ -0,0 +1,2 @@
+declare const componentMap: any;
+export default componentMap;

package/es/form/Components/LightFilter/componentMap.js

@@ -0,0 +1,5 @@
+var componentMap = {
+  Radio: 'Select',
+  Checkbox: 'Select'
+};
+export default componentMap;

package/es/form/Components/LightFilter/index.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+import type { SelectProps } from '@alicloudfe/components/types/select';
+import type { ButtonProps } from '@alicloudfe/components/types/button';
+import './index.scss';
+/**
+ * LightFilter
+ */
+interface ILightFiter {
+    size?: 'small' | 'medium' | 'large';
+    defaultFilterValue?: string;
+    filterProps?: SelectProps;
+    buttonProps?: ButtonProps;
+}
+declare const LightFilter: React.FC<ILightFiter>;
+export default LightFilter;

package/es/form/Components/{QueryFilter → LightFilter}/index.js

@@ -10,41 +10,40 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import React, { useState } from 'react';
 import { useField, observer, useFieldSchema, RecursionField } from '@formily/react';
-import { isArr } from '@teamix/utils';
-import Query from '../Query';
-
-var isValid = function isValid(v) {
-  if (isArr(v)) {
-    return v.length !== 0;
-  }
-
-  return v !== undefined && v !== null;
-}; // 主激活区
-
+import { Select, Button } from '@alicloudfe/components';
+import TeamixIcon from '@teamix/icon';
+import cls from 'classnames';
+import { usePrefixCls } from '@teamix/utils';
+import componentMap from './componentMap';
+import './index.scss'; // 主激活区内容
 
 var useMain = function useMain(active) {
   var schema = useFieldSchema();
   var main = [];
   schema.mapProperties(function (schema, name) {
+    // console.log(schema.required); // 添加 *
+    console.log(schema);
+
     if (schema.name === active) {
       main.push({
         name: name,
         schema: _objectSpread(_objectSpread({}, schema), {}, {
-          title: ''
+          title: '',
+          'x-component': componentMap[schema['x-component']] || schema['x-component']
         })
       });
     }
   });
   return main;
-}; // 筛选项选择
+}; // 筛选项数据
 
 
 var useFilterItems = function useFilterItems() {
@@ -57,38 +56,29 @@ var useFilterItems = function useFilterItems() {
     });
   });
   return filterItems;
-}; // 标签值
+};
 
+var LightFilter = observer(function (props) {
+  var _filterItems$;
 
-var useValues = function useValues() {
-  var queryField = useField();
+  var field = useField();
   var schema = useFieldSchema();
-  var values = [];
-  schema.mapProperties(function (schema, name) {
-    var field = queryField.query(queryField.address.concat(name)).take(); // console.log(field);
-
-    if (isValid(field === null || field === void 0 ? void 0 : field.value)) {
-      values.push({
-        key: schema.name,
-        title: schema.title,
-        content: field.value
-      });
-    }
-  });
-  return values;
-};
+  var filterItems = useFilterItems();
+  var size = props.size,
+      defaultFilterValue = props.defaultFilterValue,
+      filterProps = props.filterProps,
+      buttonProps = props.buttonProps;
 
-var QueryFilter = observer(function (props) {
-  var _useState = useState(),
+  var _useState = useState(defaultFilterValue || ((_filterItems$ = filterItems[0]) === null || _filterItems$ === void 0 ? void 0 : _filterItems$.value)),
       _useState2 = _slicedToArray(_useState, 2),
       active = _useState2[0],
       setActive = _useState2[1];
 
-  var field = useField();
-  var schema = useFieldSchema();
   var main = useMain(active);
-  var filterItems = useFilterItems();
-  var values = useValues();
+  var defaultCls = usePrefixCls();
+  var prefixCls = usePrefixCls('', {
+    prefix: 'teamix-pro-form-light-filter'
+  });
   var content = main.map(function (_ref, key) {
     var schema = _ref.schema,
         name = _ref.name;
@@ -101,10 +91,22 @@ var QueryFilter = observer(function (props) {
       }
     });
   });
-  return /*#__PURE__*/React.createElement(Query, {
-    tags: values,
-    filterItems: filterItems,
-    onFilterItemsChange: setActive
-  }, content);
+  return /*#__PURE__*/React.createElement("span", {
+    className: cls(prefixCls, "".concat(defaultCls).concat(size))
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "".concat(prefixCls, "-main")
+  }, /*#__PURE__*/React.createElement(Select, _objectSpread(_objectSpread({}, filterProps), {}, {
+    className: cls("".concat(prefixCls, "-select"), filterProps === null || filterProps === void 0 ? void 0 : filterProps.className),
+    dataSource: filterItems,
+    onChange: setActive,
+    value: active
+  })), content), /*#__PURE__*/React.createElement("span", {
+    className: "".concat(prefixCls, "-addonAfter")
+  }, /*#__PURE__*/React.createElement(Button, _objectSpread({}, buttonProps), /*#__PURE__*/React.createElement(TeamixIcon, {
+    type: "search-line"
+  }))));
 });
-export default QueryFilter;
+LightFilter.defaultProps = {
+  size: 'medium'
+};
+export default LightFilter;

package/es/form/Components/LightFilter/index.scss

@@ -0,0 +1,74 @@
+@import '../../global.scss';
+
+$light-filter: #{teamix-pro-form}-light-filter;
+
+// LightFilter
+.#{$light-filter} {
+  display: flex;
+  width: 100%;
+  height: var(--search-normal-normal-m-height, 32px);
+  transition: box-shadow var(--active-transition);
+  &:hover,
+  &:focus {
+    box-shadow: var(--active-shadow);
+    border-color: var(--input-focus-border-color, #ababab);
+  }
+  .#{$light-filter}-main {
+    display: flex;
+    box-sizing: border-box;
+    border: var(--search-normal-normal-border-width, 1px) solid
+      var(--color-line1-2, #d9d9d9);
+    border-right: 0;
+    border-radius: var(--search-normal-corner, 2px);
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    // 表单项选择
+    .#{$light-filter}-select {
+      min-width: auto;
+      .#{$css-prefix}input {
+        min-width: auto;
+        border: 0;
+        box-shadow: none;
+        .#{$css-prefix}input-text-field {
+          padding-right: 0;
+        }
+      }
+      .#{$css-prefix}input {
+        height: $noborder-font-weight-medium;
+      }
+      .#{$css-prefix}input-control {
+        padding-right: 0;
+      }
+    }
+  }
+
+  // 按钮后缀
+  .#{$light-filter}-addonAfter {
+    .#{$css-prefix}btn {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
+      .teamix-icon {
+        color: var(--color-line1-5, #ababab) !important;
+      }
+    }
+  }
+}
+
+// LightFilter无边框
+.#{$form-item-cls}-bordered-none {
+  .#{$form-item-cls}-control {
+    .#{$form-item-cls}-control-content {
+      .#{$form-item-cls}-control-content-component {
+        min-height: $noborder-font-weight-medium;
+        .#{$css-prefix}date-picker2-input {
+          border: 0;
+          box-shadow: none !important;
+        }
+        .#{$css-prefix}date-picker2-input.#{$css-prefix}date-picker2-input-medium,
+        .#{$css-prefix}input.#{$css-prefix}medium {
+          height: $noborder-font-weight-medium;
+        }
+      }
+    }
+  }
+}

package/es/form/Components/ProField/index.js

@@ -10,9 +10,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/es/form/Components/Text/index.js

@@ -1,8 +1,8 @@
 var _excluded = ["children", "className"];
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/es/form/Filter/index.d.ts

@@ -1,16 +1,13 @@
 import React from 'react';
 import type { IFilterProps } from '../typing';
+import './index.scss';
 /**
  * 简单筛选
  */
 declare const SimpleFilter: React.FC<IFilterProps>;
-/**
- * 查询筛选
- */
-declare const QueryFilter: React.FC<IFilterProps>;
 /**
  * 高级筛选
  */
 declare const AdvancedFilter: React.FC<IFilterProps>;
-export { AdvancedFilter, SimpleFilter, QueryFilter };
+export { AdvancedFilter, SimpleFilter };
 export default AdvancedFilter;

package/es/form/Filter/index.js

@@ -1,5 +1,4 @@
-var _excluded = ["schema", "triggerType", "onFilter"],
-    _excluded2 = ["schema", "triggerType", "onFilter"];
+var _excluded = ["schema", "triggerType", "onFilter"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -17,9 +16,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -29,6 +28,7 @@ import { usePrefixCls, getMessage } from '@teamix/utils';
 import { createForm } from '@formily/core';
 import ProForm from '../ProForm';
 import { mergeArrayValue } from '../utils';
+import './index.scss';
 
 var getEventProps = function getEventProps(triggerType, onFilter) {
   var keydownEvent = {
@@ -89,47 +89,6 @@ var SimpleFilter = /*#__PURE__*/memo(function (props) {
 SimpleFilter.defaultProps = {
   triggerType: 'change'
 };
-/**
- * 查询筛选
- */
-
-var QueryFilter = /*#__PURE__*/memo(function (props) {
-  var schema = props.schema,
-      triggerType = props.triggerType,
-      onFilter = props.onFilter,
-      otherProps = _objectWithoutProperties(props, _excluded2);
-
-  var prefixCls = usePrefixCls('', {
-    prefix: 'teamix-pro-form-filter-query'
-  });
-  var querySchema = useMemo(function () {
-    return [{
-      component: 'QueryFilter',
-      props: {
-        placeholder: 'placeholder'
-      },
-      children: schema
-    }, {
-      type: 'void',
-      decorator: null,
-      component: 'Submit',
-      props: {
-        style: _objectSpread({}, triggerType === 'submit' ? {} : {
-          display: 'none'
-        })
-      }
-    }];
-  }, []);
-  var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread(_objectSpread({
-    feedbackLayout: "none",
-    breakpoints: [],
-    bordered: false
-  }, otherProps), eventProps), {}, {
-    className: cls(prefixCls, props.className),
-    schema: querySchema
-  }));
-});
 /**
  * 高级筛选
  */
@@ -221,5 +180,5 @@ AdvancedFilter.defaultProps = {
   labelCol: 6,
   wrapperCol: 18
 };
-export { AdvancedFilter, SimpleFilter, QueryFilter };
+export { AdvancedFilter, SimpleFilter };
 export default AdvancedFilter;

package/es/form/Filter/index.scss

@@ -0,0 +1,25 @@
+@import '../global.scss';
+
+// 筛选
+.#{$teamix-pro-form}-filter-advanced,
+.#{$teamix-pro-form}-filter-simple {
+  .#{$form-item-cls}-feedback-layout-popover {
+    margin-bottom: 0;
+  }
+  .#{$css-prefix}date-picker2-input {
+    .#{$css-prefix}input {
+      width: inherit;
+      input {
+        width: inherit;
+      }
+    }
+  }
+}
+
+// 筛选和抽屉按钮
+.#{$teamix-pro-form}-filter-advanced,
+.#{$css-prefix}drawer-footer {
+  .#{$css-prefix}formily-button-group {
+    margin-top: 0;
+  }
+}

package/es/form/Filter/index2.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import type { QueryFilterProps } from '../typing';
+import './index2.scss';
+/**
+ * 查询筛选
+ */
+declare const QueryFilter: React.FC<QueryFilterProps>;
+export { QueryFilter };