@zgfe/business-lib 1.0.25-layers.3 → 1.0.25-userGroupFix.0

package/es/addToPanel/index.js

@@ -1,3 +1,9 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -10,7 +16,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import { Button, Form, Input, notification, Skeleton } from 'antd';
+import { Button, Form, Input, notification } from 'antd';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import BizDialog from '../dialog';
 import BizSelect from '../select';
@@ -43,15 +49,10 @@ var BizAddToPanel = function BizAddToPanel(props) {
       formData = _useState6[0],
       setFormData = _useState6[1];
 
-  var _useState7 = useState(true),
+  var _useState7 = useState(false),
       _useState8 = _slicedToArray(_useState7, 2),
-      ready = _useState8[0],
-      setReady = _useState8[1];
-
-  var _useState9 = useState(false),
-      _useState10 = _slicedToArray(_useState9, 2),
-      loading = _useState10[0],
-      setLoading = _useState10[1];
+      loading = _useState8[0],
+      setLoading = _useState8[1];
 
   var _useContext = useContext(BizGlobalDataContext),
       currentApp = _useContext.currentApp,
@@ -79,14 +80,14 @@ var BizAddToPanel = function BizAddToPanel(props) {
         notification.error({
           message: '获取看板列表失败'
         });
-        setReady(false);
         return;
       }
 
       setGroupList(res.panels);
-      setReady(false);
     }).catch(function () {
-      setReady(false);
+      notification.error({
+        message: '获取看板列表失败'
+      });
     });
   }
 
@@ -173,7 +174,24 @@ var BizAddToPanel = function BizAddToPanel(props) {
             }
           }, form.panel.name || ((_result$panel2 = result.panel) === null || _result$panel2 === void 0 ? void 0 : _result$panel2.name)), "\u6210\u529F")
         });
-        if (props.onOk) props.onOk(props.type === 'edit' ? data : result.panel_element);
+
+        if (props.onOk) {
+          var responseData = data;
+
+          if (props.type !== 'edit') {
+            var _result$panel3;
+
+            responseData = _objectSpread({
+              panelId: ((_result$panel3 = result.panel) === null || _result$panel3 === void 0 ? void 0 : _result$panel3.id) || form.panel.id
+            }, result.panel_element);
+
+            if (form.panel.id === 0) {
+              responseData.panel = _objectSpread({}, result.panel);
+            }
+          }
+
+          props.onOk(responseData);
+        }
       } else if (result.flag === -101) {
         notification.error({
           message: '添加失败',
@@ -197,8 +215,6 @@ var BizAddToPanel = function BizAddToPanel(props) {
     onCancel: props.onCancel,
     onOk: onAdd,
     confirmLoading: loading
-  }, /*#__PURE__*/React.createElement(Skeleton, {
-    loading: ready
   }, /*#__PURE__*/React.createElement(Form, {
     ref: refForm,
     onFinish: onSubmit,
@@ -245,6 +261,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
     }]
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u6307\u6807\u540D\u79F0",
+    autoComplete: "off",
     allowClear: {
       clearIcon: /*#__PURE__*/React.createElement(IconFont, {
         type: 'qingchu'
@@ -275,7 +292,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
     }, /*#__PURE__*/React.createElement(RadioGroup, {
       options: props.showOptions
     })) : null;
-  }))));
+  })));
 };
 
 BizAddToPanel.defaultProps = {

package/es/assets/styles/resetAntd.less

@@ -5,7 +5,7 @@
 // 输入框（带icon)
 .ant-input-affix-wrapper {
   background-color: @background-color-base!important;
-  border-color: #fff !important;
+  border-color: @background-color-base !important;
   border-radius: @border-radius-small!important;
 
   .ant-input {
@@ -31,6 +31,10 @@
   }
 }
 
+.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper,
+.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper:hover {
+  border-color: @error-color!important;
+}
 // 输入框
 .ant-input {
   background-color: @background-color-base!important;
@@ -142,9 +146,10 @@
     display: none !important;
   }
 
+  &,
   &.ant-picker-range {
     background-color: @background-color-base;
-    border: none;
+    border-color: @background-color-base;
   }
 }
 

package/es/attrConditions/components/stringList.js

