@zat-design/sisyphus-react 3.6.7 → 3.6.8-beta.10

package/lib/ProEditTable/components/RcTable/DraggableTable.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,14 +10,112 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
-var _react = require("react");
-var _index = require("../index");
-var _excluded = ["tableProps", "draggableProps"];
-var DraggableTable = function DraggableTable(_ref) {
+var _react = _interopRequireWildcard(require("react"));
+var _core = require("@dnd-kit/core");
+var _sortable = require("@dnd-kit/sortable");
+var _utilities = require("@dnd-kit/utilities");
+var _ProIcon = _interopRequireDefault(require("../../../ProIcon"));
+var _excluded = ["disabled", "children"],
+  _excluded2 = ["tableProps", "draggableProps"];
+var Row = function Row(props) {
+  var disabled = props.disabled,
+    children = props.children,
+    restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var data = (0, _sortable.useSortable)({
+    id: props['data-row-key'],
+    disabled: disabled
+  });
+  var attributes = data.attributes,
+    listeners = data.listeners,
+    setNodeRef = data.setNodeRef,
+    transform = data.transform,
+    transition = data.transition,
+    isDragging = data.isDragging;
+  var style = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.style), {}, {
+    transform: _utilities.CSS.Transform.toString(transform && (0, _objectSpread2.default)((0, _objectSpread2.default)({}, transform), {}, {
+      scaleY: 1
+    })),
+    transition: transition
+  }, isDragging ? {
+    position: 'relative',
+    zIndex: 2
+  } : {});
+  return (0, _jsxRuntime.jsx)("tr", (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
+    ref: setNodeRef,
+    style: style
+  }, attributes), {}, {
+    children: _react.default.Children.map(children, function (child) {
+      if (child.key === 'RC_TABLE_KEY' && !disabled) {
+        var _restProps$dataRowD;
+        var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
+          render = _ref.render,
+          record = _ref.record,
+          renderIndex = _ref.renderIndex;
+        var isDrag = restProps['data-row-draggable'] ? (_restProps$dataRowD = restProps['data-row-draggable']) === null || _restProps$dataRowD === void 0 ? void 0 : _restProps$dataRowD.call(restProps, record) : true;
+        return /*#__PURE__*/_react.default.cloneElement(child, {
+          children: (0, _jsxRuntime.jsxs)("span", {
+            className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
+            children: [isDrag ? (0, _jsxRuntime.jsx)(_ProIcon.default, (0, _objectSpread2.default)({
+              className: "drag-icon",
+              style: {
+                touchAction: 'none',
+                cursor: disabled ? 'no-drop' : 'move'
+              },
+              type: "drag",
+              size: 20
+            }, listeners)) : (0, _jsxRuntime.jsx)(_ProIcon.default, {
+              size: 20
+            }), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+          })
+        });
+      }
+      return child;
+    })
+  }));
+};
+var DndWrapper = function DndWrapper(_ref2) {
   var _value$;
-  var tableProps = _ref.tableProps,
-    draggableProps = _ref.draggableProps,
-    resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var draggable = _ref2.draggable,
+    value = _ref2.value,
+    onChange = _ref2.onChange,
+    onDrag = _ref2.onDrag,
+    disabled = _ref2.disabled,
+    children = _ref2.children;
+  var onDragEnd = function onDragEnd(event) {
+    var active = event.active,
+      over = event.over;
+    if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
+      if (onDrag) {
+        var nextList = onDrag(event, value);
+        onChange(nextList);
+        return;
+      }
+      var activeIndex = value.findIndex(function (i) {
+        return i.rowKey === active.id;
+      });
+      var overIndex = value.findIndex(function (i) {
+        return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+      });
+      var nextValue = (0, _sortable.arrayMove)(value, activeIndex, overIndex);
+      onChange(nextValue);
+    }
+  };
+  return draggable && !disabled ? (0, _jsxRuntime.jsx)(_core.DndContext, {
+    onDragEnd: onDragEnd,
+    children: (0, _jsxRuntime.jsx)(_sortable.SortableContext, {
+      items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
+        return i.rowKey;
+      }) : [],
+      strategy: _sortable.verticalListSortingStrategy,
+      children: children
+    })
+  }) : children;
+};
+var DraggableTable = function DraggableTable(_ref3) {
+  var _value$2;
+  var tableProps = _ref3.tableProps,
+    draggableProps = _ref3.draggableProps,
+    resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
   var value = tableProps.value,
     headerRender = tableProps.headerRender,
     tableRef = tableProps.tableRef,
@@ -39,7 +138,7 @@ var DraggableTable = function DraggableTable(_ref) {
   var onChange = draggableProps.onChange,
     onDrag = draggableProps.onDrag,
     draggable = draggableProps.draggable;
-  return (0, _jsxRuntime.jsxs)(_index.DndWrapper, {
+  return (0, _jsxRuntime.jsxs)(DndWrapper, {
     value: value,
     onChange: onChange,
     onDrag: onDrag,
@@ -51,21 +150,21 @@ var DraggableTable = function DraggableTable(_ref) {
     }) : null, (0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       ref: tableRef,
       className: className,
-      dataSource: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value : undefined,
+      dataSource: (value === null || value === void 0 ? void 0 : (_value$2 = value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.rowKey) ? value : undefined,
       columns: columns,
       rowSelection: renderRowSelection(),
       rowClassName: rowClassName,
       components: {
         body: {
-          row: _index.Row
+          row: Row
         }
       },
       onRow: function onRow() {
         return {
           disabled: disabled || virtualKey && !!editingKeys.length,
           'data-hide': isHideCheckBox,
-          onClick: function onClick() {},
-          rowDraggable: rowDraggable
+          'data-row-draggable': rowDraggable,
+          onClick: function onClick() {}
         };
       }
     }, resetProps), {}, {

package/lib/ProEditTable/components/RcTable/VirtualTable.js

@@ -154,8 +154,8 @@ var VirtualTable = function VirtualTable(_ref) {
         return {
           disabled: disabled || virtualKey && !!editingKeys.length,
           'data-hide': isHideCheckBox,
-          onClick: function onClick() {},
-          rowDraggable: rowDraggable
+          'data-row-draggable': rowDraggable,
+          onClick: function onClick() {}
         };
       }
     }, resetProps), {}, {

package/lib/ProEditTable/components/RenderField/index.js

@@ -30,7 +30,7 @@ var _useListChanged3 = require("../../../ProForm/utils/useListChanged");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm", "validateTrigger"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
@@ -63,8 +63,6 @@ var RenderField = function RenderField(_ref) {
     className = column.className,
     trim = column.trim,
     confirm = column.confirm,
-    _column$validateTrigg = column.validateTrigger,
-    validateTrigger = _column$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSumbit'] : _column$validateTrigg,
     resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -82,6 +80,8 @@ var RenderField = function RenderField(_ref) {
     _config$originalDiffT = config.originalDiffTip,
     originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
     rowDisabled = config.rowDisabled,
+    _config$validateTrigg = config.validateTrigger,
+    validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
     otherProps = config.otherProps;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
@@ -163,9 +163,7 @@ var RenderField = function RenderField(_ref) {
   // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
   var formItemChildProps = (0, _objectSpread2.default)({}, _fieldProps);
   // 允许formItem的属性放在column最外层
-  var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), internalRule), {}, {
-    validateTrigger: validateTrigger
-  });
+  var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), internalRule);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     valueType = 'switch';
@@ -558,7 +556,7 @@ var RenderField = function RenderField(_ref) {
   var FormItem = null;
   FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     validateFirst: true
-  }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+  }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell'])), {}, {
     className: _className,
     name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
     children: ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) ? (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {

package/lib/ProEditTable/components/index.d.ts

@@ -1,4 +1,3 @@
-export { default as DndWrapper, Row } from './DndWrapper';
 export { default as RenderField } from './RenderField';
 export { default as Validator } from './Validator';
 export { default as Summary } from './Summary';

package/lib/ProEditTable/components/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,12 +10,6 @@ Object.defineProperty(exports, "ActionButton", {
     return _ActionButton.default;
   }
 });
-Object.defineProperty(exports, "DndWrapper", {
-  enumerable: true,
-  get: function get() {
-    return _DndWrapper.default;
-  }
-});
 Object.defineProperty(exports, "RenderField", {
   enumerable: true,
   get: function get() {
@@ -29,12 +22,6 @@ Object.defineProperty(exports, "RenderToolbar", {
     return _RenderToolbar.default;
   }
 });
-Object.defineProperty(exports, "Row", {
-  enumerable: true,
-  get: function get() {
-    return _DndWrapper.Row;
-  }
-});
 Object.defineProperty(exports, "Summary", {
   enumerable: true,
   get: function get() {
@@ -47,7 +34,6 @@ Object.defineProperty(exports, "Validator", {
     return _Validator.default;
   }
 });
-var _DndWrapper = _interopRequireWildcard(require("./DndWrapper"));
 var _RenderField = _interopRequireDefault(require("./RenderField"));
 var _Validator = _interopRequireDefault(require("./Validator"));
 var _Summary = _interopRequireDefault(require("./Summary"));

package/lib/ProEditTable/propsType.d.ts

@@ -105,7 +105,6 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     hiddenNames?: NamePath[] | NamePath[][];
     rules?: ProRule[] | RulesFn<T>;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
-    validateTrigger?: string | string[];
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
@@ -276,4 +275,5 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
     ref?: any;
     actionDirection?: 'vertical' | 'horizontal';
+    validateTrigger?: string | string[];
 }

package/lib/ProForm/components/combination/ProCascader/index.js

@@ -260,7 +260,8 @@ var ProCascader = function ProCascader(props) {
       disabled: disabled,
       displayRender: displayRender,
       showSearch: {
-        filter: handlefilter
+        filter: handlefilter,
+        limit: 1000
       },
       onChange: handleChange
     }, (0, _lodash.omit)(otherProps, 'otherProps'))), hasDetail && (tooltip && disabled && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {

package/lib/ProForm/components/combination/ProModalSelect/index.js

@@ -138,7 +138,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       }
     })),
-    run = _useRequestList.run;
+    run = _useRequestList.run,
+    selectLoading = _useRequestList.loading;
   var _useRequestList2 = (0, _useRequestList3.default)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
       withPagination: withPagination,
       transformParams: transformParams,
@@ -681,6 +682,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       optionRender: optionRender,
       scrollFollowParent: false,
       mode: isMultiple ? 'multiple' : undefined,
+      notFoundContent: selectLoading ? (0, _jsxRuntime.jsx)(_antd.Spin, {
+        size: "small"
+      }) : null,
       onFocus: function onFocus() {
         if (useRequest) {
           var _useRequest$options9;

package/lib/ProForm/components/combination/ProModalSelect/style/index.less

@@ -118,7 +118,9 @@
         }
       }
     }
