@zat-design/sisyphus-react 3.0.16-beta.4 → 3.1.4

package/es/ProEditTable/utils/index.js

@@ -11,10 +11,12 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
   _excluded2 = ["title", "icon"];
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
-import { cloneDeep, isArray, isEmpty, isEqual } from 'lodash';
+import { cloneDeep, isArray, isBoolean, isEqual } from 'lodash';
 import classnames from 'classnames';
 import { ReactSVG } from 'react-svg';
+import { tools } from '@zat-design/utils';
 import { actions, defaultBtnNameMap, defaultSingleActionKeys, defaultMultipleActionKeys, defaultEditingActionKeys } from './config';
 import { customValidate, getNamePath, splitNames } from './tools';
 import ProTooltip from '../../ProTooltip';
@@ -28,7 +30,10 @@ var getActionColumn = function getActionColumn(config) {
     virtualKey = config.virtualKey,
     validateKeys = config.validateKeys,
     actionWidth = config.actionWidth,
-    actionProps = config.actionProps;
+    actionProps = config.actionProps,
+    page = config.page;
+  var pageNum = tools.calc(page.pageNum, '-', 1);
+  var firstIndex = tools.calc(pageNum, '*', page.pageSize);
   // actionProps配置为false 默认不插入
   if (actionProps === false || disabled) {
     return false;
@@ -69,44 +74,49 @@ var getActionColumn = function getActionColumn(config) {
     action.label = label !== null && label !== void 0 ? label : defaultBtnNameMap[type];
     action.show = show !== null && show !== void 0 ? show : true;
     action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
-    action.onClick = /*#__PURE__*/function () {
+    action.onEvent = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
-        var _form$getFieldValue, _yield$action$onHandl, _action$onHandle;
-        var rowName, _record, result;
+        var _form$getFieldValue, _yield$onEvent;
+        var rowName, _record, onEvent, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              index = tools.calc(firstIndex, '+', index);
               rowName = [].concat(_toConsumableArray(virtualRowName), [index]);
               if (!(type === 'save')) {
-                _context.next = 4;
+                _context.next = 5;
                 break;
               }
-              _context.next = 4;
+              _context.next = 5;
               return customValidate(validateKeys, form, rowName);
-            case 4:
+            case 5:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
-              _context.next = 7;
-              return action === null || action === void 0 ? void 0 : (_action$onHandle = action.onHandle) === null || _action$onHandle === void 0 ? void 0 : _action$onHandle.call(action, _record, index);
-            case 7:
-              _context.t1 = _yield$action$onHandl = _context.sent;
+              onEvent = onClick || onHandle;
+              _context.next = 9;
+              return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, index, {
+                form: form,
+                namePath: virtualRowName
+              });
+            case 9:
+              _context.t1 = _yield$onEvent = _context.sent;
               _context.t0 = _context.t1 !== null;
               if (!_context.t0) {
-                _context.next = 11;
+                _context.next = 13;
                 break;
               }
-              _context.t0 = _yield$action$onHandl !== void 0;
-            case 11:
+              _context.t0 = _yield$onEvent !== void 0;
+            case 13:
               if (!_context.t0) {
-                _context.next = 15;
+                _context.next = 17;
                 break;
               }
-              _context.t2 = _yield$action$onHandl;
-              _context.next = 16;
+              _context.t2 = _yield$onEvent;
+              _context.next = 18;
               break;
-            case 15:
+            case 17:
               _context.t2 = true;
-            case 16:
+            case 18:
               result = _context.t2;
               if (result && type !== 'custom') {
                 actions[type](_objectSpread(_objectSpread({}, config), {}, {
@@ -117,7 +127,7 @@ var getActionColumn = function getActionColumn(config) {
                   validateKeys: validateKeys
                 }));
               }
-            case 18:
+            case 20:
             case "end":
               return _context.stop();
           }
@@ -136,18 +146,19 @@ var getActionColumn = function getActionColumn(config) {
     fixed: 'right',
     width: actionWidth || (virtualKey ? '120px' : '60px'),
     render: function render(text, record, index) {
-      return /*#__PURE__*/React.createElement(_Space, {
-        size: "middle"
-      }, actionBtns.map(function (btnConfig) {
-        return /*#__PURE__*/React.createElement(React.Fragment, {
-          key: "".concat(record.rowKey, "-").concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type)
-        }, /*#__PURE__*/React.createElement(ActionButton, _objectSpread({}, {
-          record: record,
-          index: index,
-          config: config,
-          btnConfig: btnConfig
-        })));
-      }));
+      return _jsx(_Space, {
+        size: "middle",
+        children: actionBtns.map(function (btnConfig) {
+          return _jsx(React.Fragment, {
+            children: _jsx(ActionButton, _objectSpread({}, {
+              record: record,
+              index: index,
+              config: config,
+              btnConfig: btnConfig
+            }))
+          }, "".concat(record.rowKey, "-").concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type));
+        })
+      });
     }
   };
 };
