ztxkui 4.2.18-102 → 4.2.18-104

package/dist/UI/Form/index.js

@@ -313,6 +313,7 @@ function Home() {
         React.createElement(ProForm, { form: form, items: items, initialValues: initialValues, showDynamic: true, showDynamicKey: "my-coco", configInfo: configInfoMemo, 
             // outsideState={outsideState}
             rightWrapVisible: true, onSearchHandle: searchHandle, onResetHandle: resetHandle }),
+        React.createElement(ProForm, { form: form, items: items }),
         React.createElement(Button, { onClick: function () {
                 setState(state + 1);
                 console.log(form.getFieldsValue());

package/dist/UI/InputNumber/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const InputNumberDemo: React.FC;
+export default InputNumberDemo;

package/dist/UI/InputNumber/index.js

@@ -0,0 +1,45 @@
+import React, { useState } from 'react';
+import { InputNumber } from '../../index';
+var sectionStyle = {
+    marginBottom: 24,
+};
+var labelStyle = {
+    display: 'block',
+    marginBottom: 8,
+    fontSize: 14,
+    fontWeight: 600,
+    color: '#333',
+};
+var InputNumberDemo = function () {
+    var _a = useState(10), basicValue = _a[0], setBasicValue = _a[1];
+    var _b = useState(3.14), precisionValue = _b[0], setPrecisionValue = _b[1];
+    var _c = useState(), rangeValue = _c[0], setRangeValue = _c[1];
+    return (React.createElement("div", { style: { padding: '20px', maxWidth: 500 } },
+        React.createElement("h2", null, "\u6570\u5B57\u8F93\u5165\u6846"),
+        React.createElement("div", { style: sectionStyle },
+            React.createElement("label", { style: labelStyle }, "\u57FA\u7840\u7528\u6CD5"),
+            React.createElement(InputNumber, { formatterType: "currency", value: basicValue, onChange: function (v) { return setBasicValue(v); } }),
+            React.createElement("div", { style: { marginTop: 4, fontSize: 12, color: '#999' } },
+                "\u5F53\u524D\u503C\uFF1A",
+                basicValue)),
+        React.createElement("div", { style: sectionStyle },
+            React.createElement("label", { style: labelStyle }, "\u7CBE\u5EA6\uFF082\u4F4D\u5C0F\u6570\uFF09"),
+            React.createElement(InputNumber, { value: precisionValue, onChange: function (v) { return setPrecisionValue(v); }, precision: 2, step: 0.1 }),
+            React.createElement("div", { style: { marginTop: 4, fontSize: 12, color: '#999' } },
+                "\u5F53\u524D\u503C\uFF1A",
+                precisionValue)),
+        React.createElement("div", { style: sectionStyle },
+            React.createElement("label", { style: labelStyle }, "\u8303\u56F4\u9650\u5236\uFF081~100\uFF09"),
+            React.createElement(InputNumber, { value: rangeValue, onChange: function (v) { return setRangeValue(v); }, min: 1, max: 100, placeholder: "\u8BF7\u8F93\u5165 1-100 \u7684\u6570\u5B57" }),
+            React.createElement("div", { style: { marginTop: 4, fontSize: 12, color: '#999' } },
+                "\u5F53\u524D\u503C\uFF1A", rangeValue !== null && rangeValue !== void 0 ? rangeValue : '空')),
+        React.createElement("div", { style: sectionStyle },
+            React.createElement("label", { style: labelStyle }, "\u7981\u7528\u72B6\u6001"),
+            React.createElement(InputNumber, { value: 50, disabled: true })),
+        React.createElement("div", { style: sectionStyle },
+            React.createElement("label", { style: labelStyle }, "\u5E26\u524D\u540E\u7F00"),
+            React.createElement(InputNumber, { defaultValue: 100, formatter: function (value) {
+                    return ("\u00A5 " + value).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+                }, parser: function (value) { return value.replace(/¥\s?|(,*)/g, ''); } }))));
+};
+export default InputNumberDemo;

package/dist/UI/TreeSelect/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const TreeSelectDemo: React.FC;
+export default TreeSelectDemo;

package/dist/UI/TreeSelect/index.js

@@ -0,0 +1,120 @@
+import React, { useState } from 'react';
+import { TreeSelect, Button } from '../../index';
+var treeData = [
+    {
+        title: '总公司',
+        value: '0-0',
+        key: '0-0',
+        children: [
+            {
+                title: '研发部',
+                value: '0-0-1',
+                key: '0-0-1',
+                children: [
+                    { title: '前端组', value: '0-0-1-1', key: '0-0-1-1' },
+                    { title: '后端组', value: '0-0-1-2', key: '0-0-1-2' },
+                ],
+            },
+            {
+                title: '产品部',
+                value: '0-0-2',
+                key: '0-0-2',
+                children: [
+                    { title: '产品设计', value: '0-0-2-1', key: '0-0-2-1' },
+                    { title: 'UI设计', value: '0-0-2-2', key: '0-0-2-2' },
+                ],
+            },
+            {
+                title: '运营部',
+                value: '0-0-3',
+                key: '0-0-3',
+            },
+        ],
+    },
+    {
+        title: '分公司',
+        value: '0-1',
+        key: '0-1',
+        children: [
+            { title: '北京分公司', value: '0-1-1', key: '0-1-1' },
+            { title: '上海分公司', value: '0-1-2', key: '0-1-2' },
+        ],
+    },
+];
+// 自定义字段名的数据（label / id 而非 title / value）
+var customFieldData = [
+    {
+        label: '类别A',
+        id: 'a',
+        key: 'a',
+        children: [
+            { label: '选项A1', id: 'a1', key: 'a1' },
+            { label: '选项A2', id: 'a2', key: 'a2' },
+        ],
+    },
+    {
+        label: '类别B',
+        id: 'b',
+        key: 'b',
+        children: [{ label: '选项B1', id: 'b1', key: 'b1' }],
+    },
+];
+var sectionStyle = {
+    marginBottom: 24,
+};
+var labelStyle = {
+    display: 'block',
+    marginBottom: 8,
+    fontSize: 14,
+    fontWeight: 600,
+    color: '#333',
+};
+var formatValue = function (val) {
+    if (val === undefined || val === null)
+        return '无';
+    if (Array.isArray(val))
+        return val.filter(function (v) { return v !== ''; }).join(', ') || '无';
+    return String(val);
+};
+var TreeSelectDemo = function () {
+    var _a = useState(), singleValue = _a[0], setSingleValue = _a[1];
+    var _b = useState(), multiValue = _b[0], setMultiValue = _b[1];
+    var _c = useState(), showAllValue = _c[0], setShowAllValue = _c[1];
+    var _d = useState(), customValue = _d[0], setCustomValue = _d[1];
+    return (React.createElement("div", { style: { padding: '20px', maxWidth: 500 } },
+        React.createElement("h2", null, "\u6811\u4E0B\u62C9\u6846\u9009\u62E9"),
+        React.createElement("div", { style: sectionStyle },
+            React.createElement("label", { style: labelStyle }, "1. \u57FA\u7840\u5355\u9009"),
+            React.createElement(TreeSelect, { style: { width: '100%' }, placeholder: "\u8BF7\u9009\u62E9", treeData: treeData, value: singleValue, onChange: setSingleValue, treeDefaultExpandAll: true, allowClear: true }),
+            React.createElement("div", { style: { marginTop: 4, fontSize: 12, color: '#999' } },
+                "\u9009\u4E2D\u503C\uFF1A",
+                formatValue(singleValue))),
+        React.createElement("div", { style: sectionStyle },
+            React.createElement("label", { style: labelStyle }, "2. \u591A\u9009\uFF08showAll \u9ED8\u8BA4\u5F00\u542F\uFF0C\u5168\u90E8\u4E0E\u5176\u4ED6\u4E92\u65A5\uFF09"),
+            React.createElement(TreeSelect, { style: { width: '100%' }, placeholder: "\u8BF7\u9009\u62E9", treeData: treeData, value: multiValue, onChange: setMultiValue, treeCheckable: true, showCheckedStrategy: TreeSelect.SHOW_CHILD, treeDefaultExpandAll: true, allowClear: true }),
+            React.createElement("div", { style: { marginTop: 4, fontSize: 12, color: '#999' } },
+                "\u9009\u4E2D\u503C\uFF1A",
+                formatValue(multiValue)),
+            React.createElement(Button, { type: "default", size: "small", style: { marginTop: 8 }, onClick: function () { return setMultiValue(['']); } }, "\u8BBE\u7F6E\u4E3A\u300C\u5168\u90E8\u300D")),
+        React.createElement("div", { style: sectionStyle },
+            React.createElement("label", { style: labelStyle }, "3. \u591A\u9009\uFF08showAll=false\uFF0C\u4E0D\u663E\u793A\u5168\u90E8\uFF09"),
+            React.createElement(TreeSelect, { style: { width: '100%' }, placeholder: "\u8BF7\u9009\u62E9", treeData: treeData, value: showAllValue, onChange: setShowAllValue, treeCheckable: true, showCheckedStrategy: TreeSelect.SHOW_CHILD, treeDefaultExpandAll: true, allowClear: true, showAll: false }),
+            React.createElement("div", { style: { marginTop: 4, fontSize: 12, color: '#999' } },
+                "\u9009\u4E2D\u503C\uFF1A",
+                formatValue(showAllValue))),
+        React.createElement("div", { style: sectionStyle },
+            React.createElement("label", { style: labelStyle }, "4. \u591A\u9009 + \u81EA\u5B9A\u4E49\u5B57\u6BB5\u540D\uFF08label/id\uFF09+ showAll \u5168\u90E8\u4E92\u65A5"),
+            React.createElement(TreeSelect, { style: { width: '100%' }, placeholder: "\u8BF7\u9009\u62E9", treeData: customFieldData, fieldNames: { label: 'label', value: 'id', children: 'children' }, value: customValue, onChange: setCustomValue, treeCheckable: true, showCheckedStrategy: TreeSelect.SHOW_CHILD, treeDefaultExpandAll: true, allowClear: true }),
+            React.createElement("div", { style: { marginTop: 4, fontSize: 12, color: '#999' } },
+                "\u9009\u4E2D\u503C\uFF1A",
+                formatValue(customValue)),
+            React.createElement("div", { style: { marginTop: 2, fontSize: 12, color: '#999' } }, "\u6570\u636E\u4F7F\u7528 label/id \u5B57\u6BB5\uFF0C\u901A\u8FC7 fieldNames \u6620\u5C04")),
+        React.createElement("div", { style: sectionStyle },
+            React.createElement("label", { style: labelStyle }, "5. \u652F\u6301\u641C\u7D22\uFF08\u5355\u9009\uFF09"),
+            React.createElement(TreeSelect, { style: { width: '100%' }, placeholder: "\u8F93\u5165\u5173\u952E\u5B57\u641C\u7D22", treeData: treeData, showSearch: true, treeDefaultExpandAll: true, allowClear: true })),
+        React.createElement("div", { style: sectionStyle },
+            React.createElement("label", { style: labelStyle }, "6. \u5355\u9009 + showAll\uFF08\u591A\u9009\u6A21\u5F0F\u4E0B\u9ED8\u8BA4\u5F00\u542F\uFF09"),
+            React.createElement(TreeSelect, { style: { width: '100%' }, placeholder: "\u8BF7\u9009\u62E9", treeData: treeData, showAll: true, treeDefaultExpandAll: true, allowClear: true }),
+            React.createElement("div", { style: { marginTop: 4, fontSize: 12, color: '#999' } }, "\u9009\u4E2D\u300C\u5168\u90E8\u300D\u65F6\u503C\u4E3A\u7A7A\u5B57\u7B26\u4E32"))));
+};
+export default TreeSelectDemo;

package/dist/UI/index.js

@@ -1,10 +1,18 @@
 import React from 'react';
 import { Link, Switch, Route } from 'react-router-dom';
 import Form from './Form';
+import TreeSelectDemo from './TreeSelect';
+import InputNumberDemo from './InputNumber';
 export default function UIComponent() {
     return (React.createElement("div", { style: { padding: '10px' } },
         React.createElement(Link, { to: "/ui/form", style: { marginRight: '10px' } }, "\u8868\u5355"),
+        React.createElement(Link, { to: "/ui/tree-select", style: { marginRight: '10px' } }, "\u6811\u4E0B\u62C9\u6846"),
+        React.createElement(Link, { to: "/ui/input-number", style: { marginRight: '10px' } }, "\u6570\u5B57\u8F93\u5165\u6846"),
         React.createElement(Switch, null,
             React.createElement(Route, { path: "/ui/form" },
-                React.createElement(Form, null)))));
+                React.createElement(Form, null)),
+            React.createElement(Route, { path: "/ui/tree-select" },
+                React.createElement(TreeSelectDemo, null)),
+            React.createElement(Route, { path: "/ui/input-number" },
+                React.createElement(InputNumberDemo, null)))));
 }

