feffery_antd_components 0.2.10-rc13 → 0.2.10-rc15

package/feffery_antd_components/metadata.json

@@ -5691,6 +5691,17 @@
           "computed": false
         }
       },
+      "dataDeepCompare": {
+        "type": {
+          "name": "bool"
+        },
+        "required": false,
+        "description": "",
+        "defaultValue": {
+          "value": "false",
+          "computed": false
+        }
+      },
       "loading_state": {
         "type": {
           "name": "shape",
@@ -6655,6 +6666,24 @@
         "required": false,
         "description": ""
       },
+      "searchKeyword": {
+        "type": {
+          "name": "string"
+        },
+        "required": false,
+        "description": ""
+      },
+      "highlightStyle": {
+        "type": {
+          "name": "object"
+        },
+        "required": false,
+        "description": "",
+        "defaultValue": {
+          "value": "{\r\n    fontWeight: 'bold',\r\n    backgroundColor: 'transparent',\r\n    padding: 0,\r\n    color: '#ff5500'\r\n}",
+          "computed": false
+        }
+      },
       "nodeCheckedSuffix": {
         "type": {
           "name": "node"
@@ -17357,6 +17386,10 @@
               "name": "bool",
               "required": false
             },
+            "block": {
+              "name": "bool",
+              "required": false
+            },
             "style": {
               "name": "object",
               "required": false

package/feffery_antd_components/package-info.json

@@ -1,6 +1,6 @@
 {
   "name": "feffery_antd_components",
-  "version": "0.2.10-rc13",
+  "version": "0.2.10-rc15",
   "description": "Best implementation of Antd components in Plotly Dash.",
   "repository": {
     "type": "git",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feffery_antd_components",
-  "version": "0.2.10-rc13",
+  "version": "0.2.10-rc15",
   "description": "Best implementation of Antd components in Plotly Dash.",
   "repository": {
     "type": "git",

package/src/jl/'feffery'_antdtable.jl

@@ -174,6 +174,7 @@ Those elements have the following types:
   - `maxTagCount` (Real | a value equal to: 'responsive'; optional)
   - `optionFilterProp` (a value equal to: 'value', 'label'; optional)
   - `allowClear` (Bool; optional)s
+- `dataDeepCompare` (Bool; optional)
 - `defaultExpandedRowKeys` (Array of Strings; optional)
 - `defaultFilteredValues` (Dict with Strings as keys and values of type Array; optional): 监听或设置各字段筛选功能初始化时已选中值
 - `emptyContent` (a list of or a singular dash component, string or number; optional)
@@ -283,7 +284,7 @@ Those elements have the following types:
   - `overlayStyle` (Dict; optional)
 """
 function 'feffery'_antdtable(; kwargs...)
-        available_props = Symbol[:id, :bordered, :cellUpdateOptimize, :className, :clickedContent, :clickedCustom, :columns, :columnsFormatConstraint, :conditionalStyleFuncs, :containerId, :currentData, :customFormatFuncs, :data, :defaultExpandedRowKeys, :defaultFilteredValues, :emptyContent, :enableCellClickListenColumns, :enableHoverListen, :expandRowByClick, :expandedRowKeyToContent, :expandedRowWidth, :filter, :filterOptions, :hiddenRowKeys, :key, :loading_state, :locale, :maxHeight, :maxWidth, :miniChartAnimation, :miniChartHeight, :mode, :nClicksButton, :nClicksCell, :nClicksDropdownItem, :nDoubleClicksCell, :pagination, :recentlyButtonClickedDataIndex, :recentlyButtonClickedRow, :recentlyCellClickColumn, :recentlyCellClickRecord, :recentlyCellDoubleClickColumn, :recentlyCellDoubleClickRecord, :recentlyChangedColumn, :recentlyChangedRow, :recentlyCheckedDataIndex, :recentlyCheckedLabel, :recentlyCheckedRow, :recentlyCheckedStatus, :recentlyClickedDropdownItemTitle, :recentlyDropdownItemClickedDataIndex, :recentlyDropdownItemClickedRow, :recentlyMouseEnterColumnDataIndex, :recentlyMouseEnterRow, :recentlyMouseEnterRowKey, :recentlySelectDataIndex, :recentlySelectRow, :recentlySelectValue, :recentlySwitchDataIndex, :recentlySwitchRow, :recentlySwitchStatus, :rowSelectionType, :rowSelectionWidth, :selectedRowKeys, :selectedRows, :selectedRowsSyncWithData, :size, :sortOptions, :sorter, :sticky, :style, :summaryRowContents, :summaryRowFixed, :titlePopoverInfo]
+        available_props = Symbol[:id, :bordered, :cellUpdateOptimize, :className, :clickedContent, :clickedCustom, :columns, :columnsFormatConstraint, :conditionalStyleFuncs, :containerId, :currentData, :customFormatFuncs, :data, :dataDeepCompare, :defaultExpandedRowKeys, :defaultFilteredValues, :emptyContent, :enableCellClickListenColumns, :enableHoverListen, :expandRowByClick, :expandedRowKeyToContent, :expandedRowWidth, :filter, :filterOptions, :hiddenRowKeys, :key, :loading_state, :locale, :maxHeight, :maxWidth, :miniChartAnimation, :miniChartHeight, :mode, :nClicksButton, :nClicksCell, :nClicksDropdownItem, :nDoubleClicksCell, :pagination, :recentlyButtonClickedDataIndex, :recentlyButtonClickedRow, :recentlyCellClickColumn, :recentlyCellClickRecord, :recentlyCellDoubleClickColumn, :recentlyCellDoubleClickRecord, :recentlyChangedColumn, :recentlyChangedRow, :recentlyCheckedDataIndex, :recentlyCheckedLabel, :recentlyCheckedRow, :recentlyCheckedStatus, :recentlyClickedDropdownItemTitle, :recentlyDropdownItemClickedDataIndex, :recentlyDropdownItemClickedRow, :recentlyMouseEnterColumnDataIndex, :recentlyMouseEnterRow, :recentlyMouseEnterRowKey, :recentlySelectDataIndex, :recentlySelectRow, :recentlySelectValue, :recentlySwitchDataIndex, :recentlySwitchRow, :recentlySwitchStatus, :rowSelectionType, :rowSelectionWidth, :selectedRowKeys, :selectedRows, :selectedRowsSyncWithData, :size, :sortOptions, :sorter, :sticky, :style, :summaryRowContents, :summaryRowFixed, :titlePopoverInfo]
         wild_props = Symbol[]
         return Component("'feffery'_antdtable", "AntdTable", "feffery_antd_components", available_props, wild_props; kwargs...)
 end

package/src/jl/'feffery'_antdtree.jl

@@ -33,6 +33,7 @@ Those elements have the following types:
 - `favoritedKeys` (Array of Strings; optional)
 - `halfCheckedKeys` (Array of Strings; optional)
 - `height` (Real; optional)
+- `highlightStyle` (Dict; optional)
 - `key` (String; optional)
 - `loading_state` (optional): . loading_state has the following type: lists containing elements 'is_loading', 'prop_name', 'component_name'.
 Those elements have the following types:
@@ -62,6 +63,7 @@ Those elements have the following types:
   - `key` (String; required)
   - `align` (a value equal to: 'top', 'bottom', 'auto'; optional)
   - `offset` (Real; optional)
+- `searchKeyword` (String; optional)
 - `selectable` (Bool; optional)
 - `selectedKeys` (Array of Strings; optional)
 - `showIcon` (Bool; optional)
@@ -73,7 +75,7 @@ Those elements have the following types:
 - `treeDataMode` (a value equal to: 'tree', 'flat'; optional)
 """
 function 'feffery'_antdtree(; kwargs...)
-        available_props = Symbol[:id, :batchPropsNames, :batchPropsValues, :checkStrictly, :checkable, :checkedKeys, :className, :clickedContextMenu, :defaultCheckedKeys, :defaultExpandAll, :defaultExpandParent, :defaultExpandedKeys, :defaultSelectedKeys, :dragInSameLevel, :draggable, :draggedNodeKey, :enableNodeFavorites, :expandedKeys, :favoritedKeys, :halfCheckedKeys, :height, :key, :loading_state, :multiple, :nodeCheckedStyle, :nodeCheckedSuffix, :nodeUncheckedStyle, :nodeUncheckedSuffix, :persisted_props, :persistence, :persistence_type, :scrollTarget, :selectable, :selectedKeys, :showIcon, :showLine, :style, :treeData, :treeDataMode]
+        available_props = Symbol[:id, :batchPropsNames, :batchPropsValues, :checkStrictly, :checkable, :checkedKeys, :className, :clickedContextMenu, :defaultCheckedKeys, :defaultExpandAll, :defaultExpandParent, :defaultExpandedKeys, :defaultSelectedKeys, :dragInSameLevel, :draggable, :draggedNodeKey, :enableNodeFavorites, :expandedKeys, :favoritedKeys, :halfCheckedKeys, :height, :highlightStyle, :key, :loading_state, :multiple, :nodeCheckedStyle, :nodeCheckedSuffix, :nodeUncheckedStyle, :nodeUncheckedSuffix, :persisted_props, :persistence, :persistence_type, :scrollTarget, :searchKeyword, :selectable, :selectedKeys, :showIcon, :showLine, :style, :treeData, :treeDataMode]
         wild_props = Symbol[]
         return Component("'feffery'_antdtree", "AntdTree", "feffery_antd_components", available_props, wild_props; kwargs...)
 end

package/src/jl/'feffery'_antdupload.jl

@@ -11,11 +11,12 @@ Keyword arguments:
 - `id` (String; optional)
 - `apiUrl` (String; optional)
 - `buttonContent` (a list of or a singular dash component, string or number; optional)
-- `buttonProps` (optional): . buttonProps has the following type: lists containing elements 'size', 'type', 'danger', 'style', 'className'.
+- `buttonProps` (optional): . buttonProps has the following type: lists containing elements 'size', 'type', 'danger', 'block', 'style', 'className'.
 Those elements have the following types:
   - `size` (a value equal to: 'default', 'small', 'large'; optional)
   - `type` (a value equal to: 'primary', 'ghost', 'dashed', 'link', 'text', 'default'; optional)
   - `danger` (Bool; optional)
+  - `block` (Bool; optional)
   - `style` (Dict; optional)
   - `className` (String; optional)
 - `className` (String | Dict; optional)

package/src/lib/components/dataDisplay/AntdComment.react.js

@@ -38,9 +38,23 @@ const AntdComment = (props) => {
         avatarProps,
         popupContainer,
         setProps,
-        loading_state
+        loading_state,
+        batchPropsNames
     } = props;
 
+    // 批属性监听
+    useEffect(() => {
+        if (batchPropsNames && batchPropsNames.length !== 0) {
+            let _batchPropsValues = {};
+            for (let propName of batchPropsNames) {
+                _batchPropsValues[propName] = props[propName];
+            }
+            setProps({
+                batchPropsValues: _batchPropsValues
+            })
+        }
+    })
+
     const context = useContext(PropsContext)
     locale = (context && context.locale) || locale
 
@@ -262,18 +276,4 @@ AntdComment.defaultProps = {
     batchPropsNames: []
 }
 
-export default React.memo(
-    AntdComment,
-    (prevProps, nextProps) => {
-        if (nextProps.batchPropsNames && nextProps.batchPropsNames.length !== 0) {
-            let _batchPropsValues = {};
-            for (let propName of nextProps.batchPropsNames) {
-                _batchPropsValues[propName] = nextProps[propName];
-            }
-            nextProps.setProps({
-                batchPropsValues: _batchPropsValues
-            })
-        }
-        return false;
-    }
-);
+export default AntdComment;

package/src/lib/components/dataDisplay/AntdSegmented.react.js

@@ -26,9 +26,23 @@ const AntdSegmented = (props) => {
         persistence,
         persisted_props,
         persistence_type,
-        loading_state
+        loading_state,
+        batchPropsNames
     } = props;
 
+    // 批属性监听
+    useEffect(() => {
+        if (batchPropsNames && batchPropsNames.length !== 0) {
+            let _batchPropsValues = {};
+            for (let propName of batchPropsNames) {
+                _batchPropsValues[propName] = props[propName];
+            }
+            setProps({
+                batchPropsValues: _batchPropsValues
+            })
+        }
+    })
+
     const context = useContext(PropsContext)
 
     options = options || []
@@ -233,18 +247,4 @@ AntdSegmented.defaultProps = {
     batchPropsNames: []
 }
 
-export default React.memo(
-    AntdSegmented,
-    (prevProps, nextProps) => {
-        if (nextProps.batchPropsNames && nextProps.batchPropsNames.length !== 0) {
-            let _batchPropsValues = {};
-            for (let propName of nextProps.batchPropsNames) {
-                _batchPropsValues[propName] = nextProps[propName];
-            }
-            nextProps.setProps({
-                batchPropsValues: _batchPropsValues
-            })
-        }
-        return false;
-    }
-);
+export default AntdSegmented;

package/src/lib/components/dataDisplay/AntdTable.react.js

@@ -792,7 +792,7 @@ AntdTable.propTypes = {
     // 自定义空数据状态内容
     emptyContent: PropTypes.node,
 
-    // 设置是否开启单元格渲染优化，默认为true
+    // 设置是否开启单元格渲染优化，默认为false
     cellUpdateOptimize: PropTypes.bool,
 
     // 再渲染模式
@@ -886,6 +886,11 @@ AntdTable.propTypes = {
     // 用于设置需要进行隐藏的行对应key值数组，默认为[]
     hiddenRowKeys: PropTypes.arrayOf(PropTypes.string),
 
+    // 用于设置是否针对data参数进行深比较，从而避免React默认的浅比较prop导致部分数据变化情况下未刷新的问题
+    // 开启此功能后，在数据量较大时会对刷新性能造成负面影响
+    // 默认：false
+    dataDeepCompare: PropTypes.bool,
+
     loading_state: PropTypes.shape({
         /**
          * Determines if the component is loading or not
@@ -941,7 +946,8 @@ AntdTable.defaultProps = {
     miniChartHeight: 30,
     miniChartAnimation: false,
     // dropdown模式相关
-    nClicksDropdownItem: 0
+    nClicksDropdownItem: 0,
+    dataDeepCompare: false
 };
 
 export default AntdTable;

package/src/lib/components/dataDisplay/AntdTree.react.js

@@ -2,6 +2,7 @@ import React, { useEffect, useRef, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { Tree, Tooltip, Dropdown, Rate } from 'antd';
 import AntdIcon from '../general/AntdIcon.react';
+import Highlighter from 'react-highlight-words';
 import { omitBy, isUndefined, isString, isObject, isArray, cloneDeep } from 'lodash';
 import { flatToTree } from '../utils';
 import useCss from '../../hooks/useCss';
@@ -23,6 +24,31 @@ const isSameParent = (a, b) => {
     return aLevel.join('') === bLevel.join('');
 }
 
+const filterTree = (toFilterData, keyword) => {
+    return toFilterData.filter(node => {
+        // 首先检查当前节点是否匹配关键字
+        const isMatch = node.title.includes(keyword);
+
+        // 如果当前节点匹配关键字，但不是根节点，才保留它及其全部后代节点信息
+        if (isMatch) {
+            return true;
+        }
+
+        // 如果当前节点不匹配关键字，检查它的子节点
+        if (node.children && node.children.length > 0) {
+            node.children = filterTree(node.children, keyword);
+
+            // 如果有匹配的子节点，保留当前节点及其匹配的后代节点信息
+            if (node.children.length > 0) {
+                return true;
+            }
+        }
+
+        // 如果当前节点和它的子节点都不匹配，返回 false，表示不保留该节点
+        return false;
+    });
+}
+
 // 定义树形控件AntdTree，api参数参考https://ant.design/components/tree-cn/
 const AntdTree = (props) => {
 
@@ -55,6 +81,8 @@ const AntdTree = (props) => {
         enableNodeFavorites,
         favoritedKeys,
         scrollTarget,
+        searchKeyword,
+        highlightStyle,
         nodeCheckedSuffix,
         nodeUncheckedSuffix,
         nodeCheckedStyle,
@@ -62,9 +90,23 @@ const AntdTree = (props) => {
         persistence,
         persisted_props,
         persistence_type,
-        loading_state
+        loading_state,
+        batchPropsNames
     } = props;
 
+    // 批属性监听
+    useEffect(() => {
+        if (batchPropsNames && batchPropsNames.length !== 0) {
+            let _batchPropsValues = {};
+            for (let propName of batchPropsNames) {
+                _batchPropsValues[propName] = props[propName];
+            }
+            setProps({
+                batchPropsValues: _batchPropsValues
+            })
+        }
+    })
+
     const treeRef = useRef(null);
 
     // 控制一次性scrollTarget动作
@@ -267,7 +309,11 @@ const AntdTree = (props) => {
             style={style}
             key={key}
             ref={treeRef}
-            treeData={add_leaf_node_icon(cloneDeep(treeData))}
+            treeData={
+                searchKeyword ?
+                    add_leaf_node_icon(filterTree(cloneDeep(treeData), searchKeyword)) :
+                    add_leaf_node_icon(cloneDeep(treeData))
+            }
             selectedKeys={selectedKeys}
             checkedKeys={checkedKeys}
             selectable={selectable}
@@ -333,7 +379,16 @@ const AntdTree = (props) => {
                                     ...(checkedKeys?.includes(nodeData.key) ? nodeCheckedStyle : nodeUncheckedStyle),
                                     ...nodeData.style // 优先级更高
                                 }}>
-                                {nodeData.title}
+                                {
+                                    searchKeyword ?
+                                        <Highlighter
+                                            highlightStyle={highlightStyle}
+                                            searchWords={[searchKeyword]}
+                                            autoEscape
+                                            textToHighlight={nodeData.title}
+                                        /> :
+                                        nodeData.title
+                                }
                                 {
                                     // 若当前节点满足收藏控件渲染条件
                                     enableNodeFavorites && (isUndefined(nodeData.enableFavorites) || nodeData.enableFavorites) ?
@@ -368,7 +423,16 @@ const AntdTree = (props) => {
                                 ...(checkedKeys?.includes(nodeData.key) ? nodeCheckedStyle : nodeUncheckedStyle),
                                 ...nodeData.style // 优先级更高
                             }}>
-                            {nodeData.title}
+                            {
+                                searchKeyword ?
+                                    <Highlighter
+                                        highlightStyle={highlightStyle}
+                                        searchWords={[searchKeyword]}
+                                        autoEscape
+                                        textToHighlight={nodeData.title}
+                                    /> :
+                                    nodeData.title
+                            }
                             {
                                 // 若当前节点满足收藏控件渲染条件
                                 enableNodeFavorites && (isUndefined(nodeData.enableFavorites) || nodeData.enableFavorites) ?
@@ -669,6 +733,12 @@ AntdTree.propTypes = {
         offset: PropTypes.number
     }),
 
+    // 联动树搜索时使用，用于设置针对树节点title进行搜索的关键词
+    searchKeyword: PropTypes.string,
+
+    // 配合searchKeyword参数使用，用于设置树节点title命中关键词部分的高亮样式
+    highlightStyle: PropTypes.object,
+
     // 节点拓展元素相关功能
     // 为节点元素设置勾选状态下的后缀元素
     nodeCheckedSuffix: PropTypes.node,
@@ -752,6 +822,12 @@ AntdTree.defaultProps = {
     showLine: { 'showLeafIcon': false },
     draggable: false,
     dragInSameLevel: false,
+    highlightStyle: {
+        fontWeight: 'bold',
+        backgroundColor: 'transparent',
+        padding: 0,
+        color: '#ff5500'
+    },
     enableNodeFavorites: false,
     favoritedKeys: [],
     persisted_props: ['selectedKeys', 'checkedKeys', 'expandedKeys', 'halfCheckedKeys'],
@@ -759,18 +835,4 @@ AntdTree.defaultProps = {
     batchPropsNames: []
 }
 
-export default React.memo(
-    AntdTree,
-    (prevProps, nextProps) => {
-        if (nextProps.batchPropsNames && nextProps.batchPropsNames.length !== 0) {
-            let _batchPropsValues = {};
-            for (let propName of nextProps.batchPropsNames) {
-                _batchPropsValues[propName] = nextProps[propName];
-            }
-            nextProps.setProps({
-                batchPropsValues: _batchPropsValues
-            })
-        }
-        return false;
-    }
-);
+export default AntdTree;

package/src/lib/components/dataEntry/AntdCascader.react.js

@@ -46,9 +46,23 @@ const AntdCascader = (props) => {
         persistence,
         persisted_props,
         persistence_type,
-        loading_state
+        loading_state,
+        batchPropsNames
     } = props;
 
+    // 批属性监听
+    useEffect(() => {
+        if (batchPropsNames && batchPropsNames.length !== 0) {
+            let _batchPropsValues = {};
+            for (let propName of batchPropsNames) {
+                _batchPropsValues[propName] = props[propName];
+            }
+            setProps({
+                batchPropsValues: _batchPropsValues
+            })
+        }
+    })
+
     const context = useContext(PropsContext)
     locale = (context && context.locale) || locale
 
@@ -372,18 +386,4 @@ AntdCascader.defaultProps = {
     batchPropsNames: []
 }
 
-export default React.memo(
-    AntdCascader,
-    (prevProps, nextProps) => {
-        if (nextProps.batchPropsNames && nextProps.batchPropsNames.length !== 0) {
-            let _batchPropsValues = {};
-            for (let propName of nextProps.batchPropsNames) {
-                _batchPropsValues[propName] = nextProps[propName];
-            }
-            nextProps.setProps({
-                batchPropsValues: _batchPropsValues
-            })
-        }
-        return false;
-    }
-);
+export default AntdCascader;

package/src/lib/components/dataEntry/AntdCheckbox.react.js

@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React, { useContext, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { Checkbox } from 'antd';
 import { isString, isUndefined } from 'lodash';
@@ -23,9 +23,23 @@ const AntdCheckbox = (props) => {
         persistence,
         persisted_props,
         persistence_type,
-        loading_state
+        loading_state,
+        batchPropsNames
     } = props;
 
+    // 批属性监听
+    useEffect(() => {
+        if (batchPropsNames && batchPropsNames.length !== 0) {
+            let _batchPropsValues = {};
+            for (let propName of batchPropsNames) {
+                _batchPropsValues[propName] = props[propName];
+            }
+            setProps({
+                batchPropsValues: _batchPropsValues
+            })
+        }
+    })
+
     const context = useContext(PropsContext)
 
     const onChange = e => {
@@ -166,18 +180,4 @@ AntdCheckbox.defaultProps = {
     batchPropsNames: []
 }
 
-export default React.memo(
-    AntdCheckbox,
-    (prevProps, nextProps) => {
-        if (nextProps.batchPropsNames && nextProps.batchPropsNames.length !== 0) {
-            let _batchPropsValues = {};
-            for (let propName of nextProps.batchPropsNames) {
-                _batchPropsValues[propName] = nextProps[propName];
-            }
-            nextProps.setProps({
-                batchPropsValues: _batchPropsValues
-            })
-        }
-        return false;
-    }
-);
+export default AntdCheckbox;

package/src/lib/components/dataEntry/AntdCheckboxGroup.react.js

@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React, { useContext, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { Checkbox } from 'antd';
 import { isString, isUndefined } from 'lodash';
@@ -22,9 +22,23 @@ const AntdCheckboxGroup = (props) => {
         persistence,
         persisted_props,
         persistence_type,
-        loading_state
+        loading_state,
+        batchPropsNames
     } = props;
 
+    // 批属性监听
+    useEffect(() => {
+        if (batchPropsNames && batchPropsNames.length !== 0) {
+            let _batchPropsValues = {};
+            for (let propName of batchPropsNames) {
+                _batchPropsValues[propName] = props[propName];
+            }
+            setProps({
+                batchPropsValues: _batchPropsValues
+            })
+        }
+    })
+
     const context = useContext(PropsContext)
 
     const onChange = e => {
@@ -176,18 +190,4 @@ AntdCheckboxGroup.defaultProps = {
     batchPropsNames: []
 }
 
-export default React.memo(
-    AntdCheckboxGroup,
-    (prevProps, nextProps) => {
-        if (nextProps.batchPropsNames && nextProps.batchPropsNames.length !== 0) {
-            let _batchPropsValues = {};
-            for (let propName of nextProps.batchPropsNames) {
-                _batchPropsValues[propName] = nextProps[propName];
-            }
-            nextProps.setProps({
-                batchPropsValues: _batchPropsValues
-            })
-        }
-        return false;
-    }
-);
+export default AntdCheckboxGroup;

package/src/lib/components/dataEntry/AntdDatePicker.react.js

@@ -40,9 +40,23 @@ const AntdDatePicker = (props) => {
         persistence,
         persisted_props,
         persistence_type,
-        loading_state
+        loading_state,
+        batchPropsNames
     } = props;
 
+    // 批属性监听
+    useEffect(() => {
+        if (batchPropsNames && batchPropsNames.length !== 0) {
+            let _batchPropsValues = {};
+            for (let propName of batchPropsNames) {
+                _batchPropsValues[propName] = props[propName];
+            }
+            setProps({
+                batchPropsValues: _batchPropsValues
+            })
+        }
+    })
+
     const context = useContext(PropsContext)
     locale = (context && context.locale) || locale
 
@@ -601,18 +615,4 @@ AntdDatePicker.defaultProps = {
     batchPropsNames: []
 }
 
-export default React.memo(
-    AntdDatePicker,
-    (prevProps, nextProps) => {
-        if (nextProps.batchPropsNames && nextProps.batchPropsNames.length !== 0) {
-            let _batchPropsValues = {};
-            for (let propName of nextProps.batchPropsNames) {
-                _batchPropsValues[propName] = nextProps[propName];
-            }
-            nextProps.setProps({
-                batchPropsValues: _batchPropsValues
-            })
-        }
-        return false;
-    }
-);
+export default AntdDatePicker;

package/src/lib/components/dataEntry/AntdDateRangePicker.react.js

@@ -42,9 +42,23 @@ const AntdDateRangePicker = (props) => {
         persistence,
         persisted_props,
         persistence_type,
-        loading_state
+        loading_state,
+        batchPropsNames
     } = props;
 
+    // 批属性监听
+    useEffect(() => {
+        if (batchPropsNames && batchPropsNames.length !== 0) {
+            let _batchPropsValues = {};
+            for (let propName of batchPropsNames) {
+                _batchPropsValues[propName] = props[propName];
+            }
+            setProps({
+                batchPropsValues: _batchPropsValues
+            })
+        }
+    })
+
     const context = useContext(PropsContext)
     locale = (context && context.locale) || locale
 
@@ -625,18 +639,4 @@ AntdDateRangePicker.defaultProps = {
     batchPropsNames: []
 }
 
-export default React.memo(
-    AntdDateRangePicker,
-    (prevProps, nextProps) => {
-        if (nextProps.batchPropsNames && nextProps.batchPropsNames.length !== 0) {
-            let _batchPropsValues = {};
-            for (let propName of nextProps.batchPropsNames) {
-                _batchPropsValues[propName] = nextProps[propName];
-            }
-            nextProps.setProps({
-                batchPropsValues: _batchPropsValues
-            })
-        }
-        return false;
-    }
-);
+export default AntdDateRangePicker;