@teamias/rex-pro 0.0.14 → 0.0.16

package/dist/components/filter-form/v1/filter-form.d.ts

@@ -6,7 +6,7 @@ import { ReactNode, Ref } from 'react';
  * FilterForm 组件 - 支持多语言的筛选表单
  * @param T 表单数据类型
  */
-export declare const FilterForm: <T extends object>({ itemWidth, displayType, form: outForm, formRef: outFormRef, requestFields, requestFieldsUrl, requestFieldsParams, fieldPropsFn, requestOptions, initialValues: outInitialValues, fieldsConfig, actionRef, onInit: outInit, firstTriggerInitEvent, children, ...otherProps }: IFilterFormProps<T>) => import("react/jsx-runtime").JSX.Element;
+export declare const FilterForm: <T extends object>({ itemWidth, displayType, form: outForm, formRef: outFormRef, requestFields, requestFieldsUrl, requestFieldsParams, fieldPropsFn, requestOptions, initialValues: outInitialValues, fieldsConfig, actionRef, onInit: outInit, firstTriggerInitEvent, children, buttonExtend, ...otherProps }: IFilterFormProps<T>) => import("react/jsx-runtime").JSX.Element;
 export interface IFilterFormProps<T extends object = object> extends Omit<TRawProFormProps<T>, 'form' | 'layout' | 'initialValues' | 'children'>, Omit<IBaseFormProps, 'fields' | 'fieldProps'> {
     /** 配置数据, 优先级高于url的 */
     requestFields?: () => Promise<TFields>;
@@ -42,6 +42,8 @@ export interface IFilterFormProps<T extends object = object> extends Omit<TRawPr
         displayType: IFilterFormProps['displayType'];
         handlerSelectStyle: (fields: TFields) => TFields;
     }) => ReactNode;
+    /** 自定义按钮扩展 */
+    buttonExtend?: (form: TForm<T>) => ReactNode;
 }
 type TFieldItem = Exclude<IBaseFormProps['fields'], undefined>[number] & {
     /** 是否作为 可控显隐 的表单项 */

package/dist/components/filter-form/v1/filter-form.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 = ["itemWidth", "displayType", "form", "formRef", "requestFields", "requestFieldsUrl", "requestFieldsParams", "fieldPropsFn", "requestOptions", "initialValues", "fieldsConfig", "actionRef", "onInit", "firstTriggerInitEvent", "children"];
+var _excluded = ["itemWidth", "displayType", "form", "formRef", "requestFields", "requestFieldsUrl", "requestFieldsParams", "fieldPropsFn", "requestOptions", "initialValues", "fieldsConfig", "actionRef", "onInit", "firstTriggerInitEvent", "children", "buttonExtend"];
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -19,7 +19,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; }
 /* eslint-disable no-param-reassign */
 import { ProForm } from '@ant-design/pro-components';
-import { BaseForm, getFieldsDefaultValues, useRequestFields, useRequestFieldsConfig, useRexProConfigProvider, useStateData } from '@teamias/rex-design';
+import { BaseForm, getFieldsDefaultValues, resetFormTouched, useRequestFields, useRequestFieldsConfig, useRexProConfigProvider, useStateData } from '@teamias/rex-design';
 import { Button, Checkbox, Dropdown, Skeleton, Space } from 'antd';
 import { cloneDeep } from 'lodash';
 import { useEffect, useImperativeHandle, useRef } from 'react';
@@ -50,6 +50,7 @@ export var FilterForm = function FilterForm(_ref) {
     outInit = _ref.onInit,
     firstTriggerInitEvent = _ref.firstTriggerInitEvent,
     children = _ref.children,
+    buttonExtend = _ref.buttonExtend,
     otherProps = _objectWithoutProperties(_ref, _excluded);
   var _useRexProConfigProvi = useRexProConfigProvider(),
     formatMessage = _useRexProConfigProvi.intl.formatMessage;
@@ -319,6 +320,9 @@ export var FilterForm = function FilterForm(_ref) {
                 htmlType: "submit",
                 type: "primary",
                 loading: otherProps.loading || state.fetchLoading,
+                onClick: function onClick() {
+                  return resetFormTouched(form.getFieldsValue(true), form);
+                },
                 children: formatMessage({
                   id: 'pro.components.filter-form.search',
                   defaultMessage: '查询'
@@ -336,7 +340,7 @@ export var FilterForm = function FilterForm(_ref) {
                     defaultMessage: '自定义筛选条件'
                   })
                 })
-              })]
+              }), buttonExtend === null || buttonExtend === void 0 ? void 0 : buttonExtend(form)]
             });
           }
         },

package/dist/components/rex-pro-table/v1/demo/BasicRexProTable.js

@@ -433,6 +433,45 @@ export default (function () {
                     // formFieldUrl: '/filterFormProps',
                     // formFieldParams?: Record<string, unknown>;
                     formFieldConfig: [{
+                      valueType: 'select',
+                      field: 'org_id',
+                      label: '部门',
+                      options: [{
+                        label: '1',
+                        value: '1'
+                      }, {
+                        label: '2',
+                        value: '2'
+                      }, {
+                        label: '3',
+                        value: '3'
+                      }]
+                    }, {
+                      valueType: 'select',
+                      field: 'job_id',
+                      label: '岗位',
+                      options: [{
+                        label: '1',
+                        value: '1'
+                      }, {
+                        label: '2',
+                        value: '2'
+                      }, {
+                        label: '3',
+                        value: '3'
+                      }],
+                      dependenciesV2: [{
+                        field: 'org_id',
+                        action: 'show',
+                        op: 'notEmpty'
+                      }, {
+                        field: 'org_id',
+                        action: 'updateData'
+                      }, {
+                        field: 'org_id',
+                        action: 'clear'
+                      }]
+                    }, {
                       valueType: 'multipleComponents',
                       label: 'multipleComponents',
                       compact: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-pro",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -51,7 +51,7 @@
   "dependencies": {
     "@ant-design/icons": "^6.0.0",
     "@ant-design/pro-components": "^2.8.10",
-    "@teamias/rex-design": "^0.0.24",
+    "@teamias/rex-design": "^0.0.37",
     "ahooks": "^3.9.0",
     "antd": "^5.26.7",
     "classnames": "^2.5.1",