@zat-design/sisyphus-react 3.4.5-beta.17 → 3.4.5-beta.19

package/dist/index.esm.css

@@ -3609,6 +3609,28 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree {
   height: 100%;
 }
+.pro-tree .ant-tree-node-content-wrapper {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: baseline;
+  -webkit-align-items: baseline;
+      -ms-flex-align: baseline;
+          align-items: baseline;
+}
+.pro-tree .ant-tree .ant-tree-treenode-disabled .ant-tree-node-content-wrapper {
+  color: var(--zaui-text);
+}
+.pro-tree .ant-tree .ant-tree-treenode-disabled .pro-tree-tree-node.checked {
+  color: var(--zaui-text);
+}
+.pro-tree .ant-tree .ant-tree-treenode-disabled .pro-tree-tree-node.checked .brand-bg-opa-ten {
+  background-color: inherit;
+}
+.pro-tree .ant-select-dropdown.pro-tree-select-drop-down-container.checkable-tree {
+  overflow: hidden!important;
+}
 .pro-tree .ant-spin-nested-loading {
   height: 100%;
 }
@@ -3925,30 +3947,11 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background-color: var(--zaui-brand);
   opacity: 0.08;
 }
-.ant-tree .ant-tree-treenode-disabled .ant-tree-node-content-wrapper {
-  color: var(--zaui-text);
-}
-.ant-tree .ant-tree-treenode-disabled .pro-tree-tree-node.checked {
-  color: var(--zaui-text);
-}
-.ant-tree .ant-tree-treenode-disabled .pro-tree-tree-node.checked .brand-bg-opa-ten {
-  background-color: inherit;
-}
 .pro-form.pro-form-view .ant-form-item .pro-tree * {
   line-height: 1 !important;
   height: auto !important;
   min-height: auto !important;
 }
-.ant-tree-node-content-wrapper {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-align: baseline;
-  -webkit-align-items: baseline;
-      -ms-flex-align: baseline;
-          align-items: baseline;
-}
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox {
   margin-top: var(--zaui-space-size-sm);
 }
@@ -3958,9 +3961,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox * {
   height: 16px !important;
 }
-.ant-select-dropdown.pro-tree-select-drop-down-container.checkable-tree {
-  overflow: hidden!important;
-}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;

package/dist/less.esm.css

@@ -3609,6 +3609,28 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree {
   height: 100%;
 }
+.pro-tree .ant-tree-node-content-wrapper {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: baseline;
+  -webkit-align-items: baseline;
+      -ms-flex-align: baseline;
+          align-items: baseline;
+}
+.pro-tree .ant-tree .ant-tree-treenode-disabled .ant-tree-node-content-wrapper {
+  color: var(--zaui-text);
+}
+.pro-tree .ant-tree .ant-tree-treenode-disabled .pro-tree-tree-node.checked {
+  color: var(--zaui-text);
+}
+.pro-tree .ant-tree .ant-tree-treenode-disabled .pro-tree-tree-node.checked .brand-bg-opa-ten {
+  background-color: inherit;
+}
+.pro-tree .ant-select-dropdown.pro-tree-select-drop-down-container.checkable-tree {
+  overflow: hidden!important;
+}
 .pro-tree .ant-spin-nested-loading {
   height: 100%;
 }
@@ -3925,30 +3947,11 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background-color: var(--zaui-brand);
   opacity: 0.08;
 }
-.ant-tree .ant-tree-treenode-disabled .ant-tree-node-content-wrapper {
-  color: var(--zaui-text);
-}
-.ant-tree .ant-tree-treenode-disabled .pro-tree-tree-node.checked {
-  color: var(--zaui-text);
-}
-.ant-tree .ant-tree-treenode-disabled .pro-tree-tree-node.checked .brand-bg-opa-ten {
-  background-color: inherit;
-}
 .pro-form.pro-form-view .ant-form-item .pro-tree * {
   line-height: 1 !important;
   height: auto !important;
   min-height: auto !important;
 }