@@ -176,7 +176,7 @@ var StringList = function StringList(props) {
     className: "".concat(classPrefix, "-multi-select"),
     value: current,
     multiple: true,
-    enableCreate: true,
+    enableCreate: false,
     theme: props.theme,
     size: "middle",
     disable: props.operate === OperateTypes.IsNull || props.operate === OperateTypes.IsNotNull,

package/es/attrConditions/components/valuesList.js

@@ -42,8 +42,8 @@ var ValuesList = function ValuesList(props) {
 
   var _useState5 = useState(true),
       _useState6 = _slicedToArray(_useState5, 2),
-      ready = _useState6[0],
-      setReady = _useState6[1];
+      isFirst = _useState6[0],
+      setIsFirst = _useState6[1];
 
   useEffect(function () {
     if (defaultValue) {
@@ -55,16 +55,18 @@ var ValuesList = function ValuesList(props) {
       }
     }
 
-    setReady(false);
+    setIsFirst(false);
   }, []);
   useEffect(function () {
+    if (isFirst) return;
+
     if (operate === OperateTypes.Absolute || operate === OperateTypes.Relative) {
       var data = operate === OperateTypes.Absolute ? initValue : ['30', '1'];
       onChange(data);
     }
   }, [operate]);
   useEffect(function () {
-    if (!ready && (attr === null || attr === void 0 ? void 0 : attr.type) !== PropType.DATE) {
+    if (!isFirst && (attr === null || attr === void 0 ? void 0 : attr.type) !== PropType.DATE) {
       onChange([]);
       setCurrent([]);
     }
@@ -115,7 +117,7 @@ var ValuesList = function ValuesList(props) {
     return current && current > moment().endOf('day');
   };
 
-  if (!attr || !operate || ready) {
+  if (!attr || !operate || isFirst) {
     return /*#__PURE__*/React.createElement(BizSelect, {
       disable: true,
       className: "".concat(classPrefix, "-multi-select"),

package/es/attrConditions/group.js

@@ -53,7 +53,7 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
     var data = props.defaultValue || props.value;
 
     if (data) {
-      if (data.relation) setRelation(data.relation);
+      if (data.relation) setRelation(props.onlyAnd ? 'and' : data.relation);
 
       if (data.conditions) {
         setConditions(function () {
@@ -77,7 +77,7 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
       },
       setValue: function setValue(data) {
         if (data) {
-          if (data.relation) setRelation(data.relation);
+          if (data.relation) setRelation(props.onlyAnd ? 'and' : data.relation);
 
           if (data.conditions) {
             setConditions(function () {
@@ -169,8 +169,8 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
     className: "".concat(classPrefix, "-group-operate"),
     onClick: onClickRelation
   }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-group-operate-text ").concat(relation === 'and' ? 'active' : '')
-  }, "\u4E14"), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-group-operate-text ").concat(relation === 'and' || props.onlyAnd ? 'active' : '')
+  }, "\u4E14"), !props.onlyAnd && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-group-operate-text ").concat(relation === 'or' ? 'active' : '')
   }, "\u6216"))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-item-container")

package/es/attrConditions/types.d.ts

@@ -36,6 +36,7 @@ export declare namespace AttrConditionTypes {
     interface GroupProp extends BasicAttrTypes {
         defaultValue?: GroupValue;
         value?: GroupValue;
+        onlyAnd?: boolean;
         onChange?: (value: GroupValue) => void;
         onConditionsCount?: (value: number) => void;
     }

package/es/attributeSelector/styles/index.less

@@ -1,15 +1,18 @@
 @import '../../assets/styles/inner.less';
+
 .biz-attr-select {
   &-handle {
     display: flex;
     flex-direction: row;
     .__select-handle();
+
     &:hover .biz-attr-select-del-icon {
       display: flex;
       align-items: center;
       justify-content: center;
     }
   }
+
   &-del-icon {
     display: none;
     flex: none;
@@ -21,48 +24,69 @@
       .__error-hover();
     }
   }
+
   &-drowdown {
     .__select-panel();
+
     &.nodata {
       .__select-nodata();
     }
   }
+
   &-anchor-panel {
     padding: 12px 0;
+
     .ant-anchor {
       display: flex;
       flex-direction: row;
+
       .ant-anchor-ink::before {
         width: 0;
       }
+
       .ant-anchor-link {
         padding: 0;
+
         &:last-of-type .ant-btn {
           margin-right: 0;
         }
       }
+
       .ant-btn {
         margin-right: 8px;
       }
+
       .ant-anchor-link-active .ant-btn {
-        .__default-hover();
+        &,
+        &:focus {
+          .__default-hover();
+        }
+      }
+
+      .ant-btn:focus {
+        color: @text-color;
+        border-color: @border-color-base;
       }
     }
   }
+
   &-container {
-    max-height: 400px;
+    max-height: 224px;
     overflow-x: hidden;
     overflow-y: auto;
   }
+
   &-nodata {
     .__select-nodata();
   }
+
   &-group {
     position: relative;
     height: 32px;
     padding: 0 @padding-sm;
     color: @text-color-secondary;
     line-height: 32px;
+
     &::before {
       position: absolute;
       top: 9px;
@@ -73,6 +97,7 @@
       border-radius: 10px;
       content: '';
     }
+
     & > span {
       position: relative;
       display: inline-block;
@@ -82,6 +107,7 @@
       .__default-overflow();
     }
   }
+
   &-split {
     position: absolute;
     top: 18px;
@@ -89,12 +115,15 @@
     height: 0;
     border-bottom: 1px solid @border-color-base;
   }
+
   &-option {
     .__select-option();
+
     &:not(.active, :hover, .disabled) .biz-attr-select-highlight {
       color: @primary-color;
     }
   }
+
   &-option-icon {
     margin-right: @margin-xs;
   }

package/es/attributeSelector/util.js

@@ -14,6 +14,8 @@ export default function convertAttributeData(store) {
       name: group_.groupName,
       eventList: []
     };
+    var list = [];
+    var markList = [];
     group_.eventList.forEach(function (e) {
       if (e.is_delete) return;
       var event = {
@@ -39,8 +41,14 @@ export default function convertAttributeData(store) {
         eventHidden: e.event_hidden,
         marked: Boolean(e.mark_type)
       };
-      group.eventList.push(event);
+
+      if (event.marked) {
+        markList.push(event);
+      } else {
+        list.push(event);
+      }
     });
+    group.eventList = [].concat(markList, list);
     (_res$eventGroupList = res.eventGroupList) === null || _res$eventGroupList === void 0 ? void 0 : _res$eventGroupList.push(group);
   });
   res.envPropList = (_store$envPropList = store.envPropList) === null || _store$envPropList === void 0 ? void 0 : _store$envPropList.map(function (prop) {

package/es/chart/demo/bar.js

@@ -1,12 +1,11 @@
 import React from 'react';
 import { BizChart } from '@zgfe/business-lib';
-import chartData from './data/data';
+import chartData, { barData } from './data/data';
 export default (function () {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizChart, {
-    data: chartData,
+    data: barData,
     type: "bar",
-    reverseXAxis: true,
-    showList: ['付款成功', '搜索商品', '查看商品详情']
+    reverseXAxis: true
   }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(BizChart, {
     data: chartData,
     type: "bar",

package/es/chart/demo/data/data.d.ts

@@ -6,3 +6,10 @@ declare const _default: {
     }[];
 };
 export default _default;
+export declare const barData: {
+    x_axis: string[];
+    series: {
+        names: string[];
+        values: number[];
+    }[];
+};

package/es/chart/demo/data/data.js

@@ -25,4 +25,14 @@ export default {
     names: ['申请退货'],
     values: [5, 11, 14, 9, 8, 14, 9, 10, 12, 12, 14, 16, 12, 10]
   }]
+};
+export var barData = {
+  x_axis: ['2022-08-23|2022-08-30'],
+  series: [{
+    names: ['北京市', '所有用户', '查看商品'],
+    values: [1560]
+  }, {
+    names: ['北京市', '最近7天活跃用户', '查看商品'],
+    values: [1560]
+  }]
 };

package/es/chart/demo/data/data3.d.ts

@@ -2,9 +2,7 @@ declare const _default: {
     x_axis: string[];
     series: {
         names: string[];
-        original_names: string[];
         values: number[];
-        total: never[];
     }[];
 };
 export default _default;