@zat-design/sisyphus-react 3.7.3 → 3.8.0-beat.10

package/lib/ProTreeModal/utils.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.addLevelAndParentId = void 0;
 exports.filterCheckedNodes = filterCheckedNodes;
 exports.findTreeNodeByKey = findTreeNodeByKey;
 exports.getAllKeys = getAllKeys;
@@ -209,4 +210,23 @@ var transformMessage = exports.transformMessage = function transformMessage(obj,
     _message = message.replaceAll("{".concat(key, "}"), obj[key]);
   });
   return _message;
+};
+var _addLevelAndParentId = exports.addLevelAndParentId = function addLevelAndParentId() {
+  var tree = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var fieldNames = arguments.length > 1 ? arguments[1] : undefined;
+  var currentLevel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  var currentParentId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+  var _fieldNames$children = fieldNames.children,
+    children = _fieldNames$children === void 0 ? 'children' : _fieldNames$children,
+    _fieldNames$value = fieldNames.value,
+    value = _fieldNames$value === void 0 ? 'value' : _fieldNames$value;
+  return tree.map(function (node) {
+    var newNode = (0, _objectSpread4.default)({}, node);
+    newNode.level = currentLevel;
+    newNode.parentId = currentParentId;
+    if (node[children]) {
+      newNode[children] = _addLevelAndParentId(node[children], fieldNames, currentLevel + 1, newNode[value]);
+    }
+    return newNode;
+  });
 };

package/lib/ProUpload/components/ImageRender.js

@@ -166,7 +166,7 @@ var ImageRender = function ImageRender(props) {
                   disabled: isView || disabled,
                   className: "action-item",
                   onClick: function () {
-                    var _onClick = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+                    var _onClick = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
                       var res;
                       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
                         while (1) switch (_context.prev = _context.next) {

package/lib/ProViewer/index.js

@@ -112,8 +112,8 @@ var ProViewer = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   (0, _react.useEffect)(function () {
     if (previewFile) {
       try {
-        previewFile().then( /*#__PURE__*/function () {
-          var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(response) {
+        previewFile().then(/*#__PURE__*/function () {
+          var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(response) {
             var res, blob, blobUrl;
             return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {

package/lib/old/ProEditableTable/index.js

@@ -166,7 +166,7 @@ var ProEditableTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
    * @returns {Promise<{nextList: IRowDataPropsType[], list: IRowDataPropsType[], rowData: IRowDataPropsType, rowIndex: number}>}
    */
   var onMultipleDelete = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var res, values, nextList, resetFieldsIndex;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -272,7 +272,7 @@ var ProEditableTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
    * @returns {Promise<{nextList: IRowDataPropsType[], list: IRowDataPropsType[], rowData: IRowDataPropsType, rowIndex: number}>}
    */
   var onSave = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(rowIndex, callback) {
+    var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(rowIndex, callback) {
       var _form$getFieldsValue$, _form$getFieldsValue, nextValues, res, values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -398,12 +398,12 @@ var ProEditableTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
           }, antButtonProps), {}, {
             children: buttonText
           }))]
-        }) : ( /*#__PURE__*/(0, _react.cloneElement)(buttonText, antButtonProps))
+        }) : (/*#__PURE__*/(0, _react.cloneElement)(buttonText, antButtonProps))
       }) : null
     });
   };
   var validateFields = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
       var values, nextValues, nextList, isEditing;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {

package/lib/style/theme/antd.less

@@ -749,3 +749,8 @@
     }
   }
 }
+
+.@{ant-prefix}-picker.@{ant-prefix}-picker-disabled  {
+  background: var(--zaui-disabled-bg);
+}
+

package/lib/style/theme/index.less

@@ -8,7 +8,7 @@
   --zaui-brand                      : #006aff;
   --zaui-brand-hover                : #3387ff;
   --zaui-brand-active               : #005ad9;
-  --zaui-brand-disabled             : #99c3ff;
+  --zaui-brand-disabled             : color-mix(in srgb, var(--zaui-brand) 70%, white);
   --zaui-text                       : #343434;
   --zaui-text-weak                  : #616161;
   --zaui-aide-text                  : #909090;
