@zykj2024/much-library 1.1.6 → 1.1.7-beta.10

package/dist/{McTreeSelect → esm/McTreeSelect}/index.js

@@ -2,16 +2,19 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["style", "className", "label", "inexistent", "value", "onChange", "options", "multiple", "disabled", "fieldNames", "maxTagCount", "treeCheckable"];
+var _excluded = ["style", "className", "label", "colon", "inexistent", "value", "onChange", "options", "multiple", "disabled", "fieldNames", "maxTagCount", "treeCheckable"];
 import { Popover, TreeSelect } from 'antd';
-import { forwardRef, useEffect, useMemo, useRef, useState } from 'react';
-import "./index.css";
+import { forwardRef, useEffect, useMemo, useState } from 'react';
+import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var McTreeSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var style = props.style,
     className = props.className,
     label = props.label,
+    _props$colon = props.colon,
+    colon = _props$colon === void 0 ? true : _props$colon,
     _props$inexistent = props.inexistent,
     inexistent = _props$inexistent === void 0 ? true : _props$inexistent,
     value = props.value,
@@ -35,29 +38,11 @@ var McTreeSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     return multiple || treeCheckable;
   }, [treeCheckable, multiple]);
 
-  /* 获取label宽度 */
-  var labelRef = useRef();
-  var _useState = useState(11),
-    _useState2 = _slicedToArray(_useState, 2),
-    paddingLeft = _useState2[0],
-    setPaddingLeft = _useState2[1];
-  var labelResizeObserver = new ResizeObserver(function (entries) {
-    setPaddingLeft(entries[0].contentRect.width + 11);
-  });
-  useEffect(function () {
-    if (labelRef.current) {
-      labelResizeObserver.observe(labelRef.current);
-    }
-    return function () {
-      return labelResizeObserver.disconnect();
-    };
-  }, []);
-
   /* 判断value值是否存在于options中 */
-  var _useState3 = useState(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    _value = _useState4[0],
-    set_value = _useState4[1];
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    _value = _useState2[0],
+    set_value = _useState2[1];
   // 获取所有备选项的值列表
   var _values = useMemo(function () {
     var v = fieldNames.value,
@@ -126,21 +111,23 @@ var McTreeSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     }
     onChange === null || onChange === void 0 || onChange(_v, labelList, e);
   };
-  return /*#__PURE__*/_jsxs("div", {
+  return /*#__PURE__*/_jsx("div", {
     style: _objectSpread({
-      position: label ? 'relative' : 'static',
-      height: _multiple ? 'auto' : 32,
-      '--selector-pl': "".concat(paddingLeft, "px")
+      height: _multiple ? 'auto' : 32
     }, style),
     className: "mc-tree-select ".concat(_multiple && _maxTagCount === 1 && 'mc-tree-select--inline', " ").concat(className),
-    children: [label && /*#__PURE__*/_jsx("span", {
-      ref: labelRef,
-      className: "mc-tree-select__label ".concat(disabled && 'mc-tree-select--disabled'),
-      children: label
-    }), /*#__PURE__*/_jsx(TreeSelect, _objectSpread({
+    children: /*#__PURE__*/_jsx(TreeSelect, _objectSpread({
       ref: ref,
       className: "mc-tree-select__content",
       value: _value,
+      prefix: /*#__PURE__*/_jsxs(_Fragment, {
+        children: [label, label && colon && /*#__PURE__*/_jsx("span", {
+          style: {
+            marginLeft: 2
+          },
+          children: "\uFF1A"
+        })]
+      }),
       onChange: change,
       treeData: options,
       multiple: multiple,
@@ -176,7 +163,7 @@ var McTreeSelect = /*#__PURE__*/forwardRef(function (props, ref) {
           })
         });
       }
-    }, rest))]
+    }, rest))
   });
 });
 export default McTreeSelect;

package/dist/esm/McTreeSelect/index.less

