@titaui/pc 1.9.30 → 1.9.31

package/src/components/dialog/index.scss

@@ -1,13 +1,23 @@
-$font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
+$font-family: -apple-system,
+Arial,
+Verdana,
+Helvetica Neue,
+Helvetica,
+sans-serif,
+PingFang SC,
+Microsoft YaHei;
+
 .rc-dialog-close {
   z-index: 100;
 }
+
 .rc-dialog-wrap {
   display: flex;
   justify-content: center;
   align-items: center;
   z-index: 1299 !important;
 }
+
 .rc-dialog-mask {
   z-index: 1299 !important;
   background: rgba(20, 28, 40, 0.7) !important;
@@ -16,6 +26,7 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
 .titaui-dialog {
   border-radius: 24px;
   overflow: hidden;
+
   &.rc-dialog {
     display: inline-block;
     margin: 0;
@@ -49,10 +60,12 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
   .rc-dialog-header {
     padding: 18px 32px;
   }
+
   .rc-dialog-body {
     // padding: 0 32px 0 32px;
     padding: 0;
   }
+
   .rc-dialog-footer {
     padding: 20px 32px;
     display: flex;
@@ -72,7 +85,8 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     justify-content: center;
     cursor: pointer;
     box-sizing: border-box;
-    & > span {
+
+    &>span {
       font-size: 14px;
       font-family: $font-family;
       font-weight: 400;
@@ -88,20 +102,36 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     border: 1px solid #2879ff;
     color: #ffffff;
     transition: 0.2s all;
+    user-select: none;
+
     &:hover {
       border: 1px solid #5c8eff;
       background: #5c8eff;
       color: #ffffff;
     }
+
     &-not-allowed {
+      background-color: #5C8EFF;
       cursor: not-allowed;
     }
+
+    &-loading {
+      &-icon {
+        width: 14px;
+        margin-right: 6px;
+        animation-name: spin;
+        animation-timing-function: linear;
+        animation-iteration-count: infinite;
+        animation-duration: 1s;
+      }
+    }
   }
 
   &__btn-cancel {
     border: 1px solid #DFE3EA;
     color: #6f7886;
     transition: 0.2s all;
+
     &:hover {
       border: 1px solid #2879ff;
       color: #2879ff;
@@ -114,11 +144,13 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     border-bottom: none;
   }
 }
+
 .titaui-dialog.titaui-dialog-no-footer-line {
   .rc-dialog-footer {
     border-top: none;
   }
 }
+
 .titaui-dialog.titaui-dialog-no-close {
   .rc-dialog-close {
     display: none;
@@ -130,3 +162,13 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     display: none;
   }
 }
+
+@keyframes spin {
+  from {
+    transform: rotate(0deg);
+  }
+
+  to {
+    transform: rotate(360deg);
+  }
+}

package/src/components/hr-header/index.tsx

@@ -3,7 +3,7 @@ import { useEffect } from 'react';
 import classNames from 'classnames';
 import axios from 'axios';
 import  Popup  from '../popup';
-import { getLoginUserInfo } from '&/utils/helpers';
+import { getLoginUserInfo } from '../../utils/helpers';
 import './index.scss';
 
 interface Props {}

package/src/components/user-selector/export-modules/duties-selector/index.tsx

@@ -118,7 +118,8 @@ export default forwardRef((props: Props, ref) => {
               asyncData={false}
               onSelect={onSelectHandler}
               virtual={true}
-              height={height-44}
+              height={height}
+              switcherIcon=""
             />
           </TreeNodeContext.Provider>
           </div>
@@ -131,8 +132,9 @@ export default forwardRef((props: Props, ref) => {
               multiple={false}
               getTreeData={onGetTreeData}
               itemHeight={itemHeight}
-              height={height-44}
+              height={height}
               virtual={true}
+              switcherIcon=""
             />
           </TreeNodeContext.Provider>
         )}

package/src/components/user-selector/select-tree/choose-tree/index.tsx

@@ -24,7 +24,8 @@ export default props => {
     height,
     virtual,
     isGetRoot,
-    renderEmpty = () => <Empty />
+    renderEmpty = () => <Empty />,
+    ...restProps
   } = props;
 
   const loadedNode = useRef([]);
@@ -118,6 +119,7 @@ export default props => {
   return (
     <div className="perspm-tree">
       <Tree
+        {...restProps}
         multiple={multiple}
         selectNodeHighlight={false}
         defaultExpandedKeys={getDefaultExpandedKeys()}

package/src/pages/home/components/data-list/index.scss

@@ -1,8 +1,6 @@
 .homepage-datalist {
-  background-color: #f7f9fb;
   height: calc(100vh - 41px);
   overflow: auto;
-  padding: 14px 20px;
   box-sizing: border-box;
   padding-bottom: 20px;
   box-sizing: border-box;

package/yarn-error.log

@@ -0,0 +1,103 @@
+Arguments: 
+  /usr/local/bin/node /usr/local/bin/yarn
+
+PATH: 
+  /opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:/opt/homebrew/bin:/opt/homebrew/sbin
+
+Yarn version: 
+  1.22.10
+
+Node version: 
+  12.22.1
+
+Platform: 
+  darwin x64
+
+Trace: 
+  SyntaxError: /Users/yang/tita/titaui-pc/package.json: Unexpected token < in JSON at position 26
+      at JSON.parse (<anonymous>)
+      at /usr/local/lib/node_modules/yarn/lib/cli.js:1625:59
+      at Generator.next (<anonymous>)
+      at step (/usr/local/lib/node_modules/yarn/lib/cli.js:310:30)
+      at /usr/local/lib/node_modules/yarn/lib/cli.js:321:13
+
+npm manifest: 
+  {
+    "name": "@titaui/pc",
+  <<<<<<< HEAD
+    "version": "1.2.22",
+  =======
+    "version": "1.2.13",
+  >>>>>>> master
+    "nameCN": "",
+    "description": "",
+    "main": "src/index.js",
+    "scripts": {
+      "storybook": "start-storybook -p 6006 --no-dll",
+      "start": "dev_server=on webpack-dev-server --disableHostCheck=true --progress --colors  --config webpack-stories.config.js",
+      "build-storybook": "build-storybook --docs --no-dll",
+      "build:es": "babel src -d es --ignore **/__tests__",
+      "build:lib": "cross-env OUTPUT_MODULE=commonjs babel src -d lib --ignore **/__tests__",
+      "build:umd": "webpack --config ./.scripts/webpack.umd.js",
+      "build": "npm run build:lib && npm run build:es && npm run build:umd"
+    },
+    "author": "",
+    "license": "ISC",
+    "devDependencies": {
+      "del": "^6.0.0",
+      "gulp": "^3.x",
+      "gulp-autoprefixer": "^7.0.1",
+      "gulp-babel": "^8.0.0",
+      "gulp-concat": "^2.6.1",
+      "gulp-cssbeautify": "^3.0.0",
+      "gulp-cssnano": "^2.1.3",
+      "gulp-filesize": "0.0.6",
+      "gulp-postcss": "^9.0.0",
+      "gulp-rename": "^2.0.0",
+      "gulp-replace": "^1.0.0",
+      "gulp-sass": "^4.1.0",
+      "gulp-sourcemaps": "^2.6.5",
+      "sass-resources-loader": "^2.2.1"
+    },
+    "dependencies": {
+      "@titaui/dagre": "^0.8.8-pre",
+      "@titaui/rc-tree2": "^4.1.15",
+      "@titaui/rc-trigger": "^5.2.5",
+      "@titaui/react-flow-renderer": "9.5.4",
+      "@titaui/toast": "^1.0.0",
+      "axios": "^0.21.1",
+      "classnames": "^2.2.6",
+      "clone-deep": "^4.0.1",
+      "d3-cloud": "^1.2.5",
+      "dayjs": "^1.10.4",
+      "html2canvas": "^1.0.0-rc.7",
+      "moment": "^2.29.1",
+      "qs": "^6.10.1",
+      "rc-checkbox": "^2.3.2",
+      "rc-dialog": "8.5.2",
+      "rc-drawer": "^4.3.1",
+      "rc-input-number": "^5.0.0",
+      "rc-pagination": "^3.1.6",
+      "rc-queue-anim": "1.4.1",
+      "rc-select": "^12.1.7",
+      "rc-switch": "^3.2.2",
+      "rc-table": "^7.13.2",
+      "rc-tabs": "^11.7.3",
+      "rc-tooltip": "^5.1.1",
+      "rc-tree": "^4.1.5",
+      "rc-trigger": "^5.2.3",
+      "rc-upload": "^4.2.0-alpha.0",
+      "rc-util": "^5.13.1",
+      "react-collapse": "^5.1.0",
+      "react-perfect-scrollbar": "^1.5.2",
+      "url-parse": "^1.5.1",
+      "uuid": "^3.1.0",
+      "wordcloud": "^1.2.2"
+    }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile