@ztocwst/rc-pro-materials 0.1.32 → 0.1.33

package/es/components/z-templates-data-common/components/custom-renderer/index.js

@@ -1,3 +1,4 @@
+import _Spin from "antd/es/spin";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -26,8 +27,11 @@ var CustomRenderer = function CustomRenderer(props) {
     result = _useState[0],
     setResult = _useState[1];
   var _useState2 = useState(false),
-    isLink = _useState2[0],
-    setIsLink = _useState2[1];
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  var _useState3 = useState(false),
+    isLink = _useState3[0],
+    setIsLink = _useState3[1];
   var linkChartRef = useRef();
   var timer = null;
   var onLink = function onLink(values) {
@@ -62,25 +66,28 @@ var CustomRenderer = function CustomRenderer(props) {
               queryParams: queryParams,
               dataSetName: dataSetName
             };
-            _context.next = 8;
+            setLoading(true);
+            _context.next = 9;
             return getReportData(rcProContext, formatter ? formatter === null || formatter === void 0 ? void 0 : formatter(data) : data);
-          case 8:
+          case 9:
             res = _context.sent;
+            setLoading(false);
             if (res !== null && res !== void 0 && res.success) {
               setResult(res === null || res === void 0 ? void 0 : res.result);
             }
-            _context.next = 16;
+            _context.next = 19;
             break;
-          case 12:
-            _context.prev = 12;
+          case 14:
+            _context.prev = 14;
             _context.t0 = _context["catch"](1);
+            setLoading(false);
             setResult(null);
             console.error(_context.t0);
-          case 16:
+          case 19:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 12]]);
+      }, _callee, null, [[1, 14]]);
     }));
     return function getDataSource(_x) {
       return _ref2.apply(this, arguments);
@@ -141,11 +148,13 @@ var CustomRenderer = function CustomRenderer(props) {
       queryChart: queryChart
     };
   });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     style: {
       display: !isLink ? 'block' : 'none'
     }