@@ -0,0 +1,38 @@
+.mc-tree-select {
+  &__content {
+    width: 100%;
+    height: 100%;
+
+    &.ant-tree-select.ant-select {
+      .ant-select-selector {
+        .ant-select-prefix {
+          margin-right: 0;
+        }
+
+        .ant-select-selection-overflow-item-rest .ant-select-selection-item {
+          padding-left: 4px;
+          color: #fff;
+          background: #325cf7;
+
+          .ant-select-selection-item-content {
+            margin-right: 0;
+          }
+        }
+
+        .ant-select-selection-item[title*='不存在'] {
+          color: #ff4d4f;
+        }
+      }
+    }
+  }
+
+  .mc-tree-select--inline
+    &.ant-select-selection-overflow-item:not(
+      .ant-select-selection-overflow-item-rest,
+      .ant-select-selection-overflow-item-suffix
+    ) {
+    flex: 1;
+    min-width: 0;
+    margin-right: 4px;
+  }
+}

package/dist/esm/McUpload/comps/McFormUpload/comps/UploadForVal/index.d.ts

@@ -0,0 +1,38 @@
+import { GetProps, UploadFile } from 'antd';
+import McUploadCmp from '../../../McUploadCmp';
+import { RcFile } from 'antd/es/upload';
+import { FileCheckedResult } from '../../../../tools/materialVerification';
+import { TaskQueue } from '../../../../../Utils';
+import './index.less';
+type McUploadProps = GetProps<typeof McUploadCmp>;
+type FormUploadParams = {
+    file: RcFile;
+    fileList: RcFile[];
+    basicVerifier: (file: RcFile) => Promise<FileCheckedResult>;
+    getMD5: (file: RcFile) => Promise<string>;
+    taskQueue: TaskQueue;
+    setValue?: (value: UploadFile[]) => void;
+};
+export type CustomUploadFile = (params: FormUploadParams) => Promise<UploadFile[]> | UploadFile[];
+type BathParams = {
+    fileList: RcFile[];
+    basicVerifier: (file: RcFile) => Promise<FileCheckedResult>;
+    getMD5: (file: RcFile) => Promise<string>;
+    taskQueue: TaskQueue;
+    setValue?: (value: UploadFile[]) => void;
+};
+export type BatchUploadFile = (params: BathParams) => Promise<UploadFile[]> | UploadFile[];
+export type UploadFileProps = {
+    batchProcess: true;
+    uploadFile?: BatchUploadFile;
+} | {
+    batchProcess?: false;
+    uploadFile?: CustomUploadFile;
+};
+type Props = Omit<McUploadProps, 'beforeUpload' | 'batchProcess'> & {
+    value?: UploadFile[];
+    onChange?: (value: UploadFile[]) => void;
+    uploadOnChange?: McUploadProps['onChange'];
+} & UploadFileProps;
+declare const UploadForVal: ({ value, onChange, uploadFile, ...rest }: Props) => import("react/jsx-runtime").JSX.Element;
+export default UploadForVal;

package/dist/esm/McUpload/comps/McFormUpload/comps/UploadForVal/index.js

