@zgfe/business-lib 1.1.54 → 1.1.55-beta.1

package/es/addToPanel/demo/index.js

@@ -15,6 +15,10 @@ var chartTypes = [{
   label: '汇总图',
   value: 'bar',
   icon: 'huizongtu'
+}, {
+  label: '占比图',
+  value: 'pie',
+  icon: 'huizongtu'
 }, {
   label: '地图',
   value: 'map',
@@ -32,6 +36,10 @@ var chartTypes = [{
     label: '汇总图',
     value: 'bar',
     icon: 'huizongtu'
+  }, {
+    label: '占比图',
+    value: 'pie',
+    icon: 'huizongtu'
   }]
 }, {
   label: '分数',

package/es/addToPanel/index.js

@@ -43,6 +43,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
     router = _useContext.router,
     routes = _useContext.routes,
     isDemo = _useContext.isDemo;
+  var showTypes = ['line', 'bar', 'pie'];
   useEffect(function () {
     queryGroups();
   }, []);
@@ -166,8 +167,8 @@ var BizAddToPanel = function BizAddToPanel(props) {
   }
   return /*#__PURE__*/React.createElement(BizDialog, {
     open: true,
+    width: "auto",
     title: props.type === 'edit' ? '修改当前看板指标' : '向看板添加指标',
-    width: 503,
     maskClosable: false,
     onCancel: props.onCancel,
     onOk: onAdd,
@@ -249,7 +250,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
   }, function (_ref) {
     var getFieldValue = _ref.getFieldValue;
     var type = getFieldValue('chartType');
-    return type === 'line' || type === 'bar' ? /*#__PURE__*/React.createElement(Form.Item, {
+    return showTypes.indexOf(type) > -1 ? /*#__PURE__*/React.createElement(Form.Item, {
       label: "\u663E\u793A",
       name: "showList",
       colon: false,

package/es/demoWrapper/head.d.ts

@@ -4,5 +4,6 @@ declare const DemoHeader: React.FC<{
     defaultApp?: number;
     onChangeApp?: (app: AppInfoProps) => void;
     onLoading?: (loading: boolean) => void;
+    onLogin?: () => void;
 }>;
 export default DemoHeader;

package/es/demoWrapper/head.js

@@ -4,13 +4,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { Select, Skeleton } from 'antd';
+import { Select, Skeleton, message } from 'antd';
 import React, { useEffect, useState } from 'react';
 import request from '../utils/ajax';
 var DemoHeader = function DemoHeader(_ref) {
   var defaultApp = _ref.defaultApp,
     onChangeApp = _ref.onChangeApp,
-    onLoading = _ref.onLoading;
+    onLoading = _ref.onLoading,
+    onLogin = _ref.onLogin;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     appList = _useState2[0],
@@ -28,6 +29,11 @@ var DemoHeader = function DemoHeader(_ref) {
   function queryAppList() {
     setLoading(true);
     request('/zg/web/v2/data/v2ajaxGetDataByApp').then(function (res) {
+      if (!res.data) {
+        message.error('获取应用列表失败，请重新登录');
+        onLogin && onLogin();
+        return;
+      }
       setAppList(res.data.appList);
       if (defaultApp) {
         _onChange(res.data.appList.find(function (item) {

package/es/demoWrapper/index.js

@@ -60,7 +60,10 @@ var DemoWrapper = function DemoWrapper(_ref) {
     title: /*#__PURE__*/React.createElement(DemoHeader, {
       defaultApp: defaultApp,
       onChangeApp: setApp,
-      onLoading: setAppListLoading
+      onLoading: setAppListLoading,
+      onLogin: function onLogin() {
+        return setNotLogin(true);
+      }
     }),
     className: className,
     bodyStyle: {

package/es/layout/optionTitle/demo/page.d.ts

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

package/es/layout/optionTitle/demo/page.js

@@ -0,0 +1,5 @@
+import React from 'react';
+import BizTargetFromPanel from '..';
+export default (function () {
+  return /*#__PURE__*/React.createElement(BizTargetFromPanel, null, /*#__PURE__*/React.createElement("div", null, "\u65E0\u64CD\u4F5C\u680F\u5C55\u793A"));
+});

package/es/layout/optionTitle/index.js

@@ -19,12 +19,12 @@ import Apis from '../../constants/apis';
 import { Spin, message } from 'antd';
 export var classPrefix = 'biz-layout-panel';
 var BizTargetFromPanel = function BizTargetFromPanel(props) {
-  var _props$value$target$p;
+  var _props$value, _props$value10, _props$value$target$p;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     options = _useState2[0],
     setOptions = _useState2[1];
-  var _useState3 = useState(props.value.target.name || '洞察'),
+  var _useState3 = useState(((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.target.name) || '洞察'),
     _useState4 = _slicedToArray(_useState3, 2),
     title = _useState4[0],
     setTitle = _useState4[1];
@@ -42,11 +42,14 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
     setLoading = _useState10[1];
   var titleRef = useRef(null);
   useEffect(function () {
-    setOptions(props.value.target.id ? panelBtn(onClick) : panelCreateBtn(onClick));
+    var _props$value2, _props$value3;
+    if (!((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.panelId)) return;
+    setOptions(((_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.target.id) ? panelBtn(onClick) : panelCreateBtn(onClick));
   }, []);
   var onClick = function onClick(type) {
     if (type === BizOptionTitleProps.OptionTypes.CANCEL) {
-      var param = props.value.target.id ? {
+      var _props$value4;
+      var param = ((_props$value4 = props.value) === null || _props$value4 === void 0 ? void 0 : _props$value4.target.id) ? {
         panelId: props.value.panelId,
         elementId: props.value.target.id,
         name: title
@@ -62,12 +65,13 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
     }
   };
   var onDelete = function onDelete() {
+    var _props$value5, _props$value6;
     setLoading(true);
     ajax(Apis.delPanelElement, {
       method: 'post',
       data: {
-        panelId: props.value.panelId,
-        elementId: props.value.target.id
+        panelId: (_props$value5 = props.value) === null || _props$value5 === void 0 ? void 0 : _props$value5.panelId,
+        elementId: (_props$value6 = props.value) === null || _props$value6 === void 0 ? void 0 : _props$value6.target.id
       }
     }).then(function (res) {
       if (!res) return;
@@ -80,6 +84,7 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
     });
   };
   var onService = function onService(value, callback) {
+    var _props$value7, _props$value8;
     setTitle(value);
     setBtnOptions(!value);
     if (!value) return;
@@ -87,8 +92,8 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
     ajax(Apis.updateElementName, {
       method: 'post',
       data: {
-        panelId: props.value.panelId,
-        elementId: props.value.target.id,
+        panelId: (_props$value7 = props.value) === null || _props$value7 === void 0 ? void 0 : _props$value7.panelId,
+        elementId: (_props$value8 = props.value) === null || _props$value8 === void 0 ? void 0 : _props$value8.target.id,
         name: value
       }
     }).then(function (res) {
@@ -112,20 +117,27 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
   };
   var setBtnOptions = function setBtnOptions(disabled) {
     setOptions(function (option) {
+      var _props$value9;
       if (!option.length) return [];
       option[option.length - 1].disabled = disabled;
-      if (props.value.target.id) {
+      if ((_props$value9 = props.value) === null || _props$value9 === void 0 ? void 0 : _props$value9.target.id) {
         option[option.length - 2].disabled = disabled;
       }
       return _toConsumableArray(option);
     });
   };
+  if (!((_props$value10 = props.value) === null || _props$value10 === void 0 ? void 0 : _props$value10.panelId)) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-content")
+    }, props.children);
+  }
   return /*#__PURE__*/React.createElement(BizTargetFromPanelContext.Provider, {
     value: {
       handleSearch: setBtnOptions
     }
   }, /*#__PURE__*/React.createElement(Spin, {
-    spinning: loading
+    spinning: loading,
+    wrapperClassName: classPrefix
   }, /*#__PURE__*/React.createElement(BizOptionLayout, {
     ref: titleRef,
     value: title,
@@ -136,7 +148,9 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
     onBack: function onBack() {
       return onClick(BizOptionTitleProps.OptionTypes.CANCEL);
     }
-  }, props.children, showDialog && /*#__PURE__*/React.createElement(BizAddToPanel, {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-content ").concat(classPrefix, "-content2")
+  }, props.children), showDialog && /*#__PURE__*/React.createElement(BizAddToPanel, {
     defaultValue: {
       panel: {
         id: props.value.panelId

package/es/layout/optionTitle/layout.js

@@ -7,7 +7,7 @@ var BizOptionLayout = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var className = props.className;
   var classPrefix = 'biz-option-layout';
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, " ").concat(className)
+    className: "".concat(classPrefix, " ").concat(className || '')
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-header")
   }, /*#__PURE__*/React.createElement("div", {

package/es/layout/optionTitle/styles/index.less

@@ -1,6 +1,11 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 
 .biz-layout-panel {
+  width: 100%;
+  height: 100%;
+  & > .ant-spin-container {
+    height: 100%;
+  }
   /*更多按钮*/
   &-btn-more {
     width: @height-base;
@@ -16,4 +21,14 @@
       .__default-hover();
     }
   }
+
+  &-content {
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+  }
+  &-content2 {
+    height: calc(100% - 64px);
+    border-bottom: 1px solid @border-color-base;
+  }
 }

package/es/layout/optionTitle/styles/layout.less

@@ -11,7 +11,6 @@
     width: 100%;
     height: 64px;
     padding: 0 16px;
-    border-bottom: 1px solid @border-color-base;
 
     &-title {
       display: flex;

package/es/layout/optionTitle/types.d.ts

@@ -2,8 +2,8 @@ import React from 'react';
 import AddToPanel from '../../addToPanel/types';
 export declare namespace BizOptionTitleProps {
     export interface Props {
-        value: Value;
-        styleOptions: AddToPanel.TabItem[];
+        value?: Value;
+        styleOptions?: AddToPanel.TabItem[];
         children: React.ReactNode;
         afterEditTarget?: (type: string, value?: any) => void;
     }

package/es/utils/ajax.js

@@ -80,6 +80,7 @@ export function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
     msg = '账户未登录或登录已失效';
   } else if (new RegExp("".concat(ResponseStatus.noPermission)).test(apiResult.code)) {
     msg = '账户没有权限';
+    throw new Error(apiResult.msg);
   }
   if (!flag) {
     msg = apiResult.msg || msg;
@@ -88,6 +89,7 @@ export function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
       description: msg
     });
     message.error(msg);
+    throw new Error(msg);
   }
   return apiResult;
 }

package/es/utils/demo/ajax.js

@@ -1,7 +1,6 @@
 import { Button } from 'antd';
 import React from 'react';
-import { ajax } from '@zgfe/business-lib';
-import { DemoWrapper } from '@zgfe/business-lib';
+import { ajax, DemoWrapper } from '@zgfe/business-lib';
 export default (function () {
   var onDownload = function onDownload() {
     ajax('/zg/web/v2/openapi/label/excel/export', {

package/package.json

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