@zgfe/business-lib 1.0.25-insight.5 → 1.0.25-layers.2

package/es/addToPanel/index.js

@@ -1,9 +1,3 @@
-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."); }
@@ -16,7 +10,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 } from 'antd';
+import { Button, Form, Input, notification, Skeleton } from 'antd';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import BizDialog from '../dialog';
 import BizSelect from '../select';
@@ -49,10 +43,15 @@ var BizAddToPanel = function BizAddToPanel(props) {
       formData = _useState6[0],
       setFormData = _useState6[1];
 
-  var _useState7 = useState(false),
+  var _useState7 = useState(true),
       _useState8 = _slicedToArray(_useState7, 2),
-      loading = _useState8[0],
-      setLoading = _useState8[1];
+      ready = _useState8[0],
+      setReady = _useState8[1];
+
+  var _useState9 = useState(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      loading = _useState10[0],
+      setLoading = _useState10[1];
 
   var _useContext = useContext(BizGlobalDataContext),
       currentApp = _useContext.currentApp,
@@ -80,14 +79,14 @@ var BizAddToPanel = function BizAddToPanel(props) {
         notification.error({
           message: '获取看板列表失败'
         });
+        setReady(false);
         return;
       }
 
       setGroupList(res.panels);
+      setReady(false);
     }).catch(function () {
-      notification.error({
-        message: '获取看板列表失败'
-      });
+      setReady(false);
     });
   }
 
@@ -158,7 +157,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
       var result = res;
 
       if (result.flag === 101) {
-        var _result$panel2, _result$panel3;
+        var _result$panel2;
 
         notification.success({
           message: /*#__PURE__*/React.createElement(React.Fragment, null, msgType, "\u81F3", /*#__PURE__*/React.createElement("a", {
@@ -174,9 +173,7 @@ 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 : _objectSpread({
-          panelId: ((_result$panel3 = result.panel) === null || _result$panel3 === void 0 ? void 0 : _result$panel3.id) || form.panel.id
-        }, result.panel_element));
+        if (props.onOk) props.onOk(props.type === 'edit' ? data : result.panel_element);
       } else if (result.flag === -101) {
         notification.error({
           message: '添加失败',
@@ -200,6 +197,8 @@ 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,
@@ -276,7 +275,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: @background-color-base !important;
+  border-color: #fff !important;
   border-radius: @border-radius-small!important;
 
   .ant-input {
@@ -31,10 +31,6 @@
   }
 }
 
-.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;
@@ -146,10 +142,9 @@
     display: none !important;
   }
 
-  &,
   &.ant-picker-range {
     background-color: @background-color-base;
-    border-color: @background-color-base;
+    border: none;
   }
 }
 

package/es/attributeSelector/util.js

@@ -14,8 +14,6 @@ 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 = {
@@ -41,14 +39,8 @@ export default function convertAttributeData(store) {
         eventHidden: e.event_hidden,
         marked: Boolean(e.mark_type)
       };
-
-      if (event.marked) {
-        markList.push(event);
-      } else {
-        list.push(event);
-      }
+      group.eventList.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,11 +1,12 @@
 import React from 'react';
 import { BizChart } from '@zgfe/business-lib';
-import chartData, { barData } from './data/data';
+import chartData from './data/data';
 export default (function () {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizChart, {
-    data: barData,
+    data: chartData,
     type: "bar",
-    reverseXAxis: true
+    reverseXAxis: true,
+    showList: ['付款成功', '搜索商品', '查看商品详情']
   }), /*#__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,10 +6,3 @@ 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,14 +25,4 @@ 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,7 +2,9 @@ declare const _default: {
     x_axis: string[];
     series: {
         names: string[];
+        original_names: string[];
         values: number[];
+        total: never[];
     }[];
 };
 export default _default;