-    
+    .@{ant-prefix}-btn-compact-last-item{
+      border-left: none;
+    }
   }
 
   .@{ant-prefix}-input-group-addon {
@@ -132,3 +134,13 @@
     }
   }
 }
+
+// 报错信息
+.@{ant-prefix}-form-item-has-error{
+  .pro-modal-select{
+    .ant-btn-compact-last-item{
+      color: @zaui-danger;
+      border-color: @zaui-danger;
+    }
+  }
+}

package/lib/ProSelect/index.js

@@ -21,15 +21,14 @@ var _ = require("..");
 var _locale = _interopRequireDefault(require("../locale"));
 var _utils = require("./utils");
 require("./index.less");
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView", "viewportReady"];
+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 _selectProps$showCode, _locale$ProSelect;
   var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
-    showCodeName = _ref.showCodeName,
-    gViewportReady = _ref.viewportReady;
+    showCodeName = _ref.showCodeName;
   var label = 'label';
   var code = 'value';
   if (proSelectFieldNames && Object.keys(proSelectFieldNames).length) {
@@ -56,18 +55,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
     isViewPro = props.isView,
-    __viewportReady = props.viewportReady,
     selectProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var viewportReady = __viewportReady || gViewportReady;
-  /** 是否在可视区域出现过 */
-  var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    viewFlag = _useState2[0],
-    setViewFlag = _useState2[1];
-  var refSelect1 = (0, _react.useRef)();
-  var _useInViewport = (0, _ahooks.useInViewport)(refSelect1),
-    _useInViewport2 = (0, _slicedToArray2.default)(_useInViewport, 1),
-    inViewport = _useInViewport2[0];
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
   var value = props.value;
   var _ref2 = _.ProForm.useFieldProps() || {},
@@ -78,15 +66,15 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     code = fieldNames.value;
     label = fieldNames.label;
   }