-  }, (_props$child = props.child) === null || _props$child === void 0 ? void 0 : _props$child.call(props, result)), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(_Spin, {
+    spinning: loading
+  }, (_props$child = props.child) === null || _props$child === void 0 ? void 0 : _props$child.call(props, result))), /*#__PURE__*/React.createElement("div", {
     style: {
       display: isLink ? 'block' : 'none'
     }

package/es/components/z-templates-data-common/data-common.helper.js

@@ -162,30 +162,32 @@ var token = 'scm:tenant:token:2:104:177217352666D386AA01E5AF6293727D';
 /** 获取维度指标 */
 export var getDimTarget = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(rcProContext, params) {
-    var _ref2, materialsRequest, env, res, _res;
+    var _data_env_mapping$env;
+    var _ref2, materialsRequest, env, data_env_mapping, __env, res, _res;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _ref2 = rcProContext || {}, materialsRequest = _ref2.materialsRequest, env = _ref2.env; // 供应链里由子应用透传
+          _ref2 = rcProContext || {}, materialsRequest = _ref2.materialsRequest, env = _ref2.env, data_env_mapping = _ref2.data_env_mapping;
+          __env = (_data_env_mapping$env = data_env_mapping === null || data_env_mapping === void 0 ? void 0 : data_env_mapping[env]) !== null && _data_env_mapping$env !== void 0 ? _data_env_mapping$env : data_env_mapping === null || data_env_mapping === void 0 ? void 0 : data_env_mapping['__other']; // 供应链里由子应用透传
           if (!materialsRequest) {
-            _context.next = 6;
+            _context.next = 7;
             break;
           }
-          _context.next = 4;
+          _context.next = 5;
           return rcProRequest(rcProContext, "/data/forward/v1/bigdata/report/view/query/" + params.dataSetName, {
             method: 'POST',
             data: {
-              bigDataBody: _extends({
-                env: env
-              }, params)
+              bigDataBody: _extends({}, __env ? {
+                env: __env
+              } : {}, params)
             }
           });
-        case 4:
+        case 5:
           res = _context.sent;
           return _context.abrupt("return", res);
-        case 6:
-          _context.prev = 6;
-          _context.next = 9;
+        case 7:
+          _context.prev = 7;
+          _context.next = 10;
           return fetch("http://scm.gateway.dev.ztyc.com/data/forward/v1/bigdata/report/view/query/" + params.dataSetName, {
             method: 'POST',
             body: JSON.stringify({
@@ -198,21 +200,21 @@ export var getDimTarget = /*#__PURE__*/function () {
               token: token
             }
           });
-        case 9:
+        case 10:
           _res = _context.sent;
-          _context.next = 12;
+          _context.next = 13;
           return _res.json();
-        case 12:
+        case 13:
           return _context.abrupt("return", _context.sent);
-        case 15:
-          _context.prev = 15;
-          _context.t0 = _context["catch"](6);
+        case 16:
+          _context.prev = 16;
+          _context.t0 = _context["catch"](7);
           return _context.abrupt("return", {});
-        case 18:
+        case 19:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[6, 15]]);
+    }, _callee, null, [[7, 16]]);
   }));
   return function getDimTarget(_x, _x2) {
     return _ref.apply(this, arguments);
@@ -222,30 +224,32 @@ export var getDimTarget = /*#__PURE__*/function () {
 /** 获取报表数据 */
 export var getReportData = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(rcProContext, params) {
-    var _ref4, materialsRequest, env, res, _res2;
+    var _data_env_mapping$env2;
+    var _ref4, materialsRequest, env, data_env_mapping, __env, res, _res2;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          _ref4 = rcProContext || {}, materialsRequest = _ref4.materialsRequest, env = _ref4.env; // 供应链里由子应用透传
+          _ref4 = rcProContext || {}, materialsRequest = _ref4.materialsRequest, env = _ref4.env, data_env_mapping = _ref4.data_env_mapping;
+          __env = (_data_env_mapping$env2 = data_env_mapping === null || data_env_mapping === void 0 ? void 0 : data_env_mapping[env]) !== null && _data_env_mapping$env2 !== void 0 ? _data_env_mapping$env2 : data_env_mapping === null || data_env_mapping === void 0 ? void 0 : data_env_mapping['__other']; // 供应链里由子应用透传
           if (!materialsRequest) {
-            _context2.next = 6;
+            _context2.next = 7;
             break;
           }
-          _context2.next = 4;
+          _context2.next = 5;
           return rcProRequest(rcProContext, "/data/forward/v1/bigdata/report/" + params.dataSetName, {
             method: 'POST',
             data: {
-              bigDataBody: _extends({
-                env: env
-              }, params)
+              bigDataBody: _extends({}, __env ? {
+                env: __env
+              } : {}, params)
             }
           });
-        case 4:
+        case 5:
           res = _context2.sent;
           return _context2.abrupt("return", res);
-        case 6:
-          _context2.prev = 6;
-          _context2.next = 9;
+        case 7:
+          _context2.prev = 7;
+          _context2.next = 10;
           return fetch("http://scm.gateway.dev.ztyc.com/data/forward/v1/bigdata/report/" + params.dataSetName, {
             method: 'POST',
             body: JSON.stringify({
@@ -258,21 +262,21 @@ export var getReportData = /*#__PURE__*/function () {
               token: token
             }
           });
-        case 9:
+        case 10:
           _res2 = _context2.sent;
-          _context2.next = 12;
+          _context2.next = 13;
           return _res2.json();
-        case 12:
+        case 13:
           return _context2.abrupt("return", _context2.sent);
-        case 15:
-          _context2.prev = 15;
-          _context2.t0 = _context2["catch"](6);
+        case 16:
+          _context2.prev = 16;
+          _context2.t0 = _context2["catch"](7);
           return _context2.abrupt("return", {});
-        case 18:
+        case 19:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[6, 15]]);
+    }, _callee2, null, [[7, 16]]);
   }));
   return function getReportData(_x3, _x4) {
     return _ref3.apply(this, arguments);

package/es/style.js

@@ -20,4 +20,5 @@ import 'antd/es/message/style';
 import 'antd/es/tabs/style';
 import 'antd/es/checkbox/style';
 import 'antd/es/radio/style';
+import 'antd/es/spin/style';
 import './index.scss';

package/lib/components/z-templates-data-common/components/custom-renderer/index.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _spin = _interopRequireDefault(require("antd/lib/spin"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = require("react");
@@ -31,8 +32,11 @@ var CustomRenderer = function CustomRenderer(props) {
     result = _useState[0],
     setResult = _useState[1];
   var _useState2 = (0, _react.useState)(false),
-    isLink = _useState2[0],
-    setIsLink = _useState2[1];
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    isLink = _useState3[0],
+    setIsLink = _useState3[1];
   var linkChartRef = (0, _react.useRef)();
   var timer = null;
   var onLink = function onLink(values) {
@@ -67,25 +71,28 @@ var CustomRenderer = function CustomRenderer(props) {
               queryParams: queryParams,
               dataSetName: dataSetName
             };
-            _context.next = 8;
+            setLoading(true);
+            _context.next = 9;
             return (0, _dataCommon.getReportData)(rcProContext, formatter ? formatter === null || formatter === void 0 ? void 0 : formatter(data) : data);
-          case 8:
+          case 9:
             res = _context.sent;
+            setLoading(false);
             if (res !== null && res !== void 0 && res.success) {
               setResult(res === null || res === void 0 ? void 0 : res.result);
             }
-            _context.next = 16;
+            _context.next = 19;
             break;
-          case 12:
-            _context.prev = 12;
+          case 14:
+            _context.prev = 14;
             _context.t0 = _context["catch"](1);
+            setLoading(false);
             setResult(null);
             console.error(_context.t0);
-          case 16:
+          case 19:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 12]]);
+      }, _callee, null, [[1, 14]]);
     }));
     return function getDataSource(_x) {
       return _ref2.apply(this, arguments);
@@ -146,11 +153,13 @@ var CustomRenderer = function CustomRenderer(props) {
       queryChart: queryChart
     };
   });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     style: {
       display: !isLink ? 'block' : 'none'
     }