@@ -55,6 +55,7 @@
   --zaui-table-selected-hover-bg    : var(--zaui-table-hover-bg); // 默认同悬停
   --zaui-table-nested-bg            : #fafcfe;
   --zaui-contract-bg                : #fffaa1; // 对比背景色
+  --zaui-contract-bg-add            : #d2fff4; // 新增对比背景色
   --zaui-form-label-width           : 130px; // 8个全角字符宽度
   --zaui-border-radius              : 8px;
   --zaui-border-radius-card         : 4px;

package/lib/style/theme/tokens.less

@@ -53,6 +53,7 @@
 @zaui-table-selected-hover-bg: var(--zaui-table-hover-bg #fafafa);
 @zaui-table-nested-bg: var(--zaui-table-nested-bg #FAFCFE);
 @zaui-contract-bg: var(--zaui-contract-bg; #fffaa1); // 对比背景色
+@zaui-contract-bg-add: var(--zaui-contract-bg-add; #d2fff4); // 新增对比背景色
 @zaui-form-required-after: var(--zaui-form-required-after; inline);
 @zaui-form-required-before: var(--zaui-form-required-before; none);
 @zaui-form-label-width: var(--zaui-form-label-width; 130px);

package/lib/utils/index.d.ts

@@ -0,0 +1,2 @@
+/** 判断一个值是否是空值 */
+export declare const isEmpty: (value: any) => boolean;

package/lib/utils/index.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isEmpty = void 0;
+var EMPTY_VALUE = [undefined, null, ''];
+/** 判断一个值是否是空值 */
+var isEmpty = exports.isEmpty = function isEmpty(value) {
+  if (EMPTY_VALUE.includes(value)) {
+    return true;
+  }
+  if (Array.isArray(value)) {
+    return !(value === null || value === void 0 ? void 0 : value.length) || value.every(function (item) {
+      return EMPTY_VALUE.includes(item);
+    });
+  }
+  return false;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.7.3",
+  "version": "3.8.0-beat.10",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -84,7 +84,6 @@
     "@types/classnames": "^2.3.1",
     "@types/jest": "^29.5.11",
     "@types/lodash": "^4.14.171",
-    "@types/mockjs": "^1.0.6",
     "@types/react": "^17.0.53",
     "@types/react-dom": "^17.0.0",
     "@types/react-resizable": "^1.7.4",
@@ -96,12 +95,13 @@
     "@zat-design/login-react": "1.0.25",
     "babel-eslint": "10.0.3",
     "babel-plugin-import": "^1.13.3",
-    "commander": "<=9.2.0",
+    "commander": "9.2.0",
     "cross-env": "^7.0.3",
     "dumi": "^1.0.9",
     "eslint": "7.10.0",
     "eslint-config-za": "2.1.0",
     "eslint-plugin-babel": "5.3.0",
+    "eslint-plugin-complexity": "^1.0.2",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jsx-a11y": "6.2.3",
     "eslint-plugin-react": "7.16.0",
@@ -112,7 +112,7 @@
     "husky": "^4.0.7",
     "jest-canvas-mock": "^2.5.2",
     "lint-staged": "^10.0.0",
-    "mockjs": "^1.1.0",
+    "mockjs": "^1.0.0",
     "prettier": "^2.5.0",
     "pretty-quick": "^3.1.3",
     "react-json-view": "^1.21.3",

package/es/ProForm/components/render/Changed.d.ts

@@ -1,14 +0,0 @@
-import { FormInstance } from 'antd';
-import { NamePath } from 'antd/lib/form/interface';
-import React from 'react';
-interface Props {
-    name?: NamePath;
-    names?: NamePath[];
-    namesStr?: string;
-    originalValues?: any;
-    form: FormInstance;
-    equalWith?: (preValue: any, curValue: any) => boolean | undefined;
-    [name: string]: any;
-}
-declare const Changed: React.FC<Props>;
-export default Changed;

package/es/ProForm/components/render/Changed.js

@@ -1,64 +0,0 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "originalValues", "form", "equalWith", "children", "type", "originalDiffTip"];
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { get } from 'lodash';
-import React, { useMemo } from 'react';
-import { diffOriginal } from '../../utils/diffOriginal';
-var Changed = function Changed(props) {
-  var name = props.name,
-    names = props.names,
-    namesStr = props.namesStr,
-    originalValues = props.originalValues,
-    form = props.form,
-    equalWith = props.equalWith,
-    children = props.children,
-    type = props.type,
-    originalDiffTip = props.originalDiffTip,
-    rest = _objectWithoutProperties(props, _excluded);
-  // 不渲染tooltip
-  var notWatch = !originalDiffTip || ['FormList', 'ProEditTable'].includes(type);
-  var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
-    return get(originalValues, name);
-  }) : get(originalValues, name);
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
-  var changed = useMemo(function () {
-    if (notWatch || noChange) return false;
-    return diffOriginal({
-      originalValue: originalValue,
-      value: props.value,
-      form: form,
-      equalWith: equalWith
-      // name: namesStr || name,
-    });
-  }, [notWatch, noChange, props.value, originalValue]);
-  var tipContent = useMemo(function () {
-    if (notWatch || noChange) return undefined;
-    return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, {
-      isView: true,
-      value: originalValue,
-      checked: type === 'Switch' ? originalValue : undefined
-    })) : undefined;
-  }, [originalValue, children]);
-  if (notWatch || noChange) {
-    return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
-  }
-  return _jsx(_Tooltip, {
-    open: changed ? undefined : false,
-    getPopupContainer: function getPopupContainer(target) {
-      return target.parentElement;
-    },
-    title: _jsxs(_Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-    }),
-    children: _jsx("div", {
-      className: changed ? 'pro-form-item-changed' : '',
-      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest)) : undefined
-    })
-  });
-};
-export default Changed;

