@ztocwst/rc-pro-materials 0.1.28 → 0.1.30

package/lib/utils/props/tpl.js

@@ -10,9 +10,10 @@ var _form = require("./form");
 var _lib = require("../../../lib");
 var _common = require("./common");
 var _excluded = ["on", "antdPageHeaderProps", "antdRadioGroupProps"],
-  _excluded2 = ["layoutProps", "antdPageHeaderProps", "requestConfig"],
-  _excluded3 = ["props", "requestConfig"],
-  _excluded4 = ["page"];
+  _excluded2 = ["layoutProps", "antdPageHeaderProps", "requestConfig", "props"],
+  _excluded3 = ["proLogs"],
+  _excluded4 = ["props", "requestConfig"],
+  _excluded5 = ["page"];
 // previewTabs 处理
 var processTplBillPreviewTabsProps = function processTplBillPreviewTabsProps(props) {
   var on = props.on,
@@ -36,18 +37,26 @@ var processTplBillPreviewTabsProps = function processTplBillPreviewTabsProps(pro
 // preview 处理
 var processTplBillPreviewProps = function processTplBillPreviewProps(props) {
   var processObjectValue = function processObjectValue(obj) {
+    var _proLogs$columns;
     // preview props 需要处理
     var layoutProps = obj.layoutProps,
       antdPageHeaderProps = obj.antdPageHeaderProps,
       requestConfig = obj.requestConfig,
+      objProps = obj.props,
       rest = (0, _objectWithoutPropertiesLoose2["default"])(obj, _excluded2);
+    var proLogs = objProps.proLogs,
+      objRest = (0, _objectWithoutPropertiesLoose2["default"])(objProps, _excluded3);
     return (0, _extends2["default"])({}, layoutProps ? {
       layoutProps: (0, _lib.processJsonOrFunctionProps)(layoutProps)
     } : {}, antdPageHeaderProps ? {
       antdPageHeaderProps: (0, _lib.processJsonOrFunctionProps)(antdPageHeaderProps)
     } : {}, requestConfig ? {
       requestConfig: (0, _common.processRequestConfig)(requestConfig)
-    } : {}, rest);
+    } : {}, {
+      props: (0, _extends2["default"])({}, objRest, proLogs !== null && proLogs !== void 0 && (_proLogs$columns = proLogs.columns) !== null && _proLogs$columns !== void 0 && _proLogs$columns.length ? {
+        proLogs: proLogs
+      } : {})
+    }, rest);
   };
   if (Array.isArray(props)) {
     return props === null || props === void 0 ? void 0 : props.map(function (e) {
@@ -66,7 +75,7 @@ var processTplBillProps = function processTplBillProps(props, extra) {
   var _form$props = form.props,
     formProps = _form$props === void 0 ? {} : _form$props,
     requestConfig = form.requestConfig,
-    formRest = (0, _objectWithoutPropertiesLoose2["default"])(form, _excluded3);
+    formRest = (0, _objectWithoutPropertiesLoose2["default"])(form, _excluded4);
   return (0, _extends2["default"])({}, form ? {
     form: (0, _extends2["default"])({}, formRest, {
       requestConfig: (0, _extends2["default"])({}, requestConfig !== null && requestConfig !== void 0 && requestConfig.add ? {
@@ -95,7 +104,7 @@ var processTplProps = function processTplProps(props, extra) {
   var _page$list;
   var _ref2 = props !== null && props !== void 0 ? props : {},
     page = _ref2.page,
-    rest = (0, _objectWithoutPropertiesLoose2["default"])(_ref2, _excluded4);
+    rest = (0, _objectWithoutPropertiesLoose2["default"])(_ref2, _excluded5);
   var listFormRef = extra.listFormRef,
     billFormRef = extra.billFormRef,
     listRef = extra.listRef,

package/lib/utils/rcProRequest.d.ts

@@ -1,2 +1,3 @@
-declare const _default: (rcProContext: any, url: string, requestParams: any) => Promise<any>;
+import { RcConfigConsumerProps } from '@ztocwst/rc-pro';
+declare const _default: (rcProContext: RcConfigConsumerProps, url: string, requestParams: any) => Promise<any>;
 export default _default;

package/lib/utils/rcProRequest.js

@@ -8,17 +8,17 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _default = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(rcProContext, url, requestParams) {
-    var _ref2, materialsRequest, token;
+    var _ref2, materialsRequest, headers;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _ref2 = rcProContext || {}, materialsRequest = _ref2.materialsRequest, token = _ref2.token;
+          _ref2 = rcProContext || {}, materialsRequest = _ref2.materialsRequest, headers = _ref2.headers;
           _context.next = 3;
           return materialsRequest(url, (0, _extends2["default"])({
             method: 'POST'
           }, requestParams, {
             headers: (0, _extends2["default"])({}, requestParams.headers, {
-              token: token
+              token: headers.token
             })
           }));
         case 3:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ztocwst/rc-pro-materials",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "description": "@ztocwst/rc-pro-materials",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -71,7 +71,7 @@
     "@alifd/next": "^1.25.27",
     "@alilc/build-plugin-alt": "^1.3.3",
     "@types/antd": "^1.0.0",
-    "@ztocwst/rc-pro": "0.4.34",
+    "@ztocwst/rc-pro": "0.4.44",
     "antd": "4.22.3",
     "moment": "latest",
     "prop-types": "^15.5.8",
@@ -86,9 +86,9 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://npm.onmicrosoft.cn/@ztocwst/rc-pro-materials@0.1.28/build/lowcode/assets-prod.json"
+    "materialSchema": "https://npm.onmicrosoft.cn/@ztocwst/rc-pro-materials@0.1.30/build/lowcode/assets-prod.json"
   },
-  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.1.28/build/index.html",
+  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.1.30/build/index.html",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"