@@ -0,0 +1,209 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["value", "onChange", "uploadFile"];
+import { message } from 'antd';
+import McUploadCmp from "../../../McUploadCmp";
+import { isEqual } from 'lodash';
+import { useEffect, useState } from 'react';
+import { isNumber } from "../../../../tools/materialVerification";
+import { E_McUploadTriggerStatus, E_McUploadTriggerType } from "../../../McUploadTrigger";
+import "./index.less";
+import { jsx as _jsx } from "react/jsx-runtime";
+var defaultProps = {
+  listType: E_McUploadTriggerType.BUTTON
+};
+var UploadForVal = function UploadForVal(_ref) {
+  var value = _ref.value,
+    _onChange = _ref.onChange,
+    uploadFile = _ref.uploadFile,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  // 判断是不是批量操作
+  var isBatchProcess = rest === null || rest === void 0 ? void 0 : rest.batchProcess;
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    selfValue = _useState2[0],
+    setSelfValue = _useState2[1];
+  var handleUpload = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(fileList, isBath, info) {
+      var basicVerifier, getMD5, taskQueue, res;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            basicVerifier = info.basicVerifier, getMD5 = info.getMD5, taskQueue = info.taskQueue;
+            setSelfValue === null || setSelfValue === void 0 || setSelfValue(function (pre) {
+              var newVal = fileList.map(function (file) {
+                return {
+                  uid: file.uid,
+                  name: file.name,
+                  status: E_McUploadTriggerStatus.UPLOADING,
+                  url: ''
+                };
+              });
+              var val = [].concat(_toConsumableArray(pre || []), _toConsumableArray(newVal));
+              _onChange === null || _onChange === void 0 || _onChange(val);
+              return val;
+            });
+            if (!isBath) {
+              _context2.next = 9;
+              break;
+            }
+            _context2.next = 5;
+            return uploadFile === null || uploadFile === void 0 ? void 0 : uploadFile({
+              fileList: fileList,
+              basicVerifier: basicVerifier,
+              getMD5: getMD5,
+              taskQueue: taskQueue,
+              setValue: _onChange
+            });
+          case 5:
+            res = _context2.sent;
+            if (Array.isArray(res)) {
+              setSelfValue(function (pre) {
+                var tempVal = pre === null || pre === void 0 ? void 0 : pre.filter(function (item) {
+                  return !fileList.find(function (tempFile) {
+                    return tempFile.uid === item.uid;
+                  });
+                });
+                var val = [].concat(_toConsumableArray(tempVal || []), _toConsumableArray(res || []));
+                _onChange === null || _onChange === void 0 || _onChange(val);
+                return val;
+              });
+            } else {
+              setSelfValue === null || setSelfValue === void 0 || setSelfValue(function (pre) {
+                var val = pre === null || pre === void 0 ? void 0 : pre.filter(function (item) {
+                  return !fileList.find(function (tempFile) {
+                    return (tempFile === null || tempFile === void 0 ? void 0 : tempFile.uid) === (item === null || item === void 0 ? void 0 : item.uid);
+                  });
+                });
+                _onChange === null || _onChange === void 0 || _onChange(val);
+                return val;
+              });
+            }
+            _context2.next = 10;
+            break;
+          case 9:
+            fileList.forEach( /*#__PURE__*/function () {
+              var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
+                var uid, res;
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) switch (_context.prev = _context.next) {
+                    case 0:
+                      uid = file === null || file === void 0 ? void 0 : file.uid;
+                      _context.next = 3;
+                      return uploadFile === null || uploadFile === void 0 ? void 0 : uploadFile({
+                        file: file,
+                        fileList: fileList,
+                        basicVerifier: basicVerifier,
+                        getMD5: getMD5,
+                        taskQueue: taskQueue,
+                        setValue: _onChange
+                      });
+                    case 3:
+                      res = _context.sent;
+                      if (Array.isArray(res)) {
+                        setSelfValue(function (pre) {
+                          var tempVal = pre === null || pre === void 0 ? void 0 : pre.filter(function (tempFile) {
+                            return (tempFile === null || tempFile === void 0 ? void 0 : tempFile.uid) !== uid;
+                          });
+                          var val = [].concat(_toConsumableArray(tempVal || []), _toConsumableArray(res || []));
+                          _onChange === null || _onChange === void 0 || _onChange(val);
+                          return val;
+                        });
+                      } else {
+                        setSelfValue(function (pre) {
+                          var tempVal = pre === null || pre === void 0 ? void 0 : pre.filter(function (tempFile) {
+                            return (tempFile === null || tempFile === void 0 ? void 0 : tempFile.uid) !== (file === null || file === void 0 ? void 0 : file.uid);
+                          });
+                          _onChange === null || _onChange === void 0 || _onChange(tempVal);
+                          return tempVal;
+                        });
+                      }
+                    case 5:
+                    case "end":
+                      return _context.stop();
+                  }
+                }, _callee);
+              }));
+              return function (_x4) {
+                return _ref3.apply(this, arguments);
+              };
+            }());
+          case 10:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function handleUpload(_x, _x2, _x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
+  //受控组件
+  useEffect(function () {
+    if (!isEqual(value, selfValue) || !(selfValue !== null && selfValue !== void 0 && selfValue.length) && !(value !== null && value !== void 0 && value.length)) {
+      setSelfValue(value || []);
+    }
+  }, [value]);
+  return /*#__PURE__*/_jsx("div", {
+    className: "uploadContainer",
+    style: rest !== null && rest !== void 0 && rest.listType ? {
+      minHeight: (rest === null || rest === void 0 ? void 0 : rest.listType) === E_McUploadTriggerType.RECTANGLE ? 120 : 102
+    } : {},
+    children: /*#__PURE__*/_jsx(McUploadCmp, _objectSpread(_objectSpread(_objectSpread({}, defaultProps), rest), {}, {
+      fileList: selfValue,
+      batchProcess: true,
+      beforeUpload: ( /*#__PURE__*/function () {
+        var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(info) {
+          var fileList, baseLength, shortfall;
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                fileList = info.fileList;
+                if (isNumber(rest === null || rest === void 0 ? void 0 : rest.maxCount) && (rest === null || rest === void 0 ? void 0 : rest.maxCount) >= 0) {
+                  baseLength = (selfValue === null || selfValue === void 0 ? void 0 : selfValue.length) || 0;
+                  shortfall = (rest === null || rest === void 0 ? void 0 : rest.maxCount) - baseLength;
+                  if (shortfall > 0) {
+                    handleUpload(fileList.slice(0, shortfall), !!isBatchProcess, info);
+                  } else {
+                    message.warning("\u6700\u591A\u4E0A\u4F20".concat(rest === null || rest === void 0 ? void 0 : rest.maxCount, "\u4E2A\u6587\u4EF6"));
+                  }
+                } else {
+                  handleUpload(fileList, !!isBatchProcess, info);
+                }
+                return _context3.abrupt("return", false);
+              case 3:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3);
+        }));
+        return function (_x5) {
+          return _ref4.apply(this, arguments);
+        };
+      }()),
+      onChange: function onChange(info) {
+        var _rest$uploadOnChange;
+        var _info$file = info === null || info === void 0 ? void 0 : info.file,
+          status = _info$file.status;
+        var isDelete = status === 'removed';
+        if (isDelete) {
+          setSelfValue === null || setSelfValue === void 0 || setSelfValue(function (pre) {
+            var val = (pre === null || pre === void 0 ? void 0 : pre.filter(function (item) {
+              var _info$file2;
+              return item.uid !== (info === null || info === void 0 || (_info$file2 = info.file) === null || _info$file2 === void 0 ? void 0 : _info$file2.uid);
+            })) || [];
+            _onChange === null || _onChange === void 0 || _onChange(val);
+            return val;
+          });
+        }
+        rest === null || rest === void 0 || (_rest$uploadOnChange = rest.uploadOnChange) === null || _rest$uploadOnChange === void 0 || _rest$uploadOnChange.call(rest, info);
+      }
+    }))
+  });
+};
+export default UploadForVal;

