@ztocwst/rc-pro-materials 0.1.34 → 0.1.35

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

@@ -6,6 +6,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useRef, useImperativeHandle } from 'react';
 import { ProFormRender } from '@ztocwst/rc-pro';
 import ChartRenderer from "./components/chart-renderer";
+import { processFormProps } from "../../utils";
 
 /** 指标配置 */
 
@@ -83,18 +84,20 @@ var ZTemplatesDataCommon = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onLink: onLink
     };
   });
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ProFormRender, _extends({}, querySetting, {
+  var formProps = processFormProps(querySetting);
+  console.log("formProps", formProps);
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ProFormRender, _extends({}, formProps, {
     formRef: formRef,
     onValuesChange: function onValuesChange(changeValues) {},
     onFinish: /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(formatData) {
-        var _querySetting$onFinis;
+        var _formProps$onFinish;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.prev = 0;
               _context2.next = 3;
-              return (_querySetting$onFinis = querySetting.onFinish) === null || _querySetting$onFinis === void 0 ? void 0 : _querySetting$onFinis.call(querySetting, formatData);
+              return (_formProps$onFinish = formProps.onFinish) === null || _formProps$onFinish === void 0 ? void 0 : _formProps$onFinish.call(formProps, formatData);
             case 3:
               _context2.next = 5;
               return onFinish === null || onFinish === void 0 ? void 0 : onFinish(formatData);

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

@@ -11,6 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _react = _interopRequireWildcard(require("react"));
 var _rcPro = require("@ztocwst/rc-pro");
 var _chartRenderer = _interopRequireDefault(require("./components/chart-renderer"));
+var _utils = require("../../utils");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /** 指标配置 */
@@ -89,18 +90,20 @@ var ZTemplatesDataCommon = /*#__PURE__*/_react["default"].forwardRef(function (p
       onLink: onLink
     };
   });
-  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_rcPro.ProFormRender, (0, _extends2["default"])({}, querySetting, {
+  var formProps = (0, _utils.processFormProps)(querySetting);
+  console.log("formProps", formProps);
+  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_rcPro.ProFormRender, (0, _extends2["default"])({}, formProps, {
     formRef: formRef,
     onValuesChange: function onValuesChange(changeValues) {},
     onFinish: /*#__PURE__*/function () {
       var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(formatData) {
-        var _querySetting$onFinis;
+        var _formProps$onFinish;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.prev = 0;
               _context2.next = 3;
-              return (_querySetting$onFinis = querySetting.onFinish) === null || _querySetting$onFinis === void 0 ? void 0 : _querySetting$onFinis.call(querySetting, formatData);
+              return (_formProps$onFinish = formProps.onFinish) === null || _formProps$onFinish === void 0 ? void 0 : _formProps$onFinish.call(formProps, formatData);
             case 3:
               _context2.next = 5;
               return onFinish === null || onFinish === void 0 ? void 0 : onFinish(formatData);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ztocwst/rc-pro-materials",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "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.34/build/lowcode/assets-prod.json"
+    "materialSchema": "https://npm.onmicrosoft.cn/@ztocwst/rc-pro-materials@0.1.35/build/lowcode/assets-prod.json"
   },
-  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.1.34/build/index.html",
+  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.1.35/build/index.html",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"