@@ -158,12 +169,10 @@ var getActionColumn = function getActionColumn(config) {
  * render不对外暴露formItem，能自定渲染的尽是输入组件或者显示组件本身
  * @param columns 表格配置数据
  * @param config
- * @param rowSelection 行选择数据
  */
 export var transformColumns = function transformColumns() {
   var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var config = arguments.length > 1 ? arguments[1] : undefined;
-  var rowSelection = arguments.length > 2 ? arguments[2] : undefined;
   var mode = config.mode,
     form = config.form,
     name = config.name,
@@ -173,12 +182,14 @@ export var transformColumns = function transformColumns() {
     virtualKey = config.virtualKey,
     requiredAlign = config.requiredAlign,
     isView = config.isView,
-    draggable = config.draggable,
     cacheMap = config.cacheMap,
-    setState = config.setState;
+    setState = config.setState,
+    page = config.page;
   var isCell = mode === 'cell';
   var _columns = _toConsumableArray(columns);
   var _cacheMap = _objectSpread({}, cacheMap.current);
+  var pageNum = tools.calc(page.pageNum, '-', 1);
+  var firstIndex = tools.calc(pageNum, '*', page.pageSize);
   _columns.forEach(function (item, index) {
     var label = item.label,
       names = item.names,
@@ -189,36 +200,46 @@ export var transformColumns = function transformColumns() {
       dataIndex = item.dataIndex,
       ellipsis = item.ellipsis,
       key = item.key,
-      tooltip = item.tooltip;
+      tooltip = item.tooltip,
+      suffix = item.suffix;
     // column设置label时，权重最高
     var columnTitle = label || title;
-    item.originTitle = columnTitle;
-    if (tooltip) {
-      var _ref2 = tooltip || {},
-        tooltipTitle = _ref2.title,
-        icon = _ref2.icon,
-        resetProps = _objectWithoutProperties(_ref2, _excluded2);
-      item.title = /*#__PURE__*/React.createElement("span", {
-        className: "pro-edit-table-tooltip"
-      }, columnTitle, /*#__PURE__*/React.createElement(_Tooltip, _objectSpread({
-        title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
-      }, resetProps), icon ? /*#__PURE__*/React.cloneElement(icon, {
-        className: 'icon-tip'
-      }) : /*#__PURE__*/React.createElement(ReactSVG, {
-        className: "icon-tip",
-        src: tipSvg
-      })));
-    } else {
-      item.title = columnTitle;
+    if (typeof columnTitle === 'string') {
+      item.originTitle = columnTitle;
+      if (tooltip) {
+        var _ref2 = tooltip || {},
+          tooltipTitle = _ref2.title,
+          icon = _ref2.icon,
+          resetProps = _objectWithoutProperties(_ref2, _excluded2);
+        item.title = _jsxs("span", {
+          className: "pro-edit-table-title pro-edit-table-tooltip",
+          children: [columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
+            title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
+          }, resetProps), {}, {
+            children: icon ? /*#__PURE__*/React.cloneElement(icon, {
+              className: 'icon-tip'
+            }) : _jsx(ReactSVG, {
+              className: "icon-tip",
+              src: tipSvg
+            })
+          })), suffix]
+        });
+      } else {
+        item.title = _jsxs("span", {
+          className: "pro-edit-table-title",
+          children: [columnTitle, suffix]
+        });
+      }
     }
     // column设置name时，权重最高
     var columnName = (item === null || item === void 0 ? void 0 : item.name) || dataIndex || key;
     item.dataIndex = columnName;
     item.key = columnName;
+    var required = isBoolean(item.required) ? item.required : false;
     if (typeof item.required === 'function') {
       var namePath = getNamePath(name, virtualKey);
-      var rowData = form.getFieldValue([].concat(_toConsumableArray(namePath), [index]));
-      item.required = item.required(rowData[columnName], rowData, {
+      var rowData = form.getFieldValue([].concat(_toConsumableArray(namePath), [index])) || {};
+      required = item.required(rowData[columnName], rowData, {
         form: form,
         index: index,
         namePath: [].concat(_toConsumableArray(namePath), [index])
@@ -227,7 +248,7 @@ export var transformColumns = function transformColumns() {
     // 样式处理
     item.className = classnames(_defineProperty({
       'is-hidden': hidden,
-      'is-required': item.required || labelRequired,
+      'is-required': required || labelRequired,
       'is-required-right': requiredAlign === 'right',
       'is-required-left': requiredAlign === 'left'
     }, className, className));
@@ -262,8 +283,9 @@ export var transformColumns = function transformColumns() {
         namePath = getNamePath(name, virtualKey);
       }
       var columnNamePath = isArray(columnName) ? columnName : [columnName];
+      index = tools.calc(firstIndex, '+', index);
       // 设置单元格formItem的namePath
-      var cellName = [].concat(_toConsumableArray(namePath), [index], _toConsumableArray(columnNamePath));
+      var cellName = columnName ? [].concat(_toConsumableArray(namePath), [index], _toConsumableArray(columnNamePath)) : [].concat(_toConsumableArray(namePath), [index]);
       var _text = text;
       // 当传入组合组件时，name需要重新组合一下，以防names中key与dataIndex重叠
       if (names === null || names === void 0 ? void 0 : names.length) {
@@ -277,40 +299,41 @@ export var transformColumns = function transformColumns() {
         });
       }
       if (!isEditing && ellipsis) {
-        return /*#__PURE__*/React.createElement(ProTooltip, {
+        return _jsx(ProTooltip, {
           text: _text,
           line: 1,
           isResponsiveWidth: true
         });
       }
       var cellClassName;
-      var isCanEdit = isCell && !record["$".concat(columnName, "Disabled")] && item.isEditable !== false;
+      var isCanEdit = isCell && !record["".concat(columnName, "-Disabled")] && item.isEditable !== false;
       // 单元格编辑场景下，需要将所有单元格设置为不可编辑状态，当鼠标hover时，展示输出框。点击可修改
       if (isCanEdit) {
-        record.isView = true;
+        record['is-view'] = true;
         // 样式处理
         cellClassName = classnames({
           'is-cell': !isEqual(cellNamePath, cellName)
         });
       }
       // 单行多行交互有较大差异
-      return /*#__PURE__*/React.createElement("div", {
+      return _jsx("div", {
         className: cellClassName,
         onClick: function onClick() {
           isCanEdit && setState({
             cellNamePath: cellName
           });
-        }
-      }, /*#__PURE__*/React.createElement(RenderField, {
-        text: _text,
-        record: record,
-        index: index,
-        column: item,
-        config: _objectSpread(_objectSpread({}, config), {}, {
-          cellName: cellName,
-          isEditing: isEditing // 是否正在编辑
+        },
+        children: _jsx(RenderField, {
+          text: _text,
+          record: record,
+          index: index,
+          column: item,
+          config: _objectSpread(_objectSpread({}, config), {}, {
+            cellName: cellName,
+            isEditing: isEditing // 是否正在编辑
+          })
         })
-      }));
+      });
     };
 
     item.render = _render;
@@ -338,14 +361,6 @@ export var transformColumns = function transformColumns() {
 
     actionColumn && _columns.push(actionColumn);
   }
-  if (draggable && !disabled && !isView) {
-    _columns.unshift({
-      key: 'SORT',
-      title: '',
-      className: "".concat(isEmpty(rowSelection) ? '' : 'is-drag'),
-      width: 0
-    });
-  }
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
     Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {

package/es/ProEditTable/utils/transform.d.ts

@@ -1,5 +1,5 @@
 declare const _default: {
-    RangePicker: () => import("@zat-design-pro-component/utils/dist/esm/transforms/propTypes").Transform<any>;
-    DatePicker: () => import("@zat-design-pro-component/utils/dist/esm/transforms/propTypes").Transform<any>;
+    RangePicker: () => import("@zat-design/utils/dist/esm/transforms/propTypes").Transform<any>;
+    DatePicker: () => import("@zat-design/utils/dist/esm/transforms/propTypes").Transform<any>;
 };
 export default _default;

package/es/ProEditTable/utils/transform.js

@@ -1,4 +1,4 @@
-import { transforms } from '@zat-design-pro-component/utils';
+import { transforms } from '@zat-design/utils';
 var transformDate = transforms.transformDate;
 export default {
   RangePicker: function RangePicker() {

package/es/ProEnum/components/Tag.d.ts

@@ -0,0 +1,7 @@
+import { ProEnum } from '../propsType';
+interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
+    fieldValue: string;
+    fieldLabel: string;
+}
+declare const ProEnumTag: (props: Props) => JSX.Element;
+export default ProEnumTag;

package/es/ProEnum/components/Tag.js

@@ -0,0 +1,40 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { jsx as _jsx } from "react/jsx-runtime";
+import classNames from 'classnames';
+import { useEffect, useState } from 'react';
+var ProEnumTag = function ProEnumTag(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    dataSource = props.dataSource,
+    fieldValue = props.fieldValue,
+    fieldLabel = props.fieldLabel;
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    checked = _useState2[0],
+    setValue = _useState2[1];
+  useEffect(function () {
+    setValue(value);
+  }, [value]);
+  var handleClick = function handleClick(val) {
+    setValue(val);
+    onChange === null || onChange === void 0 ? void 0 : onChange(val);
+  };
+  if (dataSource.length === 0) {
+    return _jsx("span", {
+      children: "-"
+    });
+  }
+  return _jsx("div", {
+    className: "pro-enum-tag-root",
+    children: dataSource.map(function (item) {
+      return _jsx("div", {
+        onClick: function onClick() {
+          return handleClick(item[fieldValue]);
+        },
+        className: classNames('pro-enum-tag-item', checked === item[fieldValue] ? 'pro-enum-tag-item-selected' : ''),
+        children: item[fieldLabel]
+      }, item[fieldValue]);
+    })
+  });
+};
+export default ProEnumTag;

package/es/ProEnum/hooks/useEnum.d.ts

@@ -0,0 +1,21 @@
+import { DataOption } from '../propsType';
+/**
+ * input code output [DataOption[],getEnumLabel]
+ * @param code
+ * const [options,fn] = useEnum("code")
+ */
+declare function useEnum(code: string): [DataOption[], (val: string, showCodeName?: boolean) => string];
+/**
+ * input codes output { code1:DataOption[],code2:DataOption[] }
+ * @param codes
+ * const dicsMap = useEnum(["code1","code2"])
+ */
+declare function useEnum(codes: string[]): Record<string, DataOption[]>;
+/**
+ * input code、value output label
+ * @param code
+ * @param value
+ * @param compose 展示 value-label
+ */
+declare function useEnum(code: string, value?: string, compose?: boolean): [string, DataOption];
+export default useEnum;

package/es/ProEnum/{useEnum.js → hooks/useEnum.js}

@@ -1,7 +1,13 @@
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 /* eslint-disable no-redeclare */
-import { useProConfig } from '@zat-design/sisyphus-react';
-import { getEnumData } from './utils';
+import { useProConfig } from '../../ProConfigProvider';
+import { getEnumData } from '../utils';
+/**
+ * 根据 code 从枚举缓存取出对应的 options 、以及回显
+ * @param codes
+ * @param value
+ * @param compose
+ * @returns
+ */
 function useEnum(codes, value, compose) {
   var _ref = useProConfig('globalConfig') || {},
     _ref$storage = _ref.storage,
@@ -51,23 +57,13 @@ function useEnum(codes, value, compose) {
   }
   if (Array.isArray(codes)) {
     var _options = {};
-    // eslint-disable-next-line no-restricted-syntax
-    var _iterator = _createForOfIteratorHelper(codes),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var _catchData$data2;
-        var code = _step.value;
-        var values = catchData === null || catchData === void 0 ? void 0 : (_catchData$data2 = catchData.data) === null || _catchData$data2 === void 0 ? void 0 : _catchData$data2[code];
-        if (Array.isArray(values) && values.length) {
-          _options[code] = values;
-        }
+    codes.forEach(function (code) {
+      var _catchData$data2;
+      var values = catchData === null || catchData === void 0 ? void 0 : (_catchData$data2 = catchData.data) === null || _catchData$data2 === void 0 ? void 0 : _catchData$data2[code];
+      if (Array.isArray(values) && values.length) {
+        _options[code] = values;
       }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
+    });
     return _options;
   }
   return [];

package/es/ProEnum/hooks/useEnumRequest.d.ts

@@ -0,0 +1,4 @@
+import { ProEnumConfig } from '../propsType';
+import '../utils/eventCenter';
+declare const useEnumRequest: (props: ProEnumConfig, dispatch: any) => void;
+export default useEnumRequest;