@zat-design/sisyphus-react 3.4.6 → 3.4.8

package/lib/ProSelect/index.js

@@ -19,8 +19,9 @@ var _Container = _interopRequireDefault(require("../ProForm/components/Container
 var _AdaptiveTooltip = _interopRequireDefault(require("./components/AdaptiveTooltip"));
 var _ = require("..");
 var _locale = _interopRequireDefault(require("../locale"));
+var _utils = require("./utils");
 require("./index.less");
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
 var Option = _antd.Select.Option;
 var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   var _locale$ProSelect;
@@ -42,6 +43,8 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     tooltip = _props$tooltip === void 0 ? false : _props$tooltip,
     otherProps = props.otherProps,
     labelInValue = props.labelInValue,
+    _props$filterInList = props.filterInList,
+    filterInList = _props$filterInList === void 0 ? false : _props$filterInList,
     _props$scrollFollowPa = props.scrollFollowParent,
     scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa,
     defaultOne = props.defaultOne,
@@ -266,6 +269,15 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     }
     return value;
   };
+  var newSelectList = selectList;
+  if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
+    newSelectList = (0, _utils.getSelectList)({
+      otherProps: otherProps,
+      value: props.value,
+      dataSource: selectList,
+      labelInValue: labelInValue
+    });
+  }
   return (0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProSelect = _locale.default.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
     allowClear: true,
@@ -288,7 +300,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     }
   }, (0, _lodash.omit)((0, _lodash.cloneDeep)(selectProps), ['isView', 'showCodeName', 'form', 'name'])), {}, {
     value: transformValue(),
-    children: Array.isArray(selectList) && selectList.map(function (item) {
+    children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
       return (0, _jsxRuntime.jsx)(Option, {
         value: item[code],
         record: item,

package/lib/ProSelect/propsType.d.ts

@@ -14,6 +14,8 @@ export interface PropSelectProps extends Omit<SelectProps, 'onSearch'> {
     defaultOne?: boolean;
     /** 数据源 */
     dataSource?: DataOption[];
+    /** list场景中过滤掉已选择的值 */
+    filterInList?: boolean;
     /** @deprecated  兼容 2.0 版本、3.0 使用view 模式 */
     defaultDisableValue?: string;
     /** 是否展示 tooltip、当 label 特别长的时候使用 */

package/lib/ProSelect/utils/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 返回当前组件可以显示的数据源
+ */
+export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, }: {
+    otherProps: any;
+    value: any;
+    dataSource: any;
+    labelInValue: any;
+}) => any;

package/lib/ProSelect/utils/index.js

@@ -0,0 +1,68 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSelectList = void 0;
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+var _lodash = _interopRequireDefault(require("lodash"));
+/* eslint-disable no-restricted-syntax */
+
+var findSelectNameValues = function findSelectNameValues(_ref) {
+  var list = _ref.list,
+    selectName = _ref.selectName,
+    value = _ref.value,
+    dataSource = _ref.dataSource,
+    labelInValue = _ref.labelInValue;
+  var selectValues = [];
+  list.forEach(function (item) {
+    var result = item;
+    if (!item || !Object.keys(item).length || Object.keys(item).length === 1 && 'rowKey' in item) {
+      return false;
+    }
+    var _iterator = (0, _createForOfIteratorHelper2.default)(selectName),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var key = _step.value;
+        result = result[key];
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    selectValues.push(result);
+  });
+  var diffList = _lodash.default.difference(selectValues, [value]);
+  return dataSource.filter(function (item) {
+    return !diffList.includes(labelInValue ? item : item.value);
+  });
+};
+/**
+ * 返回当前组件可以显示的数据源
+ */
+var getSelectList = exports.getSelectList = function getSelectList(_ref2) {
+  var otherProps = _ref2.otherProps,
+    value = _ref2.value,
+    dataSource = _ref2.dataSource,
+    labelInValue = _ref2.labelInValue;
+  if (!otherProps) {
+    return null;
+  }
+  var listName = otherProps.listName,
+    form = otherProps.form;
+  var firstNumberIndex = listName.findIndex(function (item) {
+    return typeof item === 'number';
+  });
+  var fatherName = listName.slice(0, firstNumberIndex);
+  var selectName = listName.slice(firstNumberIndex + 1);
+  return findSelectNameValues({
+    list: form.getFieldValue(fatherName),
+    selectName: selectName,
+    value: value,
+    dataSource: dataSource,
+    labelInValue: labelInValue
+  });
+};

package/lib/ProTree/components/ProTreeSelect/index.js

@@ -409,13 +409,13 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     }
     return result;
   }
-  var handleChange = function handleChange(newVal) {
+  var handleChange = function handleChange(newVal, label, extra) {
     // newVal回来得一定是label、value
     var result = newVal;
     if (props === null || props === void 0 ? void 0 : props.labelInValue) {
       result = getLabelByValue(selectList, newVal);
     }
-    onChange && onChange(result, selectList, null);
+    onChange && onChange(result, label, extra);
     // 重置搜索
     showSearch && searchTreeEvent('');
   };
@@ -488,7 +488,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     allowClear: allowClear || true,
     showArrow: true,
     treeNodeFilterProp: treeNodeFilterProp,
-    virtual: false
+    virtual: true
   }, selectProps);
   if (value === null) {
     delete treeProps.value;

package/lib/ProTree/components/ProTreeSelect/style/index.less

@@ -40,6 +40,12 @@
                 color: red;
             }
         }
