@zgfe/business-lib 1.1.55-beta.6 → 1.1.55-beta.9

package/es/assets/demo/picker.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => JSX.Element;
+export default _default;

package/es/assets/demo/picker.js

@@ -0,0 +1,22 @@
+import { Card, DatePicker, Space } from 'antd';
+import React from 'react';
+import AssetsDemo from '.';
+var RangePicker = DatePicker.RangePicker;
+export default (function () {
+  return /*#__PURE__*/React.createElement(AssetsDemo, null, /*#__PURE__*/React.createElement(Card, {
+    title: "Input"
+  }, /*#__PURE__*/React.createElement(Space, {
+    direction: "vertical",
+    size: 12
+  }, /*#__PURE__*/React.createElement(RangePicker, null), /*#__PURE__*/React.createElement(RangePicker, {
+    showTime: true
+  }), /*#__PURE__*/React.createElement(RangePicker, {
+    picker: "week"
+  }), /*#__PURE__*/React.createElement(RangePicker, {
+    picker: "month"
+  }), /*#__PURE__*/React.createElement(RangePicker, {
+    picker: "quarter"
+  }), /*#__PURE__*/React.createElement(RangePicker, {
+    picker: "year"
+  }))));
+});

package/es/assets/styles/chunks.less

@@ -25,10 +25,15 @@
 
 // 下拉组件操作栏样式
 .__select-handle {
-  padding: @padding-xss;
-  border: 1px solid @border-color-base;
+  // padding: @padding-xss;
+  // border: 1px solid @border-color-base;
+  background: @custom-background;
+  border: 1px solid @custom-background;
   border-radius: @border-radius-small;
   cursor: pointer;
+  &:hover {
+    border: 1px solid @primary-color;
+  }
 }
 
 // 下拉组件展开panel样式
@@ -118,7 +123,7 @@
   .__default-overflow();
 
   &:hover:not(.disable) {
-    background-color: @background-color-base;
+    // background-color: @background-color-base;
     border-color: @primary-color;
     box-shadow: none;
   }
