@teamix/pro 1.2.11 → 1.2.12

package/es/form/typing.d.ts

@@ -2,6 +2,7 @@ import type { ReactNode } from 'react';
 import type { IFormFeedback, Form as FormType, FieldPatternTypes } from '@formily/core';
 import type { IFormLayoutProps } from '@teamix/formily';
 import { CommonRequestConfig } from '@teamix/utils';
+import React from 'react';
 interface AnyObject {
     [propName: string]: any;
 }
@@ -64,6 +65,8 @@ export interface ProFormProps extends IFormLayoutProps {
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }
 export interface QueryFilterProps extends ProFormProps {
+    addonBefore?: ReactNode;
+    addonAfter?: ReactNode;
     onFilter?: (values: any) => void;
     onReset?: (payload?: any) => void;
 }

package/es/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.10";
+declare const version = "1.2.11";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/es/index.js

@@ -27,7 +27,7 @@ export * from './page-header';
 export * from './skeleton';
 export * from './table'; // export * from './sidebar';
 
-var version = '1.2.10';
+var version = '1.2.11';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
 hooks, nocode, templates, utils };

package/es/table/components/Filter/index.js

@@ -171,7 +171,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current5, _actionRef$current5$s, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r;
+      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current5, _actionRef$current5$s, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$c;
 
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.filterDataSource) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2, column.dataIndex); // 先获取此列的param
 
@@ -214,7 +214,9 @@ var Filter = function Filter(props) {
       }))); // 发送请求
 
       (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$r = _actionRef$current6.request) === null || _actionRef$current6$r === void 0 ? void 0 : _actionRef$current6$r.call(_actionRef$current6, _objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
-      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7);
+      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$r = _actionRef$current7.resetPage) === null || _actionRef$current7$r === void 0 ? void 0 : _actionRef$current7$r.call(_actionRef$current7); // 清空表格选择
+
+      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
       setVisible(false);
     }
   }, getMessage('ok')), /*#__PURE__*/React.createElement(Button, {
@@ -224,15 +226,15 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current$ge6, _actionRef$current8, _actionRef$current8$g, _actionRef$current8$g2, _actionRef$current9, _actionRef$current9$s, _actionRef$current10, _actionRef$current10$;
+      var _actionRef$current$ge6, _actionRef$current9, _actionRef$current9$g, _actionRef$current9$g2, _actionRef$current10, _actionRef$current10$, _actionRef$current11, _actionRef$current11$;
 
       setSelected([]);
-      var rules = (_actionRef$current$ge6 = (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$g = _actionRef$current8.getState) === null || _actionRef$current8$g === void 0 ? void 0 : (_actionRef$current8$g2 = _actionRef$current8$g.call(_actionRef$current8)) === null || _actionRef$current8$g2 === void 0 ? void 0 : _actionRef$current8$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
-      (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$s = _actionRef$current9.setFilterRules) === null || _actionRef$current9$s === void 0 ? void 0 : _actionRef$current9$s.call(_actionRef$current9, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
+      var rules = (_actionRef$current$ge6 = (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState) === null || _actionRef$current9$g === void 0 ? void 0 : (_actionRef$current9$g2 = _actionRef$current9$g.call(_actionRef$current9)) === null || _actionRef$current9$g2 === void 0 ? void 0 : _actionRef$current9$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
+      (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.setFilterRules) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: [],
         params: ''
       })));
-      (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.filterDataSource) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10, column.dataIndex); // setVisible(!visible);
+      (_actionRef$current11 = actionRef.current) === null || _actionRef$current11 === void 0 ? void 0 : (_actionRef$current11$ = _actionRef$current11.filterDataSource) === null || _actionRef$current11$ === void 0 ? void 0 : _actionRef$current11$.call(_actionRef$current11, column.dataIndex); // setVisible(!visible);
     }
   }, getMessage('reset'))))));
 };

package/es/table/components/Filter/index.scss