package/dist/esm/McUpload/comps/McFormUpload/comps/UploadForVal/index.less

@@ -0,0 +1,6 @@
+.uploadContainer {
+  display: flex;
+  flex-flow: nowrap;
+  gap: 10px;
+  align-items: center;
+}

package/dist/esm/McUpload/comps/McFormUpload/index.d.ts

@@ -0,0 +1,7 @@
+import { Form, GetProps } from 'antd';
+import UploadForVal from './comps/UploadForVal';
+type McProFormUploadProps = GetProps<typeof Form.Item> & {
+    fieldProps: GetProps<typeof UploadForVal>;
+};
+declare const McFormUpload: ({ fieldProps, ...props }: McProFormUploadProps) => import("react/jsx-runtime").JSX.Element;
+export default McFormUpload;

package/dist/esm/McUpload/comps/McFormUpload/index.js

@@ -0,0 +1,29 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["fieldProps"];
+import { Form } from 'antd';
+import UploadForVal from "./comps/UploadForVal";
+import { jsx as _jsx } from "react/jsx-runtime";
+var McFormUpload = function McFormUpload(_ref) {
+  var fieldProps = _ref.fieldProps,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, props), {}, {
+    rules: [{
+      validateTrigger: 'onFinsh',
+      validator: function validator(rule, value) {
+        if ((value || []).some(function (item) {
+          return !item.url;
+        })) {
+          return Promise.reject('图片未上传完成或存在上传错误');
+        } else {
+          return Promise.resolve();
+        }
+      }
+    }].concat(_toConsumableArray(props.rules || [])),
+    children: /*#__PURE__*/_jsx(UploadForVal, _objectSpread(_objectSpread({}, fieldProps), {}, {
+      children: props === null || props === void 0 ? void 0 : props.children
+    }))
+  }));
+};
+export default McFormUpload;

