amis 2.5.3-beta.0 → 2.5.3-beta.3

package/lib/themes/default-ie11.css

@@ -11394,6 +11394,7 @@ input[type=button].cxd-Button--block {
     #f7f8fa;
   border-top-left-radius: 6px;
   border-top-right-radius: 6px;
+  z-index: 150;
 }
 .cxd-Modal-header::before, .cxd-Modal-header::after {
   display: table;
@@ -25190,7 +25191,7 @@ input.cxd-TextControl-input-password {
 }
 .cxd-Select .cxd-PopOver.cxd-Select-popover .cxd-Select-menu .cxd-Select-option {
   height: 2rem;
-  line-height: 1.375rem;
+  line-height: 2rem;
 }
 .cxd-Select .cxd-PopOver.cxd-Select-popover .cxd-Select-menu .cxd-Select-addBtn {
   height: 2rem;
@@ -30880,6 +30881,9 @@ td.rdtQuarter.rdtDisabled:hover {
 .cxd-UserSelect-popup {
   height: 100vh;
 }
+.cxd-UserSelect-popup .cxd-PopUp-content {
+  overflow-x: hidden;
+}
 .cxd-UserSelect-selectPopup {
   width: 100vw;
   height: 100vh;
@@ -30920,6 +30924,10 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .cxd-UserSelect-footer .cxd-Button {
   width: 100%;
+  border-radius: 0.25rem;
+  line-height: 2.75rem;
+  font-size: 1rem;
+  font-weight: 400;
 }
 .cxd-UserSelect-navbar {
   position: relative;
@@ -30939,6 +30947,8 @@ td.rdtQuarter.rdtDisabled:hover {
   transform: translateX(-50%);
   line-height: 44px;
   text-align: center;
+  font-size: 1.125rem;
+  font-weight: 500;
 }
 .cxd-UserSelect-navbar-btnEdit {
   color: #2468f2;
@@ -30956,9 +30966,10 @@ td.rdtQuarter.rdtDisabled:hover {
 .cxd-UserSelect-breadcrumb-item {
   cursor: pointer;
   color: #2468f2;
+  font-size: 0.875rem;
 }
 .cxd-UserSelect-breadcrumb-item:last-child {
-  color: inherit;
+  color: #5e626a;
 }
 .cxd-UserSelect-breadcrumb-separator {
   margin: 0 0.5rem;
@@ -30993,18 +31004,18 @@ td.rdtQuarter.rdtDisabled:hover {
   overflow-x: hidden;
   overflow-y: auto;
   background: #ffffff;
+  border-radius: 0.25rem;
 }
 .cxd-UserSelect-memberList li, .cxd-UserSelect-selection li {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  height: 2.625rem;
-  line-height: 2.625rem;
+  height: 3rem;
+  line-height: 3rem;
   cursor: pointer;
   -webkit-user-select: none;
      -moz-user-select: none;
           user-select: none;
-  padding: 0 1rem;
   border-bottom: 0.0625rem solid #f7f7f9;
 }
 .cxd-UserSelect-memberList li > span, .cxd-UserSelect-selection li > span {
@@ -31030,8 +31041,50 @@ td.rdtQuarter.rdtDisabled:hover {
   text-overflow: ellipsis;
   overflow: hidden;
 }
-.cxd-UserSelect-label {
+.cxd-UserSelect-memberName .option-avatar-txt {
+  width: 1.75rem;
+  height: 1.75rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 100%;
+  margin-right: 0.75rem;
+  background-color: #528eff;
+  color: #fff !important;
+  border: 1px solid #eee;
+}
+.cxd-UserSelect-memberName .option-avatar-txt.avatar-2 {
+  width: 2rem;
+  height: 2rem;
+}
+.cxd-UserSelect-memberName .option-avatar-img {
+  width: 1.75rem;
+  height: 1.75rem;
+  margin-right: 0.75rem;
+  border-radius: 100%;
+}
+.cxd-UserSelect-memberName .option-avatar-img.avatar-2 {
+  width: 2rem;
+  height: 2rem;
+}
+.cxd-UserSelect-memberName .option-fields {
   flex: 1;
+  line-height: 1.125rem;
+}
+.cxd-UserSelect-memberName .option-fields .option-item {
+  margin-right: 0.625rem;
+}
+.cxd-UserSelect-memberName .option-fields .option-item:first-child {
+  color: #151b26;
+  font-size: 14px;
+}
+.cxd-UserSelect-memberName .option-fields .option-item:nth-child(2n) {
+  margin-top: 0.25rem;
+}
+.cxd-UserSelect-memberName .option-fields .option-item:last-child {
+  display: block;
+  font-size: 12px;
+  color: #84868c;
 }
 .cxd-UserSelect-icon-box {
   width: 1.75rem;
@@ -31100,6 +31153,15 @@ td.rdtQuarter.rdtDisabled:hover {
   overflow: hidden;
   box-sizing: border-box;
   background: #ffffff;
+  position: relative;
+}
+.cxd-UserSelect-resultBox-shadow {
+  position: absolute;
+  right: 3.125rem;
+  top: 0.625rem;
+  width: 0.625rem;
+  height: 1.625rem;
+  background: rgba(255, 255, 255, 0.5);
 }
 .cxd-UserSelect-selectNum {
   flex: none;
@@ -31135,20 +31197,28 @@ td.rdtQuarter.rdtDisabled:hover {
   font-size: 8px;
 }
 .cxd-UserSelect-selectSort-box {
-  margin-left: 0.625rem;
   padding: 0.25rem 0.625rem;
+  position: relative;
+}
+.cxd-UserSelect-selectSort-box::after {
+  content: "";
+  display: block;
+  position: absolute;
+  left: 0;
+  top: 0;
+  filter: blur(5px);
 }
 .cxd-UserSelect-noRecord {
   width: 100vw;
   height: 100%;
   margin: 0 1rem;
-  margin-top: 1rem;
   display: flex;
   align-items: center;
   justify-content: center;
   background: #ffffff;
   padding: 6.25rem 0;
   box-sizing: border-box;
+  border-radius: 0.25rem;
 }
 .cxd-UserSelect-selectList-pop {
   margin: 0;
@@ -31165,7 +31235,7 @@ td.rdtQuarter.rdtDisabled:hover {
 .cxd-UserSelect-del {
   text-align: right;
   flex: none !important;
-  padding: 0 10px;
+  padding: 0 10px 0 0;
 }
 .cxd-UserSelect-dragBar {
   flex: none;
@@ -31216,16 +31286,51 @@ td.rdtQuarter.rdtDisabled:hover {
 .cxd-UserSelect-select-head-text {
   font-size: 1rem;
   color: #151b26;
+  font-weight: 500;
 }
 .cxd-UserSelect-select-head-btnClear {
   color: #2468f2;
   font-size: 1rem;
+  font-weight: 400;
   cursor: pointer;
 }
+.cxd-UserSelect .cxd-ResultBox-valueLabel {
+  display: flex;
+  align-items: center;
+}
+.cxd-UserSelect .cxd-ResultBox-placeholder {
+  text-align: right;
+}
+.cxd-UserSelect-avatar-img {
+  width: 1.375rem;
+  height: 1.375rem;
+  border-radius: 50%;
+  margin-right: 0.625rem;
+}
+.cxd-UserSelect-h2 {
+  height: 4.125rem !important;
+  line-height: 4.125rem !important;
+}
+.cxd-UserSelect-avatar-text {
+  display: flex;
+  font-size: 0.75rem;
+  justify-content: center;
+  align-items: center;
+  width: 1.375rem;
+  height: 1.375rem;
+  border-radius: 50%;
+  background-color: #528eff;
+  color: #fff !important;
+  margin-right: 0.625rem;
+  border: 1px solid #eee;
+}
 .cxd-UserTabSelect-popup {
   width: 100vw;
   height: 100vh;
 }
+.cxd-UserTabSelect-popup .cxd-PopUp-content {
+  overflow-x: hidden;
+}
 .cxd-UserTabSelect-wrap {
   display: flex;
   flex-direction: column;
@@ -31239,12 +31344,42 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .cxd-UserTabSelect-footer .cxd-Button {
   width: 100%;
+  border-radius: 0.25rem;
+  line-height: 2.75rem;
+  font-size: 1rem;
+  font-weight: 400;
 }
 .cxd-UserTabSelect-tabs {
   flex: 1;
   display: flex;
   flex-direction: column;
 }
+.cxd-UserTabSelect-tabs .cxd-Tabs-links > li {
+  border-style: none !important;
+}
+.cxd-UserTabSelect-tabs .cxd-Tabs-links > li a {
+  font-weight: 400 !important;
+  color: #303540 !important;
+  font-size: 1rem !important;
+}
+.cxd-UserTabSelect-tabs .cxd-Tabs-links > li.is-active {
+  position: relative;
+}
+.cxd-UserTabSelect-tabs .cxd-Tabs-links > li.is-active a {
+  font-weight: 500 !important;
+  color: #2468f2 !important;
+}
+.cxd-UserTabSelect-tabs .cxd-Tabs-links > li.is-active::after {
+  content: "";
+  display: block;
+  position: absolute;
+  left: 50%;
+  bottom: 0;
+  transform: translateX(-50%);
+  width: 2rem;
+  height: 0.125rem;
+  background: #2468f2;
+}
 .cxd-UserTabSelect-tabs .cxd-Tabs-content {
   background-color: #f5f7f8;
 }

package/lib/themes/default.css

@@ -1427,7 +1427,7 @@
   --UserSelect--role-bg: #0bc286;
   --UserSelect--border-color: #f7f7f9;
   --UserSelect--content-bg: #f5f7f8;
-  --UserSelect--bread-color: var(--colors-brand-5);
+  --UserSelect--bread-color: #5e626a;
   --Tag-content-fontSize: var(--fontSizeSm);
   --Tag-height: 1.5rem;
   --Tag-borderRadius: 0.125rem;
@@ -13993,6 +13993,7 @@ input[type=button].cxd-Button--block {
   border-bottom: var(--Modal-body-borderTop);
   border-top-left-radius: var(--Modal-content-borderRadius);
   border-top-right-radius: var(--Modal-content-borderRadius);
+  z-index: 150;
 }
 .cxd-Modal-header::before, .cxd-Modal-header::after {
   display: table;
@@ -27599,7 +27600,7 @@ input.cxd-TextControl-input-password {
 }
 .cxd-Select .cxd-PopOver.cxd-Select-popover .cxd-Select-menu .cxd-Select-option {
   height: 2rem;
-  line-height: 1.375rem;
+  line-height: 2rem;
 }
 .cxd-Select .cxd-PopOver.cxd-Select-popover .cxd-Select-menu .cxd-Select-addBtn {
   height: 2rem;
@@ -33141,6 +33142,9 @@ td.rdtQuarter.rdtDisabled:hover {
 .cxd-UserSelect-popup {
   height: 100vh;
 }
+.cxd-UserSelect-popup .cxd-PopUp-content {
+  overflow-x: hidden;
+}
 .cxd-UserSelect-selectPopup {
   width: 100vw;
   height: 100vh;
@@ -33181,6 +33185,10 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .cxd-UserSelect-footer .cxd-Button {
   width: 100%;
+  border-radius: 0.25rem;
+  line-height: 2.75rem;
+  font-size: 1rem;
+  font-weight: 400;
 }
 .cxd-UserSelect-navbar {
   position: relative;
@@ -33200,9 +33208,11 @@ td.rdtQuarter.rdtDisabled:hover {
   transform: translateX(-50%);
   line-height: 44px;
   text-align: center;
+  font-size: 1.125rem;
+  font-weight: 500;
 }
 .cxd-UserSelect-navbar-btnEdit {
-  color: var(--UserSelect--bread-color);
+  color: var(--primary);
   font-size: 1rem;
 }
 .cxd-UserSelect-breadcrumb {
@@ -33216,10 +33226,11 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .cxd-UserSelect-breadcrumb-item {
   cursor: pointer;
-  color: var(--UserSelect--bread-color);
+  color: var(--primary);
+  font-size: 0.875rem;
 }
 .cxd-UserSelect-breadcrumb-item:last-child {
-  color: inherit;
+  color: #5e626a;
 }
 .cxd-UserSelect-breadcrumb-separator {
   margin: 0 0.5rem;
@@ -33254,18 +33265,18 @@ td.rdtQuarter.rdtDisabled:hover {
   overflow-x: hidden;
   overflow-y: auto;
   background: var(--white);
+  border-radius: 0.25rem;
 }
 .cxd-UserSelect-memberList li, .cxd-UserSelect-selection li {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  height: 2.625rem;
-  line-height: 2.625rem;
+  height: 3rem;
+  line-height: 3rem;
   cursor: pointer;
   -webkit-user-select: none;
      -moz-user-select: none;
           user-select: none;
-  padding: 0 1rem;
   border-bottom: 0.0625rem solid var(--UserSelect--border-color);
 }
 .cxd-UserSelect-memberList li > span, .cxd-UserSelect-selection li > span {
@@ -33291,8 +33302,50 @@ td.rdtQuarter.rdtDisabled:hover {
   text-overflow: ellipsis;
   overflow: hidden;
 }
-.cxd-UserSelect-label {
+.cxd-UserSelect-memberName .option-avatar-txt {
+  width: 1.75rem;
+  height: 1.75rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 100%;
+  margin-right: 0.75rem;
+  background-color: #528eff;
+  color: #fff !important;
+  border: 1px solid #eee;
+}
+.cxd-UserSelect-memberName .option-avatar-txt.avatar-2 {
+  width: 2rem;
+  height: 2rem;
+}
+.cxd-UserSelect-memberName .option-avatar-img {
+  width: 1.75rem;
+  height: 1.75rem;
+  margin-right: 0.75rem;
+  border-radius: 100%;
+}
+.cxd-UserSelect-memberName .option-avatar-img.avatar-2 {
+  width: 2rem;
+  height: 2rem;
+}
+.cxd-UserSelect-memberName .option-fields {
   flex: 1;
+  line-height: 1.125rem;
+}
+.cxd-UserSelect-memberName .option-fields .option-item {
+  margin-right: 0.625rem;
+}
+.cxd-UserSelect-memberName .option-fields .option-item:first-child {
+  color: var(--body-color);
+  font-size: var(--Form-fontSize);
+}
+.cxd-UserSelect-memberName .option-fields .option-item:nth-child(2n) {
+  margin-top: 0.25rem;
+}
+.cxd-UserSelect-memberName .option-fields .option-item:last-child {
+  display: block;
+  font-size: 12px;
+  color: #84868c;
 }
 .cxd-UserSelect-icon-box {
   width: 1.75rem;
@@ -33361,6 +33414,15 @@ td.rdtQuarter.rdtDisabled:hover {
   overflow: hidden;
   box-sizing: border-box;
   background: var(--white);
+  position: relative;
+}
+.cxd-UserSelect-resultBox-shadow {
+  position: absolute;
+  right: 3.125rem;
+  top: 0.625rem;
+  width: 0.625rem;
+  height: 1.625rem;
+  background: rgba(255, 255, 255, 0.5);
 }
 .cxd-UserSelect-selectNum {
   flex: none;
@@ -33396,20 +33458,28 @@ td.rdtQuarter.rdtDisabled:hover {
   font-size: 8px;
 }
 .cxd-UserSelect-selectSort-box {
-  margin-left: 0.625rem;
   padding: 0.25rem 0.625rem;
+  position: relative;
+}
+.cxd-UserSelect-selectSort-box::after {
+  content: "";
+  display: block;
+  position: absolute;
+  left: 0;
+  top: 0;
+  filter: blur(5px);
 }
 .cxd-UserSelect-noRecord {
   width: 100vw;
   height: 100%;
   margin: 0 1rem;
-  margin-top: 1rem;
   display: flex;
   align-items: center;
   justify-content: center;
   background: var(--white);
   padding: 6.25rem 0;
   box-sizing: border-box;
+  border-radius: 0.25rem;
 }
 .cxd-UserSelect-selectList-pop {
   margin: 0;
@@ -33426,7 +33496,7 @@ td.rdtQuarter.rdtDisabled:hover {
 .cxd-UserSelect-del {
   text-align: right;
   flex: none !important;
-  padding: 0 10px;
+  padding: 0 10px 0 0;
 }
 .cxd-UserSelect-dragBar {
   flex: none;
@@ -33477,16 +33547,51 @@ td.rdtQuarter.rdtDisabled:hover {
 .cxd-UserSelect-select-head-text {
   font-size: 1rem;
   color: #151b26;
+  font-weight: 500;
 }
 .cxd-UserSelect-select-head-btnClear {
-  color: var(--UserSelect--bread-color);
+  color: var(--primary);
   font-size: 1rem;
+  font-weight: 400;
   cursor: pointer;
 }
+.cxd-UserSelect .cxd-ResultBox-valueLabel {
+  display: flex;
+  align-items: center;
+}
+.cxd-UserSelect .cxd-ResultBox-placeholder {
+  text-align: right;
+}
+.cxd-UserSelect-avatar-img {
+  width: 1.375rem;
+  height: 1.375rem;
+  border-radius: 50%;
+  margin-right: 0.625rem;
+}
+.cxd-UserSelect-h2 {
+  height: 4.125rem !important;
+  line-height: 4.125rem !important;
+}
+.cxd-UserSelect-avatar-text {
+  display: flex;
+  font-size: 0.75rem;
+  justify-content: center;
+  align-items: center;
+  width: 1.375rem;
+  height: 1.375rem;
+  border-radius: 50%;
+  background-color: #528eff;
+  color: #fff !important;
+  margin-right: 0.625rem;
+  border: 1px solid #eee;
+}
 .cxd-UserTabSelect-popup {
   width: 100vw;
   height: 100vh;
 }
+.cxd-UserTabSelect-popup .cxd-PopUp-content {
+  overflow-x: hidden;
+}
 .cxd-UserTabSelect-wrap {
   display: flex;
   flex-direction: column;
@@ -33500,12 +33605,42 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .cxd-UserTabSelect-footer .cxd-Button {
   width: 100%;
+  border-radius: 0.25rem;
+  line-height: 2.75rem;
+  font-size: 1rem;
+  font-weight: 400;
 }
 .cxd-UserTabSelect-tabs {
   flex: 1;
   display: flex;
   flex-direction: column;
 }
+.cxd-UserTabSelect-tabs .cxd-Tabs-links > li {
+  border-style: none !important;
+}
+.cxd-UserTabSelect-tabs .cxd-Tabs-links > li a {
+  font-weight: 400 !important;
+  color: #303540 !important;
+  font-size: 1rem !important;
+}
+.cxd-UserTabSelect-tabs .cxd-Tabs-links > li.is-active {
+  position: relative;
+}
+.cxd-UserTabSelect-tabs .cxd-Tabs-links > li.is-active a {
+  font-weight: 500 !important;
+  color: var(--primary) !important;
+}
+.cxd-UserTabSelect-tabs .cxd-Tabs-links > li.is-active::after {
+  content: "";
+  display: block;
+  position: absolute;
+  left: 50%;
+  bottom: 0;
+  transform: translateX(-50%);
+  width: 2rem;
+  height: 0.125rem;
+  background: var(--primary);
+}
 .cxd-UserTabSelect-tabs .cxd-Tabs-content {
   background-color: var(--UserSelect--content-bg);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis",
-  "version": "2.5.3-beta.0",
+  "version": "2.5.3-beta.3",
   "description": "一种MIS页面生成工具",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -41,8 +41,8 @@
     ]
   },
   "dependencies": {
-    "amis-core": "^2.5.3-beta.0",
-    "amis-ui": "^2.5.3-beta.0",
+    "amis-core": "^2.5.3-beta.3",
+    "amis-ui": "^2.5.3-beta.3",
     "attr-accept": "2.2.2",
     "blueimp-canvastoblob": "2.1.0",
     "classnames": "2.3.1",
@@ -235,5 +235,5 @@
     "react": ">=16.8.6",
     "react-dom": ">=16.8.6"
   },
-  "gitHead": "bd390a4cb7adf4d504ee4f6dccb59af00e9ec1b9"
+  "gitHead": "966a8fa1119534d3e19483ca64d4abab2b66d0f5"
 }