-.ant-tree-node-content-wrapper {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-align: baseline;
-  -webkit-align-items: baseline;
-      -ms-flex-align: baseline;
-          align-items: baseline;
-}
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox {
   margin-top: var(--zaui-space-size-sm);
 }
@@ -3958,9 +3961,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox * {
   height: 16px !important;
 }
-.ant-select-dropdown.pro-tree-select-drop-down-container.checkable-tree {
-  overflow: hidden!important;
-}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;

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

@@ -25,9 +25,16 @@ var RangePicker = function RangePicker(props) {
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
+  var _res = _objectSpread(_objectSpread({}, rest), {}, {
+    showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
+  });
+  // 字符串时间格式兼容
+  if (Array.isArray(_res.value) && isString(_res.value[0]) && isString(_res.value[1])) {
+    _res.value = [moment(_res.value[0]), moment(_res.value[1])];
+  }
   if (isView) {
-    var _props$value = props.value,
-      value = _props$value === void 0 ? [] : _props$value;
+    var _res$value = _res.value,
+      value = _res$value === void 0 ? [] : _res$value;
     var viewChildren = null;
     if (!value || !value[0] || !value[1]) {
       viewChildren = null;
@@ -49,13 +56,6 @@ var RangePicker = function RangePicker(props) {
       children: viewChildren
     });
   }
-  var _res = _objectSpread(_objectSpread({}, rest), {}, {
-    showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
-  });
-  // 字符串时间格式兼容
-  if (Array.isArray(_res.value) && isString(_res.value[0]) && isString(_res.value[1])) {
-    _res.value = [moment(_res.value[0]), moment(_res.value[1])];
-  }
   return _jsx(AntRangePicker, _objectSpread(_objectSpread({}, initialConfig), omit(_res, ['separator'])));
 };
 export default RangePicker;

package/es/ProTree/style/index.less

@@ -4,6 +4,30 @@
 .pro-tree {
   height: 100%; // tree auto css
 
+  .@{ant-prefix}-tree-node-content-wrapper{
+    display: flex;
+      align-items: baseline;
+  }
+
+  .@{ant-prefix}-tree .@{ant-prefix}-tree-treenode-disabled {
+    .@{ant-prefix}-tree-node-content-wrapper {
+      color: var(--zaui-text);
+    }
+  
+    .pro-tree-tree-node.checked {
+      color: var(--zaui-text);
+    }
+  
+    .pro-tree-tree-node.checked .brand-bg-opa-ten {
+      background-color: inherit;
+    }
+  }
+
+  // 解决双滚动条
+  .@{ant-prefix}-select-dropdown.pro-tree-select-drop-down-container.checkable-tree{
+    overflow: hidden!important;
+  }
+
   .@{ant-prefix}-spin-nested-loading {
     height: 100%; // tree auto css
 
@@ -304,19 +328,6 @@
   }
 }
 
-.@{ant-prefix}-tree .@{ant-prefix}-tree-treenode-disabled {
-  .@{ant-prefix}-tree-node-content-wrapper {
-    color: var(--zaui-text);
-  }
-
-  .pro-tree-tree-node.checked {
-    color: var(--zaui-text);
-  }
-
-  .pro-tree-tree-node.checked .brand-bg-opa-ten {
-    background-color: inherit;
-  }
-}
 
 // 重置ant-form view模式样式ant-tree样式
 .pro-form.pro-form-view .@{ant-prefix}-form-item .pro-tree * {
@@ -324,10 +335,6 @@
   height     : auto !important;
   min-height : auto !important;
 }
-.ant-tree-node-content-wrapper{
-  display: flex;
-    align-items: baseline;
-}
 
 .pro-form.pro-form-view .@{ant-prefix}-form-item .pro-tree .@{ant-prefix}-tree-checkbox {
   margin-top: var(--zaui-space-size-sm);
@@ -341,7 +348,3 @@
   height: 16px !important;
 }
 
