@zgfe/business-lib 1.0.27-adanalysis.0 → 1.0.27-tags.1

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: '添加失败',
@@ -196,9 +214,8 @@ var BizAddToPanel = function BizAddToPanel(props) {
     maskClosable: false,
     onCancel: props.onCancel,
     onOk: onAdd,
-    confirmLoading: loading
-  }, /*#__PURE__*/React.createElement(Skeleton, {
-    loading: ready
+    confirmLoading: loading,
+    className: classPrefix
   }, /*#__PURE__*/React.createElement(Form, {
     ref: refForm,
     onFinish: onSubmit,
@@ -245,6 +262,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 +293,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
     }, /*#__PURE__*/React.createElement(RadioGroup, {
       options: props.showOptions
     })) : null;
-  }))));
+  })));
 };
 
 BizAddToPanel.defaultProps = {

package/es/addToPanel/styles/index.less

@@ -6,4 +6,11 @@
   &-show {
     transform: translateY(6px);
   }
+  .ant-modal-body {
+    max-height: 400px;
+    max-height: 400px !important;
+    padding-top: @padding-xs !important;
+    padding-bottom: 0 !important;
+    overflow: auto !important;
+  }
 }

package/es/addToScene/index.js

@@ -141,7 +141,8 @@ var BizAddToScene = function BizAddToScene(props) {
     maskClosable: false,
     onOk: onSave,
     onCancel: onCancel,
-    confirmLoading: loading
+    confirmLoading: loading,
+    className: classPrefix
   }, /*#__PURE__*/React.createElement(Form, {
     autoComplete: "off",
     ref: refForm,

package/es/addToScene/styles/index.less

@@ -20,4 +20,11 @@
       box-shadow: none;
     }
   }
+  .ant-modal-body {
+    max-height: 400px;
+    max-height: 400px !important;
+    padding-top: @padding-xs !important;
+    padding-bottom: 0 !important;
+    overflow: auto !important;
+  }
 }