@@ -12,12 +12,16 @@
   }
   .teamix-pro-table-toolbar-filter-btn-box {
     display: flex;
-    justify-content: space-around;
+    justify-content: center;
     margin-top: 10px;
     padding-bottom: 5px;
+    padding-left: 4px;
+    padding-right: 4px;
   }
   .teamix-pro-table-toolbar-filter-btn.teamix-pro-table-toolbar-filter-btn {
-    width: 48px !important;
-    min-width: unset !important;
+    min-width: 48px !important;
+    &:first-child {
+      margin-right: 8px;
+    }
   }
 }

package/es/table/components/Layout/index.js

@@ -70,7 +70,16 @@ var Layout = function Layout(props) {
     var _mainAction$actions;
 
     if (_typeof(mainAction) === 'object' && (mainAction === null || mainAction === void 0 ? void 0 : (_mainAction$actions = mainAction.actions) === null || _mainAction$actions === void 0 ? void 0 : _mainAction$actions.length) > 0) {
-      // 默认 context
+      // 判断 actions 是否 visible 都为 false，是的话也不渲染
+      var isEmptyActions = mainAction === null || mainAction === void 0 ? void 0 : mainAction.actions.every(function (action) {
+        return (action === null || action === void 0 ? void 0 : action.visible) === false;
+      });
+
+      if (isEmptyActions) {
+        return;
+      } // 默认 context
+
+
       var defaultContext = {
         action: actionRef.current,
         rowSelection: rowSelection

package/es/table/index.js

@@ -33,7 +33,7 @@ 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; }
 
 import React, { useState, useEffect, useRef, useMemo } from 'react';
-import { Table, Pagination, Message, Checkbox } from '@alicloudfe/components';
+import { Table, Pagination, Checkbox } from '@alicloudfe/components';
 import genProColumnToColumn from './utils/genProColumnToColumn';
 import { baseClass, useRequest, request as utilResquest, getDeepValue, getMessage, pickProps } from '@teamix/utils';
 import { ProSkeletonRaw as Skeleton } from '../skeleton';
@@ -481,8 +481,7 @@ var ProTable = function ProTable(props) {
 
       if (props.onError) {
         props.onError(error);
-      } else {
-        Message.error(error.toString());
+      } else {// Message.error(error.toString());
       } // 重新计算是否需要吸底
 
 

package/lib/actions/index.scss

@@ -96,3 +96,17 @@
     margin-bottom: 0px;
   }
 }
+
+.next-dialog-body {
+  .teamix-pro-info {
+    .next-card-content-container {
+      margin-top: 10px;
+      padding-bottom: 10px;
+      .next-col.next-col-24:last-child {
+        .teamix-pro-field-info-form-item:last-child {
+          padding-bottom: 0px;
+        }
+      }
+    }
+  }
+}

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

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 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 }; }
 
@@ -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,71 @@
+@import '../global.scss';
+
+$query-filter: #{$teamix-pro-form}-query-filter;
+
+.#{$query-filter} {
+  .#{$query-filter}-inline {
+    display: flex;
+    justify-content: space-between;
+  }
+  .#{$query-filter}-left {
+    display: flex;
+  }
+  .#{$query-filter}-addonBefore {
+    flex: 0 1 auto;
+    margin-right: 8px;
+  }
+  .#{$query-filter}-simple {
+    flex: 0 0 auto;
+    margin-right: -8px;
+    margin-bottom: 8px;
+  }
+  .#{$query-filter}-toggle {
+    margin-bottom: 8px;
+  }
+  .#{$query-filter}-addonAfter {
+    flex: 0 1 auto;
+    margin-left: 8px;
+  }
+  .#{$query-filter}-tag-title {
+    margin-right: 12px;
+    color: var(--color-text1-8, #848484);
+  }
+  .#{$query-filter}-tag-content {
+    color: var(--color-text1-2, #5a5a5a);
+    font-weight: bold;
+  }
+  .#{$query-filter}-tag-hidden {
+    display: none;
+  }
+  .#{$query-filter}-advanced {
+    padding: 16px;
+    background-color: var(--color-fill1-2, #f7f7f7);
+  }
+  .#{$query-filter}-advanced-hidden {
+    display: none;
+  }
+}
+
+// 筛选
+.#{$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 './index.scss';
+/**
+ * 查询筛选
+ */
+declare const QueryFilter: React.FC<QueryFilterProps>;
+export { QueryFilter };