+        // 隐藏单选下拉树后面勾号
+        .@{ant-prefix}-select-tree-node-content-wrapper{
+            .check-mark-icon{
+                display: none;
+            }
+        }
         // 单选
         &.signal-tree{
             .@{ant-prefix}-select-tree{
@@ -63,14 +69,6 @@
                         display: block;
                     }
                 }
-                .@{ant-prefix}-select-tree-node-content-wrapper{
-                    background-color: transparent;
-                    &.@{ant-prefix}-select-tree-node-selected{
-                        .check-mark-icon{
-                            display: block;
-                        }
-                    }
-                }
                 .@{ant-prefix}-select-tree-treenode:hover{
                     background-color: #f5f5f5;
                 }

package/lib/ProTree/style/index.less

@@ -348,3 +348,18 @@
   height: 16px !important;
 }
 
+.pro-tree-select, .pro-tree-select-drop-down-container{
+  .@{ant-prefix}-select-selector{
+    .check-mark-icon{
+      display: none;
+  }
+  }
+  &.@{ant-prefix}-select-dropdown{
+  // 隐藏单选下拉树后面勾号
+    .@{ant-prefix}-select-tree-node-content-wrapper{
+        .check-mark-icon{
+            display: none;
+        }
+    }
+  }
+}

package/lib/ProUpload/index.js

@@ -182,10 +182,6 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
    * @return {*}
    */
   var handleBeforeUpload = function handleBeforeUpload(file, fileList) {
-    if (!(0, _lodash.isFunction)(beforeUpload)) {
-      return false;
-    }
-    // TODO
     if (!(0, _uitls.validateFileExt)(extExt, file)) {
       var _locale$ProUpload2;
       _antd.message.error("".concat(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProUpload2 = _locale.default.ProUpload) === null || _locale$ProUpload2 === void 0 ? void 0 : _locale$ProUpload2.errorInfoExt, "\u3010").concat(extExt.join('、'), "\u3011"));
@@ -196,7 +192,9 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       _antd.message.error("".concat(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProUpload3 = _locale.default.ProUpload) === null || _locale$ProUpload3 === void 0 ? void 0 : _locale$ProUpload3.errorInfoSize).concat(size, "M"));
       return false;
     }