package/dist/esm/McUpload/comps/McUploadCmp/index.d.ts

@@ -0,0 +1,49 @@
+import { GetProps, Upload } from 'antd';
+import { RcFile } from 'antd/es/upload';
+import { UploadRef } from 'antd/es/upload/Upload';
+import { MutableRefObject, ReactNode } from 'react';
+import { FileCheckedResult, VerifyConfig } from '../../tools/materialVerification';
+import { TaskQueue } from '../../../Utils';
+import { E_McUploadTriggerType } from '../McUploadTrigger';
+import './index.less';
+export type ExtractReturnTypeIfFunction<T> = T extends (...args: any[]) => infer R ? R : never;
+type UploadProps = GetProps<typeof Upload>;
+type UploadParams = {
+    file: RcFile;
+    fileList: RcFile[];
+    basicVerifier: (file: RcFile) => Promise<FileCheckedResult>;
+    getMD5: (file: RcFile) => Promise<string | MessageEvent['data']['error'] | ProgressEvent<FileReader>>;
+    taskQueue: TaskQueue;
+};
+export type BeforeUpload = (params: UploadParams) => ExtractReturnTypeIfFunction<UploadProps['beforeUpload']>;
+type BatchProcessBeforeUploadParams = {
+    fileList: RcFile[];
+    basicVerifier: (file: RcFile) => Promise<FileCheckedResult>;
+    getMD5: (file: RcFile) => Promise<string | MessageEvent['data']['error'] | ProgressEvent<FileReader>>;
+    taskQueue: TaskQueue;
+};
+export type BatchProcessBeforeUpload = (params: BatchProcessBeforeUploadParams) => ExtractReturnTypeIfFunction<UploadProps['beforeUpload']>;
+export type BeforeUploadProps = {
+    batchProcess: true;
+    beforeUpload?: BatchProcessBeforeUpload;
+} | {
+    batchProcess?: false;
+    beforeUpload?: BeforeUpload;
+};
+type ExtractParameters<T> = T extends (...args: infer P) => any ? P[0] : undefined;
+export type ExtractNonUndefined<T> = T extends undefined ? never : T;
+type customRequest = (options: ExtractNonUndefined<ExtractParameters<UploadProps['customRequest']>>, taskQueue: TaskQueue) => void;
+export type McUploadProps = Omit<UploadProps, 'beforeUpload' | 'customRequest' | 'listType'> & {
+    uploadRef?: MutableRefObject<Partial<UploadRef & {
+        open: () => void;
+    }> | undefined>;
+    customRequest?: customRequest;
+    listType?: E_McUploadTriggerType;
+    verifierConfig?: VerifyConfig;
+    verifyErrorMessage?: boolean | string | ((errRes: FileCheckedResult) => string);
+    taskQueueRef?: MutableRefObject<TaskQueue | undefined>;
+    maxTaskCounts?: number;
+    placeholder?: ReactNode;
+} & BeforeUploadProps;
+declare const McUploadCmp: ({ itemRender, listType, ...rest }: McUploadProps) => import("react/jsx-runtime").JSX.Element;
+export default McUploadCmp;