package/dist/components/Button/button.d.ts

@@ -8,6 +8,12 @@ export interface IProps extends ButtonProps {
     showCopy?: boolean | string;
     /** copy容器样式 */
     copyContainerStyle?: any;
+    /** 紧凑布局 */
+    compact?: boolean;
+    /** 是否按UI周查样式调整，可覆盖全局配置 */
+    isUIWeeklyReview?: boolean;
+    /** 按钮旁显示Tooltip提示图标 */
+    toolTip?: React.ReactNode;
 }
 declare const Button: React.FC<IProps>;
 export default Button;

package/dist/components/Button/button.js

@@ -24,17 +24,23 @@ import i18next from 'ztxkutils/dist/i18next';
 import React, { useRef } from 'react';
 import { Button as AntButton } from 'antd';
 import classNames from 'classnames';
+import useBaseContext from '../utils/useBaseContext';
+import { getFinalValue } from '../utils';
 var maxClickTime = 1000;
 var Button = function (props) {
     var _a;
-    var children = props.children, type = props.type, size = props.size, disabled = props.disabled, danger = props.danger, className = props.className, onClick = props.onClick, _b = props.agentClick, agentClick = _b === void 0 ? true : _b, showCopy = props.showCopy, copyContainerStyle = props.copyContainerStyle, restProps = __rest(props, ["children", "type", "size", "disabled", "danger", "className", "onClick", "agentClick", "showCopy", "copyContainerStyle"]);
+    var children = props.children, type = props.type, size = props.size, disabled = props.disabled, danger = props.danger, className = props.className, onClick = props.onClick, _b = props.agentClick, agentClick = _b === void 0 ? true : _b, showCopy = props.showCopy, copyContainerStyle = props.copyContainerStyle, compact = props.compact, componentUIWeeklyReview = props.isUIWeeklyReview, toolTip = props.toolTip, restProps = __rest(props, ["children", "type", "size", "disabled", "danger", "className", "onClick", "agentClick", "showCopy", "copyContainerStyle", "compact", "isUIWeeklyReview", "toolTip"]);
+    var contextUIWeeklyReview = useBaseContext().isUIWeeklyReview;
+    var isUIWeeklyReviewBool = getFinalValue(contextUIWeeklyReview, componentUIWeeklyReview);
+    var finalType = isUIWeeklyReviewBool ? type || 'default' : type;
     var startTimeRef = useRef(0);
     var btnRef = useRef();
     var classes = classNames('zt-btn', className, (_a = {},
-        _a["zt-btn-" + type] = type,
+        _a["zt-btn-" + finalType] = finalType,
         _a["zt-btn-disabled"] = disabled,
         _a["zt-btn-" + size] = size,
         _a["zt-btn-dangerous"] = danger,
+        _a["zt-button--compact"] = compact,
         _a));
     var myOnClick = function (event) {
         if (agentClick) {

package/dist/components/EnhanceTreeSelect/index.d.ts

@@ -42,12 +42,16 @@ export interface IProps<T> extends Omit<TreeSelectProps<T>, 'onChange'> {
      * 数据发生改变时触发
      */
     onChange?: any;
+    /**
+     * 是否显示全部，全部的value为空字符串
+     */
+    showAll?: boolean;
 }
 /**
  * 增强下拉树
  * 添加远程搜索
  */
-declare function EnhanceTreeSelect<VT extends SelectValue = SelectValue>({ treeData: outTreeData, defaultTreeData, params, url, method, request, asyncLoadChildren, asyncLoadChildrenKey, transformData, treeDataSimpleMode, onCompleted, ...restProps }: IProps<VT>): JSX.Element;
+declare function EnhanceTreeSelect<VT extends SelectValue = SelectValue>({ treeData: outTreeData, defaultTreeData, params, url, method, request, asyncLoadChildren, asyncLoadChildrenKey, transformData, treeDataSimpleMode, onCompleted, showAll, onChange, fieldNames, ...restProps }: IProps<VT>): JSX.Element;
 declare namespace EnhanceTreeSelect {
     var SHOW_PARENT: "SHOW_PARENT";
 }

package/dist/components/EnhanceTreeSelect/index.js

@@ -20,6 +20,11 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
 import i18next from 'ztxkutils/dist/i18next';
 import React, { useEffect, useCallback, useRef, useState } from 'react';
 import { TreeSelect } from 'antd';
@@ -47,7 +52,7 @@ function getData(request, options) {
  * 添加远程搜索
  */
 function EnhanceTreeSelect(_a) {
-    var outTreeData = _a.treeData, defaultTreeData = _a.defaultTreeData, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, request = _a.request, asyncLoadChildren = _a.asyncLoadChildren, _c = _a.asyncLoadChildrenKey, asyncLoadChildrenKey = _c === void 0 ? 'parentId' : _c, transformData = _a.transformData, treeDataSimpleMode = _a.treeDataSimpleMode, onCompleted = _a.onCompleted, restProps = __rest(_a, ["treeData", "defaultTreeData", "params", "url", "method", "request", "asyncLoadChildren", "asyncLoadChildrenKey", "transformData", "treeDataSimpleMode", "onCompleted"]);
+    var outTreeData = _a.treeData, defaultTreeData = _a.defaultTreeData, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, request = _a.request, asyncLoadChildren = _a.asyncLoadChildren, _c = _a.asyncLoadChildrenKey, asyncLoadChildrenKey = _c === void 0 ? 'parentId' : _c, transformData = _a.transformData, treeDataSimpleMode = _a.treeDataSimpleMode, onCompleted = _a.onCompleted, showAll = _a.showAll, onChange = _a.onChange, fieldNames = _a.fieldNames, restProps = __rest(_a, ["treeData", "defaultTreeData", "params", "url", "method", "request", "asyncLoadChildren", "asyncLoadChildrenKey", "transformData", "treeDataSimpleMode", "onCompleted", "showAll", "onChange", "fieldNames"]);
     /**
      * treeData 为当前组件使用的数据源
      * 这样做的目的，是因为如果做远程搜索和搜索方法组件内部处理时
@@ -134,9 +139,48 @@ function EnhanceTreeSelect(_a) {
     var onSearch = function (value) {
         setSearchValue(value);
     };
-    return (React.createElement(TreeSelect, __assign({ allowClear: true, showSearch: true, filterTreeNode: true, treeNodeFilterProp: "title", treeData: Array.isArray(defaultTreeData)
+    // 多选模式下，showAll 未显式传值时默认为 true
+    var isShowAll = showAll !== undefined ? showAll : !!restProps.treeCheckable;
+    // 根据 fieldNames 配置确定「全部」节点的字段名
+    var labelKey = (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || 'title';
+    var valueKey = (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value';
+    // 多选模式下，「全部」与其他选项互斥（用 ref 追踪前值）
+    var prevValueRef = useRef(restProps.value);
+    useEffect(function () {
+        prevValueRef.current = restProps.value;
+    }, [restProps.value]);
+    var handleChange = function (value, labelList, extra) {
+        if (isShowAll && restProps.treeCheckable && Array.isArray(value)) {
+            var prev = Array.isArray(prevValueRef.current)
+                ? prevValueRef.current
+                : [];
+            var prevHasAll = prev.includes('');
+            var nowHasAll = value.includes('');
+            var nowHasOther = value.some(function (v) { return v !== ''; });
+            if (nowHasAll && !prevHasAll) {
+                value = [''];
+            }
+            else if (prevHasAll && nowHasOther) {
+                value = value.filter(function (v) { return v !== ''; });
+            }
+        }
+        prevValueRef.current = value;
+        onChange === null || onChange === void 0 ? void 0 : onChange(value, labelList, extra);
+    };
+    // 合并最终树数据，isShowAll 时在顶部插入「全部」节点
+    var finalTreeData = (function () {
+        var _a;
+        var data = Array.isArray(defaultTreeData)
             ? defaultTreeData.concat(treeData)
-            : treeData, searchValue: searchValue, onSearch: onSearch, treeDataSimpleMode: asyncLoadChildren, loadData: asyncLoadChildren ? onLoadDataHandle : undefined }, restProps)));
+            : treeData;
+        if (isShowAll) {
+            data = __spreadArray([
+                (_a = {}, _a[labelKey] = i18next.t('全部'), _a[valueKey] = '', _a.key = '__all__', _a)
+            ], data);
+        }
+        return data;
+    })();
+    return (React.createElement(TreeSelect, __assign({ allowClear: true, showSearch: true, filterTreeNode: true, treeNodeFilterProp: "title", treeData: finalTreeData, searchValue: searchValue, onSearch: onSearch, treeDataSimpleMode: asyncLoadChildren, loadData: asyncLoadChildren ? onLoadDataHandle : undefined, onChange: handleChange, fieldNames: fieldNames }, restProps)));
 }
 EnhanceTreeSelect.SHOW_PARENT = TreeSelect.SHOW_PARENT;
 export default EnhanceTreeSelect;

package/dist/components/Form/form.d.ts

@@ -1,7 +1,17 @@
 import React from 'react';
-import { FormProps } from 'antd/lib/form';
+import { FormProps, FormInstance as AntFormInstance } from 'antd/lib/form';
 export interface IProps extends FormProps {
 }
+interface FormInstance extends AntFormInstance {
+    setDynamicList?: (list: any[]) => void;
+    /** 这里存储一些自定义校验 规则的数据 */
+    myMatchRule?: any;
+    /** 是否开启校验下拉框选项值不存在的情况 */
+    enableDropdownValueValidation?: boolean;
+}
+export declare const FormContext: React.Context<{
+    form?: FormInstance;
+}>;
 declare function Form(props: IProps): JSX.Element;
 declare namespace Form {
     var Item: typeof import("antd/lib/form/FormItem").default;

package/dist/components/Form/form.js

@@ -20,12 +20,14 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React from 'react';
+import React, { createContext } from 'react';
 import { Form as AntForm } from 'antd';
 import { FormProvider } from 'antd/lib/form/context';
+export var FormContext = createContext({});
 function Form(props) {
-    var children = props.children, resetProps = __rest(props, ["children"]);
-    return React.createElement(AntForm, __assign({}, resetProps), children);
+    var children = props.children, form = props.form, resetProps = __rest(props, ["children", "form"]);
+    return (React.createElement(FormContext.Provider, { value: { form: form } },
+        React.createElement(AntForm, __assign({ form: form }, resetProps), children)));
 }
 Form.Item = AntForm.Item;
 Form.List = AntForm.List;

package/dist/components/ProForm/index.d.ts

@@ -1,5 +1,8 @@
 import React from 'react';
 import { IProFormProps } from './interface';
+export declare const FormContext: React.Context<{
+    onSearch?: () => void;
+}>;
 declare function ProForm(props: IProFormProps): JSX.Element;
 export declare const useForm: typeof import("antd/lib/form/Form").useForm;
 declare const _default: React.MemoExoticComponent<typeof ProForm>;

package/dist/components/ProForm/index.js

@@ -20,23 +20,40 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React, { memo, useCallback, useMemo } from 'react';
+import i18next from 'ztxkutils/dist/i18next';
+import React, { memo, useCallback, useMemo, createContext, useRef, useImperativeHandle, } from 'react';
 import { Form } from 'antd';
-import { Button } from '../../index';
+import { Button, ZtIcon } from '../../index';
 import { useDynamic } from './hooks';
 import Items from './items';
 import Setting from './setting';
 import classNames from 'classnames';
+import useToggle from '../business/SearchContainer/hooks/useToggle';
+import useBaseContext from '../utils/useBaseContext';
+import { getFinalValue } from '../utils';
+import { useCommonSearch, useCommonSearchModal } from './useCommonSearch';
+import RecordCommonList from './record-common-list';
+export var FormContext = createContext({});
 function ProForm(props) {
-    var items = props.items, noBottom = props.noBottom, wrapClassName = props.wrapClassName, leftClassName = props.leftClassName, itemClassName = props.itemClassName, _a = props.isFlex, isFlex = _a === void 0 ? true : _a, rightWrapVisible = props.rightWrapVisible, rightClassName = props.rightClassName, onResetHandle = props.onResetHandle, onSearchHandle = props.onSearchHandle, showDynamic = props.showDynamic, showDynamicKey = props.showDynamicKey, form = props.form, onValuesChange = props.onValuesChange, configInfo = props.configInfo, outsideState = props.outsideState, restProps = __rest(props, ["items", "noBottom", "wrapClassName", "leftClassName", "itemClassName", "isFlex", "rightWrapVisible", "rightClassName", "onResetHandle", "onSearchHandle", "showDynamic", "showDynamicKey", "form", "onValuesChange", "configInfo", "outsideState"]);
-    var _b = useDynamic(showDynamic, showDynamicKey, items), initDynamicList = _b.initDynamicList, currentDynamicList = _b.currentDynamicList, setCurrentDynamicList = _b.setCurrentDynamicList, currentItems = _b.currentItems;
+    var items = props.items, noBottom = props.noBottom, wrapClassName = props.wrapClassName, leftClassName = props.leftClassName, itemClassName = props.itemClassName, _a = props.isFlex, isFlex = _a === void 0 ? true : _a, isToggle = props.isToggle, _b = props.toggleNum, toggleNum = _b === void 0 ? 2 : _b, defaultToggle = props.defaultToggle, rightWrapVisible = props.rightWrapVisible, rightClassName = props.rightClassName, onResetHandle = props.onResetHandle, onSearchHandle = props.onSearchHandle, showDynamic = props.showDynamic, showDynamicKey = props.showDynamicKey, disabledHideItem = props.disabledHideItem, form = props.form, onValuesChange = props.onValuesChange, configInfo = props.configInfo, outsideState = props.outsideState, handleRef = props.handleRef, recordCommonSearch = props.recordCommonSearch, hideDynamic = props.hideDynamic, addRightMarginBottom = props.addRightMarginBottom, restProps = __rest(props, ["items", "noBottom", "wrapClassName", "leftClassName", "itemClassName", "isFlex", "isToggle", "toggleNum", "defaultToggle", "rightWrapVisible", "rightClassName", "onResetHandle", "onSearchHandle", "showDynamic", "showDynamicKey", "disabledHideItem", "form", "onValuesChange", "configInfo", "outsideState", "handleRef", "recordCommonSearch", "hideDynamic", "addRightMarginBottom"]);
+    var _c = useDynamic(showDynamic, showDynamicKey, items), initDynamicList = _c.initDynamicList, currentDynamicList = _c.currentDynamicList, setCurrentDynamicList = _c.setCurrentDynamicList, currentItems = _c.currentItems;
+    var settingRef = useRef(null);
+    var _d = useBaseContext(), isRecordCommonSearch = _d.isRecordCommonSearch, isUIWeeklyReview = _d.isUIWeeklyReview;
     var wrapClasses = classNames('pro-form', wrapClassName, {
         'pro-form--no-bottom': noBottom,
+        'pro-form--weekly-review': isUIWeeklyReview,
     });
     var leftClasses = classNames('pro-form__left', leftClassName, {
         'pro-form__left--flex': isFlex,
+        'pro-form__left--istoggle': isToggle,
     });
     var rightClasses = classNames('pro-form__right', rightClassName);
+    /** 表单容器Ref */
+    var containerRef = useRef(null);
+    var _e = useToggle(containerRef, currentDynamicList, isToggle, toggleNum, defaultToggle), toggle = _e.toggle, onToggleChange = _e.onToggleChange, setToggleHandle = _e.setToggleHandle;
+    useImperativeHandle(handleRef, function () { return ({
+        setToggleHandle: setToggleHandle,
+    }); });
     // 获取依赖项关联
     var itemsShouldUpdate = useMemo(function () {
         var result = {};
@@ -89,13 +106,63 @@ function ProForm(props) {
             form.setFieldsValue(fieldsValue_1);
         }
     };
-    return (React.createElement(Form, __assign({ form: form, onValuesChange: onValuesChangeHandle }, restProps, { className: wrapClasses }),
-        React.createElement("div", { className: leftClasses },
-            React.createElement(Items, { items: currentItems, itemClassName: itemClassName, form: form, configInfo: configInfo, outsideState: outsideState })),
-        showDynamic && (React.createElement(Setting, { list: currentDynamicList, initList: initDynamicList, showDynamicKey: showDynamicKey, setCurrentDynamicList: setCurrentDynamicList })),
-        rightWrapVisible ? (React.createElement("div", { className: rightClasses },
-            onResetHandle ? (React.createElement(Button, { type: "primary", onClick: onResetHandle }, "\u91CD\u7F6E")) : null,
-            onSearchHandle ? (React.createElement(Button, { type: "primary", onClick: onSearchHandle }, "\u67E5\u8BE2")) : null)) : null));
+    // 是否开启常用搜索
+    // 如果全局开启了默认添加，那么只要没有单独配置关闭，都认为需要打开
+    var isCommonSearchEnabled = rightWrapVisible && getFinalValue(isRecordCommonSearch, recordCommonSearch);
+    // 常用搜索hooks
+    var _f = useCommonSearch({
+        commonSearchKey: showDynamicKey || window.location.pathname,
+        isCommonSearchEnabled: isCommonSearchEnabled,
+    }), commonSearchList = _f.commonSearchList, setCommonSearchList = _f.setCommonSearchList, currentCommonSearchKey = _f.currentCommonSearchKey, setCurrentCommonSearchKey = _f.setCurrentCommonSearchKey, setData = _f.setData, deleteData = _f.deleteData, setReplaceData = _f.setReplaceData, reTransformData = _f.reTransformData, updateServerData = _f.updateServerData;
+    var onCommonSearchHandle = useCommonSearchModal({
+        commonSearchList: commonSearchList,
+        currentCommonSearchKey: currentCommonSearchKey,
+        form: form,
+        setData: setData,
+        isCommonSearchEnabled: isCommonSearchEnabled,
+        setCurrentCommonSearchKey: setCurrentCommonSearchKey,
+        currentDynamicList: currentDynamicList,
+        setCurrentDynamicList: setCurrentDynamicList,
+    }).onCommonSearchHandle;
+    // 查询按钮
+    var onSearchHandleInner = useCallback(function () {
+        // 当前表单数据
+        var currentFormParams = form === null || form === void 0 ? void 0 : form.getFieldsValue(true);
+        onSearchHandle && onSearchHandle(currentFormParams);
+    }, [form, onSearchHandle]);
+    // 重置按钮
+    var selfOnResetHandle = function () {
+        setCurrentCommonSearchKey === null || setCurrentCommonSearchKey === void 0 ? void 0 : setCurrentCommonSearchKey('');
+        onResetHandle === null || onResetHandle === void 0 ? void 0 : onResetHandle();
+    };
+    return (React.createElement(FormContext.Provider, { value: { onSearch: onSearchHandleInner } },
+        React.createElement(Form, __assign({ form: form, onValuesChange: onValuesChangeHandle }, restProps, { className: wrapClasses }),
+            React.createElement("div", { className: leftClasses, ref: containerRef },
+                React.createElement(Items, { items: currentItems, itemClassName: itemClassName, form: form, configInfo: configInfo, outsideState: outsideState })),
+            React.createElement("div", { className: "pro-form__middle", style: { display: !isToggle && !showDynamic ? 'none' : 'block' } },
+                showDynamic && !hideDynamic && (React.createElement(Setting, { list: currentDynamicList, initList: initDynamicList, showDynamicKey: showDynamicKey, setCurrentDynamicList: setCurrentDynamicList, disabledHideItem: disabledHideItem, handleRef: settingRef })),
+                isToggle ? (React.createElement("div", { className: "pro-form__middle--toggle", onClick: function () { return onToggleChange(); }, style: {
+                        // top: showDynamic ? '30px' : '7px',
+                        top: '5px',
+                    } },
+                    React.createElement(ZtIcon, { type: "icon-a-lujingbiankuang", style: {
+                            fontSize: 16,
+                            color: '#768696',
+                            transition: 'transform 0.3s ease-in-out',
+                            transform: "rotate(" + (toggle ? '180deg' : 0) + ")",
+                        } }))) : null),
+            rightWrapVisible ? (React.createElement("div", { className: rightClasses, style: { marginBottom: addRightMarginBottom ? '10px' : 0 } },
+                React.createElement("div", { className: classNames('pro-form__right-buttons'), style: {
+                        marginRight: showDynamic && !hideDynamic ? '0px' : '5px',
+                    } },
+                    onResetHandle ? (React.createElement(Button, { type: "default", onClick: onResetHandle, style: { marginTop: 0 } }, "\u91CD\u7F6E")) : null,
+                    showDynamic && !hideDynamic && (React.createElement(Button, { onClick: function () { var _a, _b; return (_b = (_a = settingRef === null || settingRef === void 0 ? void 0 : settingRef.current) === null || _a === void 0 ? void 0 : _a.open) === null || _b === void 0 ? void 0 : _b.call(_a); }, type: "default", compact: true }, i18next.t('自定义')))),
+                React.createElement("div", { className: classNames('pro-form__right-buttons') },
+                    onSearchHandle ? (React.createElement(Button, { type: "primary", onClick: onSearchHandle }, i18next.t('查询'))) : null,
+                    isCommonSearchEnabled ? (React.createElement(Button, { style: {
+                            width: '100%',
+                        }, onClick: onCommonSearchHandle, type: "default", compact: true }, i18next.t('常用搜索'))) : null))) : null),
+        isCommonSearchEnabled ? (React.createElement(RecordCommonList, { recordCommonList: commonSearchList, setRecordCommonList: setCommonSearchList, currentRecordCommonSearchKey: currentCommonSearchKey, setCurrentRecordCommonSearchKey: setCurrentCommonSearchKey, form: form, reTransformData: reTransformData, deleteData: deleteData, setReplaceData: setReplaceData, updateServerData: updateServerData, onSearchHandle: onSearchHandleInner, setCurrentDynamicList: setCurrentDynamicList, showDynamicKey: showDynamicKey })) : null));
 }
 export var useForm = Form.useForm;
 export default memo(ProForm);

package/dist/components/ProForm/interface.d.ts

@@ -80,6 +80,10 @@ export interface IFormItem extends FormItemProps {
      * 即 你的items 可能因为某个state的改变而重新生成时，可选择开启
      */
     shouldUpdateBeOutsideState?: (prevOutsideState: any, nextOutsideState: any) => boolean;
+    /**
+     * 是否隐藏表单项内的圆角
+     */
+    hideItemBorderRadius?: boolean;
 }
 export interface IProFormProps extends FormProps {
     items: IFormItem[];
@@ -99,6 +103,10 @@ export interface IProFormProps extends FormProps {
      * 是否开启做容器flex布局
      */
     isFlex?: boolean;
+    isToggle?: boolean;
+    /** 收起时 展示几行 */
+    toggleNum?: number;
+    defaultToggle?: boolean;
     /**
      * 子项类名
      */
@@ -107,6 +115,10 @@ export interface IProFormProps extends FormProps {
      * 是否显示右侧容器
      */
     rightWrapVisible?: boolean;
+    /**
+     * 右侧容器是否添加下边距
+     */
+    addRightMarginBottom?: boolean;
     /**
      * 右容器
      */
@@ -124,6 +136,14 @@ export interface IProFormProps extends FormProps {
      */
     showDynamic?: boolean;
     showDynamicKey?: string;
+    /**
+     * 是否不显示自定义配置按钮
+     */
+    hideDynamic?: boolean;
+    /**
+     * 是否禁止隐藏项
+     */
+    disabledHideItem?: boolean;
     /**
      * 表单配置信息，配置优先
      */
@@ -134,6 +154,13 @@ export interface IProFormProps extends FormProps {
      * 表单内部需要的外部参数
      */
     outsideState?: any;
+    handleRef?: React.MutableRefObject<{
+        setToggleHandle: (toggle: boolean) => void;
+    } | null>;
+    /**
+     * 是否记录常用搜索
+     */
+    recordCommonSearch?: boolean;
 }
 export interface IFormItemProps {
     items: IFormItem[];
@@ -166,4 +193,8 @@ export interface ISettingProps {
     list: ISearchLayout[];
     initList: ISearchLayout[];
     setCurrentDynamicList: any;
+    disabledHideItem?: boolean;
+    handleRef?: any;
+    hideTemplateSetting?: boolean;
+    title?: string;
 }

package/dist/components/ProForm/item.js

@@ -28,7 +28,7 @@ function runHandle(form, handle) {
 }
 function Item(item) {
     var _a, _b, _c;
-    var render = item.render, isRequired = item.isRequired, isDisplay = item.isDisplay, isChangeable = item.isChangeable, dependencies = item.dependencies, shouldUpdate = item.shouldUpdate, preText = item.preText, nextText = item.nextText, disabled = item.disabled, noBorder = item.noBorder, noLabel = item.noLabel, showBoxBorder = item.showBoxBorder, width = item.width, shouldUpdateNames = item.shouldUpdateNames, shouldUpdateClear = item.shouldUpdateClear, configName = item.configName, index = item.index, itemClassName = item.itemClassName, form = item.form, _isDisplayConfigInfo = item._isDisplayConfigInfo, _isRequireConfigInfo = item._isRequireConfigInfo, _isChangeableConfigInfo = item._isChangeableConfigInfo, outsideState = item.outsideState, shouldUpdateBeOutsideState = item.shouldUpdateBeOutsideState, resetItem = __rest(item, ["render", "isRequired", "isDisplay", "isChangeable", "dependencies", "shouldUpdate", "preText", "nextText", "disabled", "noBorder", "noLabel", "showBoxBorder", "width", "shouldUpdateNames", "shouldUpdateClear", "configName", "index", "itemClassName", "form", "_isDisplayConfigInfo", "_isRequireConfigInfo", "_isChangeableConfigInfo", "outsideState", "shouldUpdateBeOutsideState"]);
+    var render = item.render, isRequired = item.isRequired, isDisplay = item.isDisplay, isChangeable = item.isChangeable, dependencies = item.dependencies, shouldUpdate = item.shouldUpdate, preText = item.preText, nextText = item.nextText, disabled = item.disabled, noBorder = item.noBorder, noLabel = item.noLabel, showBoxBorder = item.showBoxBorder, width = item.width, shouldUpdateNames = item.shouldUpdateNames, shouldUpdateClear = item.shouldUpdateClear, configName = item.configName, index = item.index, itemClassName = item.itemClassName, form = item.form, _isDisplayConfigInfo = item._isDisplayConfigInfo, _isRequireConfigInfo = item._isRequireConfigInfo, _isChangeableConfigInfo = item._isChangeableConfigInfo, outsideState = item.outsideState, shouldUpdateBeOutsideState = item.shouldUpdateBeOutsideState, hideItemBorderRadius = item.hideItemBorderRadius, resetItem = __rest(item, ["render", "isRequired", "isDisplay", "isChangeable", "dependencies", "shouldUpdate", "preText", "nextText", "disabled", "noBorder", "noLabel", "showBoxBorder", "width", "shouldUpdateNames", "shouldUpdateClear", "configName", "index", "itemClassName", "form", "_isDisplayConfigInfo", "_isRequireConfigInfo", "_isChangeableConfigInfo", "outsideState", "shouldUpdateBeOutsideState", "hideItemBorderRadius"]);
     // 更新是否必填配置
     var updateIsRequired = function (isRequired) {
         var _a;
@@ -115,6 +115,7 @@ function Item(item) {
         'pro-form__item--noborder': noBorder,
         'pro-form__item--nolabel': noLabel,
         'pro-form__item--showboxborder': showBoxBorder,
+        'pro-form__item--hideitemborderradius': hideItemBorderRadius,
         'pro-form__item--required': (resetItem === null || resetItem === void 0 ? void 0 : resetItem.rules) &&
             ((_c = (_b = resetItem.rules) === null || _b === void 0 ? void 0 : _b.find) === null || _c === void 0 ? void 0 : _c.call(_b, function (item) { return !!item.required; })),
     });

package/dist/components/ProForm/record-common-list.d.ts

@@ -0,0 +1,18 @@
+import React from 'react';
+import { ISearchLayout } from './interface';
+interface IRecordCommonList {
+    recordCommonList: any[];
+    setRecordCommonList: (list: any[]) => void;
+    currentRecordCommonSearchKey: string;
+    setCurrentRecordCommonSearchKey: (key: string) => void;
+    form: any;
+    reTransformData?: any;
+    deleteData?: any;
+    setReplaceData?: any;
+    updateServerData?: any;
+    onSearchHandle?: any;
+    setCurrentDynamicList?: (list: ISearchLayout[]) => void;
+    showDynamicKey?: string;
+}
+declare const RecordCommonList: React.FC<IRecordCommonList>;
+export default RecordCommonList;