@@ -132,14 +137,14 @@
 
 // 下拉框常用样式
 .__select-normal-secondary {
-  background-color: @white;
+  // background-color: @white;
   border: 1px solid @border-color-base;
   border-radius: @border-radius-small;
 
   &:not(.disable) {
     &:hover,
     &.active {
-      .__default-hover();
+      // .__default-hover();
       border-color: @border-color-base;
       box-shadow: none;
     }

package/es/assets/styles/resetAntd.less

@@ -162,14 +162,7 @@
 
   &:hover:not(.ant-picker-disabled),
   &.ant-picker-focused {
-    .__default-hover() !important;
-    border-color: @border-color-base!important;
-    box-shadow: none !important;
-
-    span,
-    input {
-      color: @primary-color!important;
-    }
+    border-color: @primary-color!important;
   }
 
   .ant-picker-active-bar {

package/es/assets/styles/variable.less

@@ -12,3 +12,6 @@
 @box-shadow-small: 0px 1px 2px @shadow-color-light;
 @primary-color-hover: color(~`colorPalette('@{primary-color}', 0.1) `);
 @box-shadow-form: 0 0 0 4px @primary-color-hover;
+@custom-background: #fafafb;
+@custom-focus: #f0f7ff;
+@primary-color: '#165dff';

package/es/attrCondition/styles/index.less

@@ -13,7 +13,6 @@
   .biz-attr-select-handle {
     width: 184px;
     padding: 0;
-    border: none;
   }
   .ant-space-item:nth-of-type(3) {
     min-width: 184px;

package/es/attrConditions/styles/index.less

@@ -2,9 +2,9 @@
 
 /* 筛选条件 */
 .biz-condition-item {
-  &.border {
-    .__select-handle();
-  }
+  // &.border {
+  //   .__select-handle();
+  // }
   &-panel {
     display: flex;
     width: 100%;
@@ -19,8 +19,6 @@
   .biz-attr-select-handle {
     margin-bottom: 2px;
     padding: 0;
-    border: none;
-    border-radius: 0;
   }
 
   .ant-input {

package/es/attributeSelector/index.js

@@ -83,7 +83,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     setVisible(flag);
   };
   return /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
+    className: "".concat(classPrefix, " ").concat(visible ? 'focus' : '')
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-handle")
   }, /*#__PURE__*/React.createElement(Dropdown, {

package/es/attributeSelector/styles/index.less

@@ -1,6 +1,10 @@
 @import '../../assets/styles/inner.less';
 
 .biz-attr-select {
+  border-radius: 4px;
+  &.focus {
+    box-shadow: 0 0 0 4px @custom-focus;
+  }
   &-handle {
     display: flex;
     flex-direction: row;

package/es/demoWrapper/index.js

@@ -11,6 +11,7 @@ import request from '../utils/ajax';
 import DemoContent from './content';
 import DemoHeader from './head';
 import './index.less';
+import { ResponseStatus } from '../utils/type';
 var DemoWrapper = function DemoWrapper(_ref) {
   var children = _ref.children,
     className = _ref.className,
@@ -38,8 +39,7 @@ var DemoWrapper = function DemoWrapper(_ref) {
   }, []);
   function getCurrentUser() {
     request('/zg/web/v2/user/getUserInfo').then(function (res) {
-      var _res$data;
-      if (res === null || (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.ret) === '-1') setNotLogin(true);
+      if (!res || new RegExp("".concat(ResponseStatus.notLogin)).test(res.code)) setNotLogin(true);
     }).catch(function (err) {
       console.error('获取用户信息失败', err);
     }).finally(function () {

package/es/eventSelector/demo/index.js

@@ -25,12 +25,7 @@ var EventDemo = function EventDemo() {
   var onChange = function onChange(data) {
     setValue(data);
   };
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      height: '500px',
-      overflow: 'auto'
-    }
-  }, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     style: {
       height: '700px'
     }

package/es/eventSelector/index.js

@@ -100,7 +100,7 @@ var BizEventSelector = function BizEventSelector(props) {
     setVisible(flag);
   };
   return /*#__PURE__*/React.createElement("div", {
-    className: [classPrefix, border ? 'border' : ''].join(' ')
+    className: [classPrefix, border ? 'border' : '', visible ? 'focus' : ''].join(' ')
   }, /*#__PURE__*/React.createElement(Dropdown, {
     dropdownRender: function dropdownRender() {
       return /*#__PURE__*/React.createElement(EventListPanel, {

package/es/eventSelector/styles/index.less

@@ -1,12 +1,16 @@
 @import '../../assets/styles/inner.less';
 
 .biz-event-select {
+  position: relative;
+  border-radius: 4px;
+  &.focus {
+    box-shadow: 0 0 0 4px @custom-focus;
+  }
   &.border {
     .biz-event-select-handle {
       .__select-handle();
     }
   }
-  position: relative;
   &-list-panel {
     display: flex;
     flex-direction: row;

package/es/quickDatePicker/index.js

@@ -132,7 +132,8 @@ var BizQuickDatePicker = function BizQuickDatePicker(props) {
     }))));
   };
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, " clearfix")
+    className: "".concat(classPrefix, " clearfix ").concat(show ? 'focus' : ''),
+    tabIndex: 1
   }, /*#__PURE__*/React.createElement("div", {
     onClick: function onClick() {
       setShow(true);

package/es/quickDatePicker/styles/index.less

@@ -5,7 +5,7 @@
   height: 34px;
   padding: 4px 8px;
   background: #fafafb;
-  border: 1px solid #165dff;
+  border: 1px solid #fafafb;
   border-radius: 4px;
   > :nth-child(1) {
     float: left;
@@ -25,6 +25,12 @@
       right: 0;
     }
   }
+  .ant-picker:hover {
+    .ant-picker-input > input,
+    .ant-picker-range-separator {
+      color: #021429 !important;
+    }
+  }
   &-content {
     float: left;
     .ant-picker-panel-container {
@@ -95,6 +101,13 @@
   }
 }
 
+.biz-quick-date-picker-wrap:hover {
+  border: 1px solid #165dff;
+}
+.biz-quick-date-picker-wrap.focus {
+  box-shadow: 0 0 0 4px #f0f7ff;
+}
+
 .clearfix:after {
   display: block;
   clear: both;

package/es/targetConditionGroup/styles/index.less

@@ -22,4 +22,7 @@
   &-submenu {
     width: 120px;
   }
+  .biz-event-select.focus {
+    box-shadow: none;
+  }
 }

package/es/targetSelector/styles/index.less

@@ -9,6 +9,9 @@
     flex: 1;
     width: 0;
   }
+  .biz-event-select.focus {
+    box-shadow: none;
+  }
 
   .biz-event-select-handle {
     flex: none;

package/es/userGroup/index.js

@@ -40,8 +40,15 @@ var BizUserGroup = function BizUserGroup(props) {
     setCurrent(value);
     if (props.onChange) props.onChange(value);
   };
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    focus = _useState6[0],
+    setFocus = _useState6[1];
+  var onVisibleChange = function onVisibleChange(visible) {
+    setFocus(visible);
+  };
   return /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
+    className: "".concat(classPrefix, " ").concat(focus ? 'focus' : '')
   }, /*#__PURE__*/React.createElement(Skeleton, {
     loading: loading,
     active: true,
@@ -57,7 +64,8 @@ var BizUserGroup = function BizUserGroup(props) {
     border: false,
     disableItemList: props.disableItemList,
     onChange: onChange,
-    minDropdownWidth: 284
+    minDropdownWidth: 284,
+    onVisibleChange: onVisibleChange
   }), /*#__PURE__*/React.createElement(BizTargetOptionIcon, {
     name: "delete",
     icon: "qingchu",

package/es/userGroup/styles/index.less

@@ -4,7 +4,9 @@
   position: relative;
   display: flex;
   .__select-handle();
-
+  &.focus {
+    box-shadow: 0 0 0 4px @custom-focus;
+  }
   .biz-select-handle {
     flex: 1;
     width: 100%;

package/es/utils/ajax.js

@@ -77,10 +77,10 @@ export function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
   if (new RegExp("".concat(ResponseStatus.success, "$")).test(apiResult.code)) {
     flag = true;
   } else if (new RegExp("".concat(ResponseStatus.notLogin)).test(apiResult.code)) {
-    message.error('账户未登录或登录已失效');
+    msg = '账户未登录或登录已失效';
     flag = true;
   } else if (new RegExp("".concat(ResponseStatus.noPermission)).test(apiResult.code)) {
-    message.error('账户没有权限');
+    msg = '账户没有权限';
     flag = true;
   }
   if (!flag) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.55-beta.6",
+  "version": "1.1.55-beta.9",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "ef3cee53b89f098aca2adfa5196bb8695bdb00e1"
+  "gitHead": "19c8bbf4c74e53724fbed40ff3803ac1db6bdf0a"
 }