@zgfe/business-lib 1.1.55-beta.0 → 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,6 +167,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
   }
   return /*#__PURE__*/React.createElement(BizDialog, {
     open: true,
+    width: "auto",
     title: props.type === 'edit' ? '修改当前看板指标' : '向看板添加指标',
     maskClosable: false,
     onCancel: props.onCancel,
@@ -248,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/layout/optionTitle/index.js

@@ -127,14 +127,17 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
     });
   };
   if (!((_props$value10 = props.value) === null || _props$value10 === void 0 ? void 0 : _props$value10.panelId)) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
+    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,
@@ -145,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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.55-beta.0",
+  "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": "d43bbb8c72bb0da5995f873be7dc97bd009afbc3"
+  "gitHead": "0973fcf26dc2e3a4d0ddfa017f80348528cea00d"
 }