-// 解决双滚动条
-.@{ant-prefix}-select-dropdown.pro-tree-select-drop-down-container.checkable-tree{
-  overflow: hidden!important;
-}

package/lib/ProForm/components/base/RangePicker/index.js

@@ -29,9 +29,16 @@ var RangePicker = function RangePicker(props) {
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
+  var _res = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+    showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
+  });
+  // 字符串时间格式兼容
+  if (Array.isArray(_res.value) && (0, _lodash.isString)(_res.value[0]) && (0, _lodash.isString)(_res.value[1])) {
+    _res.value = [(0, _moment.default)(_res.value[0]), (0, _moment.default)(_res.value[1])];
+  }
   if (isView) {
-    var _props$value = props.value,
-      value = _props$value === void 0 ? [] : _props$value;
+    var _res$value = _res.value,
+      value = _res$value === void 0 ? [] : _res$value;
     var viewChildren = null;
     if (!value || !value[0] || !value[1]) {
       viewChildren = null;
@@ -53,13 +60,6 @@ var RangePicker = function RangePicker(props) {
       children: viewChildren
     });
   }
-  var _res = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
-    showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
-  });
-  // 字符串时间格式兼容
-  if (Array.isArray(_res.value) && (0, _lodash.isString)(_res.value[0]) && (0, _lodash.isString)(_res.value[1])) {
-    _res.value = [(0, _moment.default)(_res.value[0]), (0, _moment.default)(_res.value[1])];
-  }
   return (0, _jsxRuntime.jsx)(AntRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), (0, _lodash.omit)(_res, ['separator'])));
 };
 var _default = exports.default = RangePicker;

package/lib/ProTree/style/index.less

@@ -4,6 +4,30 @@
 .pro-tree {
   height: 100%; // tree auto css
 
+  .@{ant-prefix}-tree-node-content-wrapper{
+    display: flex;
+      align-items: baseline;
+  }
+
+  .@{ant-prefix}-tree .@{ant-prefix}-tree-treenode-disabled {
+    .@{ant-prefix}-tree-node-content-wrapper {
+      color: var(--zaui-text);
+    }
+  
+    .pro-tree-tree-node.checked {
+      color: var(--zaui-text);
+    }
+  
+    .pro-tree-tree-node.checked .brand-bg-opa-ten {
+      background-color: inherit;
+    }
+  }
+
+  // 解决双滚动条
+  .@{ant-prefix}-select-dropdown.pro-tree-select-drop-down-container.checkable-tree{
+    overflow: hidden!important;
+  }
+
   .@{ant-prefix}-spin-nested-loading {
     height: 100%; // tree auto css
 
@@ -304,19 +328,6 @@
   }
 }
 
-.@{ant-prefix}-tree .@{ant-prefix}-tree-treenode-disabled {
-  .@{ant-prefix}-tree-node-content-wrapper {
-    color: var(--zaui-text);
-  }
-
-  .pro-tree-tree-node.checked {
-    color: var(--zaui-text);
-  }
-
-  .pro-tree-tree-node.checked .brand-bg-opa-ten {
-    background-color: inherit;
-  }
-}
 
 // 重置ant-form view模式样式ant-tree样式
 .pro-form.pro-form-view .@{ant-prefix}-form-item .pro-tree * {
@@ -324,10 +335,6 @@
   height     : auto !important;
   min-height : auto !important;
 }
-.ant-tree-node-content-wrapper{
-  display: flex;
-    align-items: baseline;
-}
 
 .pro-form.pro-form-view .@{ant-prefix}-form-item .pro-tree .@{ant-prefix}-tree-checkbox {
   margin-top: var(--zaui-space-size-sm);
@@ -341,7 +348,3 @@
   height: 16px !important;
 }
 
-// 解决双滚动条
-.@{ant-prefix}-select-dropdown.pro-tree-select-drop-down-container.checkable-tree{
-  overflow: hidden!important;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.5-beta.17",
+  "version": "3.4.5-beta.19",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",