-  var _useState3 = (0, _react.useState)(dataSource || []),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    selectList = _useState4[0],
-    setSelectList = _useState4[1];
+  var _useState = (0, _react.useState)(dataSource || []),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    selectList = _useState2[0],
+    setSelectList = _useState2[1];
   // 用来控制只有第一次才会设置 defaultOne 属性、🔒
-  var _useState5 = (0, _react.useState)(false),
-    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    isDefaultOne = _useState6[0],
-    setIsDefaultOne = _useState6[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    isDefaultOne = _useState4[0],
+    setIsDefaultOne = _useState4[1];
   var OptionRender = optionRender;
   var defaultOnSuccessFun = function defaultOnSuccessFun(res) {
     var _res$status = res.status,
@@ -147,16 +135,8 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     if (manual) {
       return;
     }
-    if (viewportReady && !viewFlag) {
-      return;
-    }
     fetchFunction.run(defaultParams);
-  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue, viewFlag]);
-  (0, _react.useEffect)(function () {
-    if (inViewport && !viewFlag && viewportReady) {
-      setViewFlag(true);
-    }
-  }, [inViewport]);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
   // disable默认值
   if (defaultDisableValue) {
     return (0, _jsxRuntime.jsx)("span", {
@@ -302,13 +282,9 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     });
   }
   return (0, _jsxRuntime.jsx)("div", {
-    ref: refSelect1,
     style: props.style,
-    className: "ant-select-compact-item-div",
-    children: (0, _jsxRuntime.jsx)(_antd.Select
-    // id={refSelect1.current}
-    , (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      // id={refSelect1.current}
+    className: "pro-select",
+    children: (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,
       showArrow: true,
@@ -328,7 +304,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
       getPopupContainer: function getPopupContainer(trigger) {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, (0, _lodash.omit)((0, _lodash.cloneDeep)(selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange'])), {}, {
+    }, (0, _lodash.omit)((0, _objectSpread2.default)({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange'])), {}, {
       value: transformValue(),
       children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
         return (0, _jsxRuntime.jsx)(Option, {

package/lib/ProSelect/index.less

@@ -9,9 +9,9 @@
   text-overflow: ellipsis;
   word-break: keep-all;
 }
-.ant-select-compact-item-div {
+.pro-select {
   width: 100%;
-  >.ant-select {
+  > .ant-select {
     width: 100%;
   }
 }

package/lib/ProStep/style/index.less

@@ -8,7 +8,7 @@
 .pro-step {
   position: fixed;
   right: 0;
-  z-index: 101;
+  z-index: 999;
   min-width: 48px;
   min-height: 48px;
   overflow-x: hidden;

package/lib/ProTable/{utils.d.ts → components/FormatColumn/index.d.ts}

@@ -1,7 +1,6 @@
 import React from 'react';
-import { ProTableColumn } from './propsType';
+import { ProTableColumn } from '../../propsType';
 export declare const formatColumn: (column: ProTableColumn, originalObj: any, dataSourceObj: any, rowKey: any) => void;
-export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
 /**
  * 查找最近的父级className
  * @param element 当前node节点
@@ -10,12 +9,3 @@ export declare const getColumnDataIndex: (dataIndex: string | string[]) => strin
  * @returns ReactNode 父级element
  */
 export declare const getParentElement: (element: any, name: any, type?: string) => React.ReactNode;
-/**
- * 判断数据是否为Response<List<any>>结构
- * @param data { [key: string]: any } 需要判断数据
- * @returns boolean 是否
- */
-export declare const isListResult: (data: {
-    [key: string]: any;
-}) => boolean;
-export declare const getRowKey: (rowKey: any, record: any) => any;

package/lib/ProTable/{utils.js → components/FormatColumn/index.js}

@@ -4,50 +4,19 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isListResult = exports.getRowKey = exports.getParentElement = exports.getColumnDataIndex = exports.formatColumn = void 0;
+exports.getParentElement = exports.formatColumn = void 0;
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _moment15 = _interopRequireDefault(require("moment"));
+var _classnames = _interopRequireDefault(require("classnames"));
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
-var _classnames = _interopRequireDefault(require("classnames"));
-var _getEnumLabel = _interopRequireDefault(require("../ProEnum/utils/getEnumLabel"));
-var _TooltipTitle = _interopRequireDefault(require("./components/TooltipTitle"));
-var _RenderColumn = _interopRequireDefault(require("./components/RenderColumn"));
-var _ProForm = _interopRequireDefault(require("../ProForm"));
-/* eslint-disable react-hooks/rules-of-hooks */
-
-/**
- * 获取小数点后的位数
- * @param num 数字
- * @returns 位数
- */
-var getDecimalDigits = function getDecimalDigits() {
-  var num = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-  var match = Number(num).toString().match(/\.(\d+)/);
-  return match ? match[1].length : 0;
-};
-/**
- * @description: 获取初始值
- * @author: xiangchengli
- * @param {any} rowKey
- * @param any value
- * @param any originalObj
- * @param {any} dataIndex
- * @return {any}
- */
-var getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
-  if (!originalObj) {
-    return undefined;
-  }
-  var originalRecord = (0, _lodash.get)(originalObj, (0, _lodash.get)(record, rowKey));
-  var originalValue = (0, _lodash.get)(originalRecord, dataIndex);
-  if (!(0, _lodash.isEqual)(originalValue, value)) {
-    return originalValue;
-  }
-  return undefined;
-};
+var _TooltipTitle = _interopRequireDefault(require("../TooltipTitle"));
+var _RenderColumn = _interopRequireDefault(require("../RenderColumn"));
+var _utils2 = require("../../utils");
+var _getEnumLabel = _interopRequireDefault(require("../../../ProEnum/utils/getEnumLabel"));
+var _ProForm = _interopRequireDefault(require("../../../ProForm"));
 var formatColumn = exports.formatColumn = function formatColumn(column, originalObj, dataSourceObj, rowKey) {
   var title = column.title,
     valueType = column.valueType,
@@ -113,10 +82,10 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     column.render = function (value, record, index) {
       var multiple = valueType === 'percentage' ? 100 : 1000;
       var realValue = _utils.tools.calc(Number(value !== null && value !== void 0 ? value : 0), '*', multiple);
-      var renderValue = getDecimalDigits(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var renderValue = (0, _utils2.getDecimalDigits)(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
+      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       var originalRealValue = _utils.tools.calc(Number(originalValue || null), '*', multiple);
-      var originalRenderValue = getDecimalDigits(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
+      var originalRenderValue = (0, _utils2.getDecimalDigits)(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
       if (!originalValue && originalValue !== 0) {
         originalRenderValue = '-';
       }
@@ -144,7 +113,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     column.render = function (value, record, index) {
       var valueStr = valueTypePrecision ? "".concat(Number(value).toFixed(valueTypePrecision)) : "".concat(value);
       var renderValue = valueStr.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       var originalRealValue = valueTypePrecision ? "".concat(Number(originalValue).toFixed(valueTypePrecision)) : "".concat(originalValue);
       var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
       if (!originalValue && originalValue !== 0) {
@@ -173,7 +142,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     column.render = function (value, record, index) {
       var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
       var renderValue = (_moment = (0, _moment15.default)(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = (_moment2 = (0, _moment15.default)(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
       switch (valueType) {
         case 'date':
@@ -226,7 +195,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     column.render = function (value, record, index) {
       var realCode = typeof code === 'function' ? code(value, record) : code;
       var renderValue = (0, _getEnumLabel.default)(realCode, value, valueType === 'enumCodeName');
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = (0, _getEnumLabel.default)(realCode, originalValue, valueType === 'enumCodeName');
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
@@ -247,7 +216,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
   } else if (precision || prefix || suffix) {
     column.render = function (value, record, index) {
       var renderValue = value === 'number' ? value.toFixed(precision) : value;
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
@@ -275,7 +244,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     column.render = function (value, record, index) {
       var _realValue$filter;
       var realValue = transform ? transform(value, record) : value;
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       var originalRealValue = transform ? transform(originalValue, record) : originalValue;
       var isEmpty = !realValue || Array.isArray(realValue) && (realValue === null || realValue === void 0 ? void 0 : (_realValue$filter = realValue.filter(function (item) {
         return !!item;
@@ -330,7 +299,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     };
   } else if (ellipsis) {
     column.render = function (value, record, index) {
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       if (!value && value !== 0 && value === originalValue) {
         return '-';
       }
@@ -351,7 +320,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     };
   } else {
     column.render = function (value, record, index) {
-      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
+      var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
@@ -373,9 +342,6 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     };
   }
 };
-var getColumnDataIndex = exports.getColumnDataIndex = function getColumnDataIndex(dataIndex) {
-  return typeof dataIndex === 'string' ? dataIndex : dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.join('-');
-};
 /**
  * 查找最近的父级className
  * @param element 当前node节点
@@ -399,21 +365,4 @@ var getParentElement = exports.getParentElement = function getParentElement(elem
   };
   _searchDom(element, name, type = 'className');
   return result;
-};
-/**
- * 判断数据是否为Response<List<any>>结构
- * @param data { [key: string]: any } 需要判断数据
- * @returns boolean 是否
- */
-var isListResult = exports.isListResult = function isListResult(data) {
-  return data.hasOwnProperty('total') && data.hasOwnProperty('list');
-};
-var getRowKey = exports.getRowKey = function getRowKey(rowKey, record) {
-  // 默认取id
-  var key = record.rowKey || 'id';
-  if (rowKey) {
-    var _ref;
-    key = (_ref = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref !== void 0 ? _ref : key;
-  }
-  return key;
 };