linkmore-design 1.1.27-beta.5 → 1.1.27-beta.7

package/dist/Form/FormItem/index.d.ts

@@ -31,6 +31,7 @@ export interface FormItemProps<Values = any> extends FormItemLabelProps, FormIte
     fieldKey?: React.Key | React.Key[];
     /** 变更 */
     rules?: LmRule[];
+    ruleTime?: number;
     errorPlacement?: string;
     responsive?: boolean;
 }

package/dist/index.umd.js

@@ -82634,8 +82634,9 @@
   // 二级过滤 => 基础过滤组件
   var LmFilterBase = /*#__PURE__*/React__default['default'].memo(function (_ref) {
     var instance = _ref.instance;
-    var dataSource = instance.dataSource;
-    return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(FuzzySearch, {
+    var dataSource = instance.dataSource,
+      enableSearch = instance.enableSearch;
+    return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, enableSearch && /*#__PURE__*/React__default['default'].createElement(FuzzySearch, {
       instance: instance
     }), dataSource.map(function (v, index) {
       var isHidden = !v.show && typeof v.show === 'boolean';
@@ -84380,6 +84381,7 @@
         var itemValue = obj[cur].value;
         if (getIsHas(itemValue) && !!item) {
           return [].concat(_toConsumableArray$1(pre), [{
+            relation: obj[cur].mode || 'and',
             fieldName: cur,
             fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
             type: item.type,
@@ -84388,7 +84390,7 @@
              * and 等同于逻辑关系contains: 选中的值包含所有值
              * or 等同于逻辑关系in: 选中的值存在于所有值之中
              */
-            operator: obj[cur].mode === 'and' ? 'contains' : 'in'
+            operator: 'in'
           }]);
         }
         return pre;
@@ -84540,11 +84542,12 @@
           if (getIsHas(itemValue) && !!item) {
             // eslint-disable-next-line no-param-reassign
             pre[cur] = {
+              relation: complexFilter[cur].mode || 'and',
               fieldName: cur,
               fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
               type: item.type,
               value: Array.isArray(itemValue) ? itemValue : [itemValue],
-              operator: complexFilter[cur].mode === 'and' ? 'contains' : 'in'
+              operator: 'in'
             };
           }
           return pre;
@@ -170266,7 +170269,7 @@
     // 文件循环校验，返回校验后的文件数组
     var filesLoopCheck = React.useCallback(function (files) {
       return Promise.all(files.map(fileCheckAsync));
-    }, []);
+    }, [fileCheckAsync]);
     /*
      * 上传前: 先校验 => 全部校验通过后开始上传
      * 事件执行顺序:
@@ -170467,7 +170470,7 @@
       var isUploading = getUploadStatus().uploading;
       if (isUploading) return;
       inputRef === null || inputRef === void 0 ? void 0 : (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.click();
-    }, [getUploadStatus]);
+    }, [disabled, getUploadStatus]);
     // 上传触发事件
     var uploadChange = React.useCallback(function (e) {
       var _inputRef$current2;
@@ -224948,7 +224951,7 @@
     }, attributes, listeners)));
   }
 
-  var _excluded$21 = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "openColGroup", "colGroupTitle", "openRowGroup", "rowGroupTitle", "groupWidth", "groupRowKeys", "groupColKeys", "onGroupChange", "emptyProps"],
+  var _excluded$21 = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "openColGroup", "colGroupTitle", "openRowGroup", "rowGroupTitle", "groupWidth", "groupRowKeys", "groupColKeys", "onGroupChange", "rowStyle", "emptyProps"],
     _excluded2$r = ["className", "style"],
     _excluded3$6 = ["onResize", "width", "dataIndex", "onResizeStop"];
   var Summary$1 = ProviderWarp.Summary;
@@ -225026,6 +225029,7 @@
       customizeGroupColKeys = props.groupColKeys,
       _props$onGroupChange = props.onGroupChange,
       onGroupChange = _props$onGroupChange === void 0 ? function () {} : _props$onGroupChange,
+      rowStyle = props.rowStyle,
       emptyProps = props.emptyProps,
       resetProps = _objectWithoutProperties$1(props, _excluded$21);
     if (!Array.isArray(customizeColumns) || !customizeColumns.length) {
@@ -226173,7 +226177,7 @@
     }, [sortOpen, resizeable, components, colSortOpen, customizeDataSource, columns, openRowGroup]);
     React.useEffect(function () {
       if (autoSize && autoSize.height !== '100%') {
-        document.querySelector('.lm_protable .ant-table-body').style.height = autoSize.height + 'px';
+        document.querySelector('.lm_protable .ant-table-body').style.height = "".concat(autoSize.height, "px");
       }
     }, [autoSize]);
     return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -226222,6 +226226,11 @@
       tableClassName: _classnames_2_3_2_classnames('lm_protable', resizeable && 'lm_resizeable'),
       summary: function summary(pageData) {
         return _summary && _summary(pageData, resultColumns);
+      },
+      onRow: function onRow() {
+        return {
+          style: rowStyle || {}
+        };
       }
     }))) : /*#__PURE__*/React__default['default'].createElement(ProviderWarp, _extends$2({}, config, {
       loading: loading,
@@ -239681,16 +239690,17 @@
       _props$trigger = props.trigger,
       trigger = _props$trigger === void 0 ? 'onChange' : _props$trigger,
       validateTrigger = props.validateTrigger,
-      hidden = props.hidden;
+      hidden = props.hidden,
+      ruleTime = props.ruleTime;
     var timerRef = React.useRef(null);
     var _useState = useState$2([]),
       _useState2 = _slicedToArray$1(_useState, 2),
-      mergedErrors = _useState2[0],
-      setMergedErrors = _useState2[1];
+      errors = _useState2[0],
+      setErrors = _useState2[1];
     var _useState3 = useState$2([]),
       _useState4 = _slicedToArray$1(_useState3, 2),
-      mergedWarnings = _useState4[0],
-      setMergedWarnings = _useState4[1];
+      warnings = _useState4[0],
+      setWarnings = _useState4[1];
     var _useContext = React.useContext(ConfigContext$1),
       getPrefixCls = _useContext.getPrefixCls;
     var _useContext2 = React.useContext(FormContext$2),
@@ -239763,26 +239773,33 @@
       });
     };
     // >>>>> Get merged errors
+    var _React$useMemo = React.useMemo(function () {
+        var errorList = _toConsumableArray$1(meta.errors);
+        var warningList = _toConsumableArray$1(meta.warnings);
+        Object.values(subFieldErrors).forEach(function (subFieldError) {
+          errorList.push.apply(errorList, _toConsumableArray$1(subFieldError.errors || []));
+          warningList.push.apply(warningList, _toConsumableArray$1(subFieldError.warnings || []));
+        });
+        return [errorList.slice(0, 1), warningList.slice(0, 1)];
+      }, [subFieldErrors, meta.errors, meta.warnings]),
+      _React$useMemo2 = _slicedToArray$1(_React$useMemo, 2),
+      mergedErrors = _React$useMemo2[0],
+      mergedWarnings = _React$useMemo2[1];
     React.useEffect(function () {
-      var errorList = _toConsumableArray$1(meta.errors);
-      var warningList = _toConsumableArray$1(meta.warnings);
-      Object.values(subFieldErrors).forEach(function (subFieldError) {
-        errorList.push.apply(errorList, _toConsumableArray$1(subFieldError.errors || []));
-        warningList.push.apply(warningList, _toConsumableArray$1(subFieldError.warnings || []));
-      });
-      setMergedErrors(errorList);
-      setMergedWarnings(warningList);
-      var time = getRuleTime(rules);
+      setErrors(mergedErrors);
+      setWarnings(mergedWarnings);
+      var time = ruleTime || getRuleTime(rules);
       if (time) {
         clearTimeout(timerRef.current);
         timerRef.current = setTimeout(function () {
-          setMergedErrors([]);
-          setMergedWarnings([]);
+          setErrors([]);
+          setWarnings([]);
         }, time);
       }
-    }, [subFieldErrors, meta.errors, meta.warnings]);
+    }, [mergedErrors, mergedWarnings]);
     // ===================== Children Ref =====================
     var getItemRef = useItemRef$1();
+    var _props = omit$3(props, ['ruleTime']);
     // ======================== Render ========================
     function renderLayout(baseChildren, fieldId, isRequired) {
       if (noStyle && !hidden) {
@@ -239790,12 +239807,14 @@
       }
       return /*#__PURE__*/React.createElement(ItemHolder$1, _objectSpread(_objectSpread({
         key: "row"
-      }, props), {}, {
+      }, _props), {}, {
         prefixCls: prefixCls,
         fieldId: fieldId,
         isRequired: isRequired,
-        errors: mergedErrors,
-        warnings: mergedWarnings,
+        // errors={mergedErrors}
+        // warnings={mergedWarnings}
+        errors: errors,
+        warnings: warnings,
         meta: meta,
         onSubItemMetaChange: onSubItemMetaChange
       }), baseChildren);
@@ -239813,7 +239832,7 @@
       variables = _objectSpread(_objectSpread({}, variables), messageVariables);
     }
     // >>>>> With Field
-    return /*#__PURE__*/React.createElement(WrapperField, _objectSpread(_objectSpread({}, props), {}, {
+    return /*#__PURE__*/React.createElement(WrapperField, _objectSpread(_objectSpread({}, _props), {}, {
       messageVariables: variables,
       trigger: trigger,
       validateTrigger: mergedValidateTrigger,