package/lib/ProForm/components/render/Changed.d.ts

@@ -1,14 +0,0 @@
-import { FormInstance } from 'antd';
-import { NamePath } from 'antd/lib/form/interface';
-import React from 'react';
-interface Props {
-    name?: NamePath;
-    names?: NamePath[];
-    namesStr?: string;
-    originalValues?: any;
-    form: FormInstance;
-    equalWith?: (preValue: any, curValue: any) => boolean | undefined;
-    [name: string]: any;
-}
-declare const Changed: React.FC<Props>;
-export default Changed;

package/lib/ProForm/components/render/Changed.js

@@ -1,69 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _jsxRuntime = require("react/jsx-runtime");
-var _antd = require("antd");
-var _lodash = require("lodash");
-var _react = _interopRequireWildcard(require("react"));
-var _diffOriginal = require("../../utils/diffOriginal");
-var _excluded = ["name", "names", "namesStr", "originalValues", "form", "equalWith", "children", "type", "originalDiffTip"];
-var Changed = function Changed(props) {
-  var name = props.name,
-    names = props.names,
-    namesStr = props.namesStr,
-    originalValues = props.originalValues,
-    form = props.form,
-    equalWith = props.equalWith,
-    children = props.children,
-    type = props.type,
-    originalDiffTip = props.originalDiffTip,
-    rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  // 不渲染tooltip
-  var notWatch = !originalDiffTip || ['FormList', 'ProEditTable'].includes(type);
-  var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
-    return (0, _lodash.get)(originalValues, name);
-  }) : (0, _lodash.get)(originalValues, name);
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
-  var changed = (0, _react.useMemo)(function () {
-    if (notWatch || noChange) return false;
-    return (0, _diffOriginal.diffOriginal)({
-      originalValue: originalValue,
-      value: props.value,
-      form: form,
-      equalWith: equalWith
-      // name: namesStr || name,
-    });
-  }, [notWatch, noChange, props.value, originalValue]);
-  var tipContent = (0, _react.useMemo)(function () {
-    if (notWatch || noChange) return undefined;
-    return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), {}, {
-      isView: true,
-      value: originalValue,
-      checked: type === 'Switch' ? originalValue : undefined
-    })) : undefined;
-  }, [originalValue, children]);
-  if (notWatch || noChange) {
-    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest));
-  }
-  return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-    open: changed ? undefined : false,
-    getPopupContainer: function getPopupContainer(target) {
-      return target.parentElement;
-    },
-    title: (0, _jsxRuntime.jsxs)(_antd.Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-    }),
-    children: (0, _jsxRuntime.jsx)("div", {
-      className: changed ? 'pro-form-item-changed' : '',
-      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest)) : undefined
-    })
-  });
-};
-var _default = exports.default = Changed;