@zat-design/sisyphus-react 3.4.4 → 3.4.5-beta.10

package/lib/ProThemeTools/component/PrdTools/style/index.less

@@ -16,20 +16,20 @@
   }
 
   p {
-    padding-left : 12px;
-    position     : relative;
+    position: relative;
     margin-bottom: var(--zaui-space-size-md, 16px);
-    font-size    : var(--zaui-font-size, 14px);
+    padding-left: 12px;
+    font-size: var(--zaui-font-size, 14px);
 
     &:before {
-      content      : '';
-      position     : absolute;
-      left         : 0;
-      top          : 4px;
-      width        : 4px;
-      height       : 14px;
-      background   : var(--zaui-brand, #006aff);
+      position: absolute;
+      top: 4px;
+      left: 0;
+      width: 4px;
+      height: 14px;
+      background: var(--zaui-brand, #006aff);
       border-radius: var(zaui-border-radius-card, 4px);
+      content: '';
     }
   }
 
@@ -37,19 +37,19 @@
     display: flex;
 
     li {
-      width          : 38px;
-      height         : 38px;
-      border-radius  : 50%;
-      background     : #fff;
-      display        : flex;
+      display: flex;
+      align-items: center;
       justify-content: center;
-      align-items    : center;
-      border         : 6px solid #fff;
-      color          : #fff;
-      margin-right   : 34px;
+      width: 38px;
+      height: 38px;
+      margin-right: 34px;
+      color: #fff;
+      background: #fff;
+      border: 6px solid #fff;
+      border-radius: 50%;
 
       span {
-        font-size     : var(--zaui-font-size, 14px);
+        font-size: var(--zaui-font-size, 14px);
         vertical-align: -7px;
       }
 
@@ -81,8 +81,16 @@
       }
 
       &:nth-child(4) {
+        background: #a00f20;
+
+        &.active,
+        &:hover {
+          border-color: #f2dbdb;
+        }
+      }
+      &:nth-child(5) {
         margin-right: 0;
-        background  : #a00f20;
+        background: #31af96;
 
         &.active,
         &:hover {
@@ -98,16 +106,16 @@
 
   .copy-btn {
     position: absolute;
-    width   : calc(100% - 64px);
-    bottom  : 20px;
-    left    : 32px;
-    z-index : 10;
+    bottom: 20px;
+    left: 32px;
+    z-index: 10;
+    width: calc(100% - 64px);
   }
 
   .pro-theme-tools-box {
-    display        : flex;
+    display: flex;
+    flex-wrap: wrap;
     justify-content: space-between;
-    flex-wrap      : wrap;
   }
 
   .pro-theme-tools-space {
@@ -129,22 +137,22 @@
   }
 
   .pro-drawer-close {
-    position       : absolute;
-    top            : 6px;
-    left           : -37px;
-    display        : flex;
-    align-items    : center;
+    position: absolute;
+    top: 6px;
+    left: -37px;
+    display: flex;
+    align-items: center;
     justify-content: center;
-    width          : 32px;
-    height         : 38px;
-    color          : #fff;
-    cursor         : pointer;
+    width: 32px;
+    height: 38px;
+    color: #fff;
+    cursor: pointer;
 
     .close-icon {
-      position : relative;
-      left     : 4px;
-      z-index  : 1;
-      color    : var(--zaui-text, #343434);
+      position: relative;
+      left: 4px;
+      z-index: 1;
+      color: var(--zaui-text, #343434);
       font-size: var(--zaui-font-size-lg, 16px);
       transform: translateZ(100px);
 
@@ -155,14 +163,14 @@
   }
 
   .pro-drawer-close::after {
-    position        : absolute;
-    top             : 0;
-    right           : 0;
-    bottom          : 0;
-    left            : 0;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
     background-color: #fff;
-    border-radius   : 4px 0px 0px 4px;
-    transform       : perspective(0.15em) rotateY(-2deg);
-    content         : '';
+    border-radius: 4px 0px 0px 4px;
+    transform: perspective(0.15em) rotateY(-2deg);
+    content: '';
   }
 }

package/lib/ProTreeModal/index.js

@@ -207,10 +207,11 @@ var ProTreeModal = function ProTreeModal(props) {
       setState({
         checkedValues: checkedValues,
         checkAll: checkedValues.length === allKeys.length,
-        treeViewData: treeViewData
+        treeViewData: treeViewData,
+        beforeClearAllValues: checkedValues
       });
     }
-  }, [value, state.allKeys]);
+  }, [value, state.allKeys, state.open]);
   var handleClick = function handleClick() {
     setState({
       open: true
@@ -277,24 +278,19 @@ var ProTreeModal = function ProTreeModal(props) {
       treeViewData: [],
       checkAll: false
     });
-    onChange === null || onChange === void 0 ? void 0 : onChange(_checkedValues);
+    /* ******** fix:3.4.4-beta.4 点击清空全部不应该回调、所有的都是应该走统一的确定 *********  */
+    // onChange?.(_checkedValues);
   };
   /**
    * Drawer close
    */
   var handleClose = function handleClose() {
-    var _state$beforeClearAll;
-    if ((_state$beforeClearAll = state.beforeClearAllValues) === null || _state$beforeClearAll === void 0 ? void 0 : _state$beforeClearAll.length) {
-      setState({
-        open: false,
-        checkedValues: state.beforeClearAllValues,
-        beforeClearAllValues: []
-      });
-    } else {
-      setState({
-        open: false
-      });
-    }
+    setState({
+      open: false,
+      checkedValues: state.beforeClearAllValues,
+      beforeClearAllValues: []
+    });
+    // onChange?.(state.beforeClearAllValues);
     openChange === null || openChange === void 0 ? void 0 : openChange(false);
   };
   /**

package/lib/ProWaterMark/__snapshots__/index.test.tsx.snap

@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`render ProWaterMark with dumi 1`] = `
+<span>
+  123
+</span>
+`;

package/lib/global.less

@@ -1,5 +1,41 @@
-@import "./style/index.less";
+@import './style/index.less';
 
-pre * {
+pre {
   font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 }
+
+* {
+  // 火狐浏览器
+  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-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: transparent;
+  border-radius: 10px;
+}
+
+// 悬浮轨道
+::-webkit-scrollbar-thumb:hover {
+  background-color: #979797;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.4",
+  "version": "3.4.5-beta.10",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -58,7 +58,7 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "1.1.16",
+    "@zat-design/utils": "^1.1.16",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",
@@ -77,7 +77,10 @@
   "devDependencies": {
     "@commitlint/cli": "^12.1.1",
     "@commitlint/config-conventional": "^12.1.1",
+    "@testing-library/jest-dom": "6.2.0",
+    "@testing-library/react": "12.1.5",
     "@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",
@@ -104,6 +107,7 @@
     "father-build": "^1.18.1",
     "gh-pages": "^3.0.0",
     "husky": "^4.0.7",
+    "jest-canvas-mock": "^2.5.2",
     "lint-staged": "^10.0.0",
     "mockjs": "^1.1.0",
     "prettier": "^2.5.0",

package/es/ProForm/components/base/ProCascader/index.d.ts

@@ -1,14 +0,0 @@
-import { Service, Options } from 'ahooks/lib/useRequest/src/types';
-import { CascaderProps } from 'antd';
-interface RequestProps<T, P extends any[]> {
-    service: Service<T, P>;
-    options?: Options<T, P>;
-}
-export type Props<T, RT extends T[], RP> = CascaderProps<T> & {
-    useRequest?: RequestProps<RT, [RP]>;
-    otherProps?: any;
-    isView?: boolean;
-    dataSource?: T[];
-};
-declare const ProCascader: <T, RT extends T[], RP>(props: Props<T, RT, RP>) => JSX.Element;
-export default ProCascader;

package/es/ProForm/components/base/ProCascader/index.js

@@ -1,72 +0,0 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/cascader/style";
-import _Cascader from "antd/es/cascader";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-var _excluded = ["useRequest", "otherProps", "dataSource", "options"];
-import { jsx as _jsx } from "react/jsx-runtime";
-import { useRequest } from 'ahooks';
-import Container from '../../Container';
-import ProForm from '../../../../ProForm';
-var defaultFieldNames = {
-  value: 'value',
-  label: 'label',
-  children: 'children'
-};
-/**
- * 获取值对应的选项对象
- */
-var findTreeTarget = function findTreeTarget(dataSource, value, fieldNames) {
-  var level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-  var stack = _toConsumableArray(dataSource);
-  if ((dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) && (value === null || value === void 0 ? void 0 : value.length)) {
-    var valueName = fieldNames.value,
-      label = fieldNames.label,
-      children = fieldNames.children;
-    return value === null || value === void 0 ? void 0 : value.map(function (valueItem) {
-      var index = 0;
-      while (stack.length) {
-        var target = stack.shift();
-        if (target[valueName] === valueItem) {
-          stack = target[children] ? _toConsumableArray(target[children]) : [];
-          return target;
-        }
-        index += 1;
-      }
-      return _defineProperty({}, valueName, valueItem);
-    });
-  }
-  return [];
-};
-var ProCascader = function ProCascader(props) {
-  var _restProps$fieldNames;
-  var requestProps = props.useRequest,
-    otherProps = props.otherProps,
-    dataSource = props.dataSource,
-    options = props.options,
-    restProps = _objectWithoutProperties(props, _excluded);
-  var _ref2 = ProForm.useFieldProps() || {},
-    isViewCon = _ref2.isView;
-  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
-  var _useRequest = useRequest(requestProps === null || requestProps === void 0 ? void 0 : requestProps.service, requestProps === null || requestProps === void 0 ? void 0 : requestProps.options),
-    data = _useRequest.data;
-  var _dataSource = data || dataSource || options;
-  var _fieldNames = (_restProps$fieldNames = restProps.fieldNames) !== null && _restProps$fieldNames !== void 0 ? _restProps$fieldNames : defaultFieldNames;
-  if (isView) {
-    var valueTarget = findTreeTarget(_dataSource, restProps.value, _fieldNames);
-    var valueName = _fieldNames.value,
-      label = _fieldNames.label;
-    var nameList = valueTarget.map(function (item) {
-      var _item$label;
-      return (_item$label = item[label]) !== null && _item$label !== void 0 ? _item$label : item[valueName];
-    });
-    return _jsx(Container, {
-      children: nameList.join('/')
-    });
-  }
-  return _jsx(_Cascader, _objectSpread(_objectSpread({}, restProps), {}, {
-    options: _dataSource
-  }));
-};
-export default ProCascader;