@teamix/pro 1.2.10 → 1.2.14

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

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -11,9 +11,17 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _react2 = require("@formily/react");
 
+var _components = require("@alicloudfe/components");
+
+var _icon = _interopRequireDefault(require("@teamix/icon"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _utils = require("@teamix/utils");
 
-var _Query = _interopRequireDefault(require("../Query"));
+var _componentMap = _interopRequireDefault(require("./componentMap"));
+
+require("./index.scss");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -33,36 +41,32 @@ 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; }
 
-var isValid = function isValid(v) {
-  if ((0, _utils.isArr)(v)) {
-    return v.length !== 0;
-  }
-
-  return v !== undefined && v !== null;
-}; // 主激活区
-
-
+// 主激活区内容
 var useMain = function useMain(active) {
   var schema = (0, _react2.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.default[schema['x-component']] || schema['x-component']
         })
       });
     }
   });
   return main;
-}; // 筛选项选择
+}; // 筛选项数据
 
 
 var useFilterItems = function useFilterItems() {
@@ -75,38 +79,29 @@ var useFilterItems = function useFilterItems() {
     });
   });
   return filterItems;
-}; // 标签值
+};
 
+var LightFilter = (0, _react2.observer)(function (props) {
+  var _filterItems$;
 
-var useValues = function useValues() {
-  var queryField = (0, _react2.useField)();
+  var field = (0, _react2.useField)();
   var schema = (0, _react2.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 = (0, _react2.observer)(function (props) {
-  var _useState = (0, _react.useState)(),
+  var _useState = (0, _react.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 = (0, _react2.useField)();
-  var schema = (0, _react2.useFieldSchema)();
   var main = useMain(active);
-  var filterItems = useFilterItems();
-  var values = useValues();
+  var defaultCls = (0, _utils.usePrefixCls)();
+  var prefixCls = (0, _utils.usePrefixCls)('', {
+    prefix: 'teamix-pro-form-light-filter'
+  });
   var content = main.map(function (_ref, key) {
     var schema = _ref.schema,
         name = _ref.name;
@@ -119,11 +114,23 @@ var QueryFilter = (0, _react2.observer)(function (props) {
       }
     });
   });
-  return /*#__PURE__*/_react.default.createElement(_Query.default, {
-    tags: values,
-    filterItems: filterItems,
-    onFilterItemsChange: setActive
-  }, content);
+  return /*#__PURE__*/_react.default.createElement("span", {
+    className: (0, _classnames.default)(prefixCls, "".concat(defaultCls).concat(size))
+  }, /*#__PURE__*/_react.default.createElement("span", {
+    className: "".concat(prefixCls, "-main")
+  }, /*#__PURE__*/_react.default.createElement(_components.Select, _objectSpread(_objectSpread({}, filterProps), {}, {
+    className: (0, _classnames.default)("".concat(prefixCls, "-select"), filterProps === null || filterProps === void 0 ? void 0 : filterProps.className),
+    dataSource: filterItems,
+    onChange: setActive,
+    value: active
+  })), content), /*#__PURE__*/_react.default.createElement("span", {
+    className: "".concat(prefixCls, "-addonAfter")
+  }, /*#__PURE__*/_react.default.createElement(_components.Button, _objectSpread({}, buttonProps), /*#__PURE__*/_react.default.createElement(_icon.default, {
+    type: "search-line"
+  }))));
 });
-var _default = QueryFilter;
+LightFilter.defaultProps = {
+  size: 'medium'
+};
+var _default = LightFilter;
 exports.default = _default;

package/lib/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/lib/form/Components/ProField/index.js

@@ -29,9 +29,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/lib/form/Components/Text/index.js

@@ -17,9 +17,9 @@ var _excluded = ["children", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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/lib/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/lib/form/Filter/index.js

@@ -1,11 +1,11 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.SimpleFilter = exports.QueryFilter = exports.AdvancedFilter = void 0;
+exports.default = exports.SimpleFilter = exports.AdvancedFilter = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -19,8 +19,9 @@ var _ProForm = _interopRequireDefault(require("../ProForm"));
 
 var _utils2 = require("../utils");
 
-var _excluded = ["schema", "triggerType", "onFilter"],
-    _excluded2 = ["schema", "triggerType", "onFilter"];
+require("./index.scss");
+
+var _excluded = ["schema", "triggerType", "onFilter"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -44,9 +45,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; }
 
@@ -110,52 +111,10 @@ exports.SimpleFilter = SimpleFilter;
 SimpleFilter.defaultProps = {
   triggerType: 'change'
 };
-/**
- * 查询筛选
- */
-
-var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var schema = props.schema,
-      triggerType = props.triggerType,
-      onFilter = props.onFilter,
-      otherProps = _objectWithoutProperties(props, _excluded2);
-
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-filter-query'
-  });
-  var querySchema = (0, _react.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.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
-    feedbackLayout: "none",
-    breakpoints: [],
-    bordered: false
-  }, otherProps), eventProps), {}, {
-    className: (0, _classnames.default)(prefixCls, props.className),
-    schema: querySchema
-  }));
-});
 /**
  * 高级筛选
  */
 
-exports.QueryFilter = QueryFilter;
 var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var form = (0, _react.useMemo)(function () {
     return (props === null || props === void 0 ? void 0 : props.form) || (0, _core.createForm)();

package/lib/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/lib/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 };