-  }, (_props$child = props.child) === null || _props$child === void 0 ? void 0 : _props$child.call(props, result)), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(_spin["default"], {
+    spinning: loading
+  }, (_props$child = props.child) === null || _props$child === void 0 ? void 0 : _props$child.call(props, result))), /*#__PURE__*/React.createElement("div", {
     style: {
       display: isLink ? 'block' : 'none'
     }

package/lib/components/z-templates-data-common/data-common.helper.js

@@ -177,30 +177,32 @@ var token = 'scm:tenant:token:2:104:177217352666D386AA01E5AF6293727D';
 /** 获取维度指标 */
 var getDimTarget = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(rcProContext, params) {
-    var _ref2, materialsRequest, env, res, _res;
+    var _data_env_mapping$env;
+    var _ref2, materialsRequest, env, data_env_mapping, __env, res, _res;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _ref2 = rcProContext || {}, materialsRequest = _ref2.materialsRequest, env = _ref2.env; // 供应链里由子应用透传
+          _ref2 = rcProContext || {}, materialsRequest = _ref2.materialsRequest, env = _ref2.env, data_env_mapping = _ref2.data_env_mapping;
+          __env = (_data_env_mapping$env = data_env_mapping === null || data_env_mapping === void 0 ? void 0 : data_env_mapping[env]) !== null && _data_env_mapping$env !== void 0 ? _data_env_mapping$env : data_env_mapping === null || data_env_mapping === void 0 ? void 0 : data_env_mapping['__other']; // 供应链里由子应用透传
           if (!materialsRequest) {
-            _context.next = 6;
+            _context.next = 7;
             break;
           }
-          _context.next = 4;
+          _context.next = 5;
           return (0, _rcProRequest["default"])(rcProContext, "/data/forward/v1/bigdata/report/view/query/" + params.dataSetName, {
             method: 'POST',
             data: {
-              bigDataBody: (0, _extends2["default"])({
-                env: env
-              }, params)
+              bigDataBody: (0, _extends2["default"])({}, __env ? {
+                env: __env
+              } : {}, params)
             }
           });
-        case 4:
+        case 5:
           res = _context.sent;
           return _context.abrupt("return", res);
-        case 6:
-          _context.prev = 6;
-          _context.next = 9;
+        case 7:
+          _context.prev = 7;
+          _context.next = 10;
           return fetch("http://scm.gateway.dev.ztyc.com/data/forward/v1/bigdata/report/view/query/" + params.dataSetName, {
             method: 'POST',
             body: JSON.stringify({
@@ -213,21 +215,21 @@ var getDimTarget = /*#__PURE__*/function () {
               token: token
             }
           });
-        case 9:
+        case 10:
           _res = _context.sent;
-          _context.next = 12;
+          _context.next = 13;
           return _res.json();
-        case 12:
+        case 13:
           return _context.abrupt("return", _context.sent);
-        case 15:
-          _context.prev = 15;
-          _context.t0 = _context["catch"](6);
+        case 16:
+          _context.prev = 16;
+          _context.t0 = _context["catch"](7);
           return _context.abrupt("return", {});
-        case 18:
+        case 19:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[6, 15]]);
+    }, _callee, null, [[7, 16]]);
   }));
   return function getDimTarget(_x, _x2) {
     return _ref.apply(this, arguments);
@@ -238,30 +240,32 @@ var getDimTarget = /*#__PURE__*/function () {
 exports.getDimTarget = getDimTarget;
 var getReportData = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(rcProContext, params) {
-    var _ref4, materialsRequest, env, res, _res2;
+    var _data_env_mapping$env2;
+    var _ref4, materialsRequest, env, data_env_mapping, __env, res, _res2;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          _ref4 = rcProContext || {}, materialsRequest = _ref4.materialsRequest, env = _ref4.env; // 供应链里由子应用透传
+          _ref4 = rcProContext || {}, materialsRequest = _ref4.materialsRequest, env = _ref4.env, data_env_mapping = _ref4.data_env_mapping;
+          __env = (_data_env_mapping$env2 = data_env_mapping === null || data_env_mapping === void 0 ? void 0 : data_env_mapping[env]) !== null && _data_env_mapping$env2 !== void 0 ? _data_env_mapping$env2 : data_env_mapping === null || data_env_mapping === void 0 ? void 0 : data_env_mapping['__other']; // 供应链里由子应用透传
           if (!materialsRequest) {
-            _context2.next = 6;
+            _context2.next = 7;
             break;
           }
-          _context2.next = 4;
+          _context2.next = 5;
           return (0, _rcProRequest["default"])(rcProContext, "/data/forward/v1/bigdata/report/" + params.dataSetName, {
             method: 'POST',
             data: {
-              bigDataBody: (0, _extends2["default"])({
-                env: env
-              }, params)
+              bigDataBody: (0, _extends2["default"])({}, __env ? {
+                env: __env
+              } : {}, params)
             }
           });
-        case 4:
+        case 5:
           res = _context2.sent;
           return _context2.abrupt("return", res);
-        case 6:
-          _context2.prev = 6;
-          _context2.next = 9;
+        case 7:
+          _context2.prev = 7;
+          _context2.next = 10;
           return fetch("http://scm.gateway.dev.ztyc.com/data/forward/v1/bigdata/report/" + params.dataSetName, {
             method: 'POST',
             body: JSON.stringify({
@@ -274,21 +278,21 @@ var getReportData = /*#__PURE__*/function () {
               token: token
             }
           });
-        case 9:
+        case 10:
           _res2 = _context2.sent;
-          _context2.next = 12;
+          _context2.next = 13;
           return _res2.json();
-        case 12:
+        case 13:
           return _context2.abrupt("return", _context2.sent);
-        case 15:
-          _context2.prev = 15;
-          _context2.t0 = _context2["catch"](6);
+        case 16:
+          _context2.prev = 16;
+          _context2.t0 = _context2["catch"](7);
           return _context2.abrupt("return", {});
-        case 18:
+        case 19:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[6, 15]]);
+    }, _callee2, null, [[7, 16]]);
   }));
   return function getReportData(_x3, _x4) {
     return _ref3.apply(this, arguments);

package/lib/style.js

@@ -10,4 +10,5 @@ require('antd/lib/message/style');
 require('antd/lib/tabs/style');
 require('antd/lib/checkbox/style');
 require('antd/lib/radio/style');
+require('antd/lib/spin/style');
 require('./index.scss');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ztocwst/rc-pro-materials",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "description": "@ztocwst/rc-pro-materials",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -86,9 +86,9 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://npm.onmicrosoft.cn/@ztocwst/rc-pro-materials@0.1.32/build/lowcode/assets-prod.json"
+    "materialSchema": "https://npm.onmicrosoft.cn/@ztocwst/rc-pro-materials@0.1.33/build/lowcode/assets-prod.json"
   },
-  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.1.32/build/index.html",
+  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.1.33/build/index.html",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"