-    return beforeUpload(file, fileList);
+    if (beforeUpload) {
+      return beforeUpload(file, fileList);
+    }
   };
   var handleRemove = function handleRemove(file) {
     var nextList = _fileList.slice();
@@ -251,7 +249,8 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     showUploadList: showUploadList,
     method: method,
     accept: accept,
-    data: (0, _objectSpread2.default)({}, dataParams)
+    data: (0, _objectSpread2.default)({}, dataParams),
+    name: name
   }, residueProps);
   var baseProps = {
     isView: isView,

package/lib/ProUpload/propsType.d.ts

@@ -18,7 +18,7 @@ export interface fieldNamesProps {
 }
 export interface ProUploadProps {
     /**
-   * @description       拖拽框顶部的内容
+   * @description       顶部的内容(button类型的上传不适用)
    * @default           -
    */
     headerRender?: React.ReactNode | (() => React.ReactNode);

package/lib/global.less

@@ -5,37 +5,52 @@ pre {
 }
 
 * {
-  // 火狐浏览器
-  scrollbar-width: thin;
-  scrollbar-color: #d2d3d7 transparent;
   // ie浏览器
   scrollbar-face-color: #d2d3d7;
   scrollbar-highlight-color: #979797;
   scrollbar-3dlight-color: #979797;
-}
 
-::-webkit-scrollbar  {
-  width: 16px;
-}
+  ::-webkit-scrollbar  {
+    width: 16px;
+    background: transparent;
+  }
 
-// // 滑块
-::-webkit-scrollbar-thumb {
-  background-color: #d2d3d7;
-  background-clip: padding-box;
-  border-color: transparent;
-  border-style: dashed;
-  border-width: 4px;
-  border-radius: 10px;
-  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
-}
+  // 轨道
+  ::-webkit-scrollbar-track {
+    background-color: #fff;
+    border-radius: 10px;
+  }
 
-// 轨道
-::-webkit-scrollbar-track {
-  background-color: transparent;
-  border-radius: 10px;
-}
+  // 悬浮轨道
+  ::-webkit-scrollbar-thumb:hover {
+    background-color: #979797;
+    background-clip: padding-box;
+    border-color: transparent;
+    border-style: dashed;
+    border-width: 4px;
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+  }
+
+  :hover::-webkit-scrollbar-track {
+    background: transparent;
+  }
+
+  :hover::-webkit-scrollbar-thumb {
+    background-color: #d2d3d7;
+    background-clip: padding-box;
+    border-color: transparent;
+    border-style: dashed;
+    border-width: 4px;
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+  }
+
+  :hover::-webkit-scrollbar-thumb:hover {
+    background-color: #979797;
+  }
 
-// 悬浮轨道
-::-webkit-scrollbar-thumb:hover {
-  background-color: #979797;
+  :hover::-webkit-scrollbar-track {
+    background-color: #fff;
+  }
 }

package/lib/locale/zh_CN.js

@@ -95,7 +95,7 @@ var _default = exports.default = {
     edit: '编辑',
     copy: '复制',
     delete: '删除',
-    mulDelete: '删除',
+    mulDelete: '批量删除',
     save: '保存',
     custom: '自定义',
     operation: '操作',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.6",
+  "version": "3.4.8",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",

package/es/ProForm/components/combination/GroupCopy/index.d.ts

@@ -1,10 +0,0 @@
-import React from 'react';
-import { GroupProps } from './propsType';
-/**
- * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
- * 2.
- *
- * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
- */
-declare const GroupCopy: React.FC<GroupProps>;
-export default GroupCopy;

package/es/ProForm/components/combination/GroupCopy/index.js

@@ -1,84 +0,0 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { jsx as _jsx } from "react/jsx-runtime";
-import React, { useMemo } from 'react';
-import { omit } from 'lodash';
-import classnames from 'classnames';
-import { insertSeparator, transformColumns } from './utils';
-import ProForm from '../../../../ProForm';
-import ComRender from './component/ComRender';
-/**
- * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
- * 2.
- *
- * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
- */
-var GroupCopy = function GroupCopy(props) {
-  var children = props.children,
-    className = props.className,
-    _props$space = props.space,
-    space = _props$space === void 0 ? {
-      size: 12
-    } : _props$space,
-    value = props.value,
-    onChange = props.onChange;
-  var contextProps = ProForm.useFieldProps() || {};
-  var names = contextProps.names,
-    name = contextProps.name,
-    form = contextProps.form,
-    namePath = contextProps.namePath,
-    index = contextProps.index;
-  var _value = value && _toConsumableArray(value) || [];
-  var _option = React.useRef([]);
-  // 组合onChange
-  var handleChange = function handleChange(value, option, index) {
-    _value[index] = value;
-    _option.current[index] = option;
-    onChange(_value, _option.current);
-  };
-  var columns = useMemo(function () {
-    var columnsProps = transformColumns({
-      columns: children,
-      name: name,
-      names: names,
-      onChange: handleChange,
-      namePath: namePath,
-      form: form,
-      index: index,
-      value: _value
-    });
-    return insertSeparator(columnsProps, space);
-  }, [name, value, children, space, names, namePath, index]);
-  var _className = classnames(_defineProperty({
-    'pro-group': true,
-    'pro-group-diy-width': columns.some(function (item) {
-      var _item$fieldProps, _item$fieldProps$styl;
-      return item === null || item === void 0 ? void 0 : (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : (_item$fieldProps$styl = _item$fieldProps.style) === null || _item$fieldProps$styl === void 0 ? void 0 : _item$fieldProps$styl.width;
-    }),
-    'pro-group-width-auto': columns.some(function (item) {
-      return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
-    })
-  }, "".concat(className), className));
-  return _jsx("div", {
-    className: _className,
-    children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
-      children: columns.map(function (column) {
-        return _jsx(ComRender, _objectSpread({
-          contextProps: contextProps
-        }, column));
-      })
-    }) : _jsx(_Space, _objectSpread(_objectSpread({
-      align: "start"
-    }, omit(space, ['separator', 'compact'])), {}, {
-      children: columns.map(function (column, index) {
-        return _jsx(ComRender, _objectSpread({
-          contextProps: contextProps
-        }, column));
-      })
-    }))
-  });
-};
-export default GroupCopy;

package/es/ProForm/components/combination/GroupCopy/propsType.d.ts

@@ -1,47 +0,0 @@
-import React from 'react';
-import { FormItemProps, ModalFuncProps, SpaceProps } from 'antd';
-import { FormInstance } from 'antd/es/form/Form';
-import { NamePath } from 'antd/lib/form/interface';
-import { ColumnPropsMap, FunctionArgs, ProFormValueType, ReactiveFunction, ViewType } from '../../../propsType';
-export interface SpaceType extends SpaceProps {
-    /**
-     * 是否紧凑合并
-     */
-    compact?: Boolean;
-    /**
-     * 分隔符
-     */
-    separator?: string | React.ReactNode;
-    /** 间隔距离 */
-    size?: number;
-}
-export interface GroupProps {
-    children?: GroupColumnProps[];
-    space?: SpaceType;
-    className?: string;
-    id?: string;
-    disabled?: boolean;
-    isView?: boolean;
-    value?: any[];
-    onChange?: (value: any[] | null, options?: any[]) => void;
-}
-export type GroupColumnProps<Values = any> = {
-    component?: React.ReactNode | ReactiveFunction<Values, React.ReactNode>;
-    names?: NamePath[];
-    show?: boolean | ReactiveFunction<Values, boolean>;
-    valueType?: ProFormValueType;
-    switchValue?: [any, any];
-    isView?: boolean;
-    viewRender?: (value: any, record: Values, { form, index, namePath, }: {
-        form: FormInstance<Values>;
-        index?: number | undefined;
-        [key: string]: any;
-    }) => React.ReactElement<any, any> | string | undefined | null;
-    viewType?: ViewType;
-    disabled?: boolean | ReactiveFunction<Values, boolean>;
-    trim?: boolean;
-    upperCase?: boolean;
-    toISOString?: boolean;
-    clearNotShow?: boolean;
-    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
-} & ColumnPropsMap & FormItemProps;

package/es/ProForm/components/combination/GroupCopy/utils.d.ts

@@ -1,53 +0,0 @@
-/// <reference types="react" />
-import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
-import { FormInstance } from 'antd';
-import { GroupColumnProps, SpaceType } from './propsType';
-import { ProFormColumnProps, ReactiveFunction } from '../../render/propsType';
-export type EventArgs = any[];
-/**
- * 插入间隔符
- * @param columns 表单配置数组
- * @returns
- */
-export declare const insertSeparator: (columns: GroupColumnProps[], space?: SpaceType) => any[];
-/** 带出event的组件默认取值方法 */
-export declare function defaultGetValueFromEvent(valuePropName: string, ...args: EventArgs): any;
-/** 转换names */
-export declare const transformNamesString: (arr: (string | string[])[]) => (string | string[])[];
-interface Params {
-    form?: FormInstance;
-    index?: number;
-    type?: string;
-    namePath?: InternalNamePath;
-    disabled?: boolean | ReactiveFunction<any, boolean>;
-    show?: boolean | ReactiveFunction<any, boolean>;
-    component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
-    fieldProps?: boolean | ReactiveFunction<any, boolean>;
-    name?: NamePath;
-}
-/** 计算响应式参数的值 */
-export declare const getReactiveProps: (params: Params) => {
-    disabled: boolean;
-    show: boolean;
-    component: any;
-    fieldProps: boolean;
-};
-type ValueTypeGetterParams = Pick<ProFormColumnProps, 'valueType' | 'switchValue' | 'toISOString'> & {
-    type?: any;
-    mode?: string;
-};
-/** 获取当前字段的转换函数 */
-export declare const getValueTypeTrans: (params: ValueTypeGetterParams) => any;
-interface ColumnsTransformerParams {
-    columns: GroupColumnProps[];
-    name?: NamePath;
-    names?: NamePath[];
-    value?: any[];
-    onChange: any;
-    namePath?: InternalNamePath;
-    form: FormInstance;
-    index?: number;
-}
-/** 转换columns */
-export declare const transformColumns: (params: ColumnsTransformerParams) => any[];
-export {};