@ztocwst/rc-pro-materials 0.2.19 → 0.2.21

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

@@ -1,7 +1,9 @@
 import _Spin from "antd/es/spin";
 import _Radio from "antd/es/radio";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
+var _excluded = ["pageNum", "pageSize"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useEffect, useState, useRef, useContext, useImperativeHandle } from 'react';
 import { ProTable, RcConfigContext } from '@ztocwst/rc-pro';
@@ -103,7 +105,7 @@ var LinkRenderer = function LinkRenderer(props) {
   var getDataSource = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
       var _dimJson$data;
-      var dataSetName, index, dimension, record, columns, _linkPage$index, queryBind, formatter, queryCache, query, queryKeys, recordKeys, dim, queryParams, data, queryData;
+      var dataSetName, index, dimension, record, columns, _linkPage$index, queryBind, formatter, queryCache, query, queryKeys, recordKeys, dim, queryParams, _params, pageNum, pageSize, other, data, queryData;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -179,10 +181,10 @@ var LinkRenderer = function LinkRenderer(props) {
               });
             }
             queryParams = handleQueryParams(query);
-            data = _extends({
-              pageNum: 1,
-              pageSize: defaultPageSize
-            }, params, {
+            _params = params, pageNum = _params.pageNum, pageSize = _params.pageSize, other = _objectWithoutPropertiesLoose(_params, _excluded);
+            data = _extends({}, other, {
+              pageNum: pageNum || 1,
+              pageSize: pageSize || defaultPageSize,
               queryParams: queryParams,
               dim: dim,
               target: columns.map(function (item) {
@@ -216,7 +218,7 @@ var LinkRenderer = function LinkRenderer(props) {
                 setResult(null);
               }
             }));
-          case 16:
+          case 17:
           case "end":
             return _context.stop();
         }

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

@@ -1,6 +1,8 @@
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/extends";
 import _Table from "antd/es/table";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+var _excluded = ["pageNum", "pageSize"];
 function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -244,13 +246,17 @@ var TableRenderer = function TableRenderer(props) {
       }
     }
     var queryParams = handleQueryParams(query);
+    var _params = params,
+      pageNum = _params.pageNum,
+      pageSize = _params.pageSize,
+      other = _objectWithoutPropertiesLoose(_params, _excluded);
     var data = _extends({
       queryParams: queryParams,
       dim: dim,
       target: target
-    }, params, {
-      pageNum: 1,
-      pageSize: defaultPageSize,
+    }, other, {
+      pageNum: pageNum || 1,
+      pageSize: pageSize || defaultPageSize,
       dataSetName: dataSetName
     });
     return formatter ? formatter === null || formatter === void 0 ? void 0 : formatter(data) : data;

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

@@ -231,12 +231,14 @@ export var handleColumns = function handleColumns(option, expressions, linkPage,
     };
   });
   if (option !== null && option !== void 0 && (_option$actionJson = option.actionJson) !== null && _option$actionJson !== void 0 && _option$actionJson.custom) {
+    var _columns$fn;
     var _ref5 = (option === null || option === void 0 ? void 0 : option.actionJson) || {},
       isFixed = _ref5.isFixed,
       fixed = _ref5.fixed,
       _render = _ref5.render,
       values = _objectWithoutPropertiesLoose(_ref5, _excluded);
-    columns.push(_extends({}, values, {
+    var fn = fixed === 'left' ? 'unshift' : 'push';
+    (_columns$fn = columns[fn]) === null || _columns$fn === void 0 ? void 0 : _columns$fn.call(columns, _extends({}, values, {
       dataIndex: 'action',
       fixed: isFixed ? fixed || isFixed : false,
       render: function render(_, record) {

package/es/utils/props/editTable.js

@@ -1,18 +1,17 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["scroll", "value", "onChange", "restEditableProps", "restRecordCreatorProps", "restFieldProps", "restFormProps", "FormItemProps", "fieldProps", "columns", "editable", "render", "recordCreatorProps", "locale"],
-  _excluded2 = ["editable"];
+var _excluded = ["scroll", "value", "onChange", "restEditableProps", "restRecordCreatorProps", "FormItemProps", "fieldProps", "columns", "editable", "render", "recordCreatorProps", "locale"],
+  _excluded2 = ["restFormProps"],
+  _excluded3 = ["restFieldProps"],
+  _excluded4 = ["editable"];
 import { processJsonOrFunctionProps } from "../../../lib";
 var processTableProps = function processTableProps(props) {
-  console.log(props, 2);
   var processObjectValue = function processObjectValue(obj) {
     var scroll = obj.scroll,
       value = obj.value,
       onChange = obj.onChange,
       restEditableProps = obj.restEditableProps,
       restRecordCreatorProps = obj.restRecordCreatorProps,
-      restFieldProps = obj.restFieldProps,
-      restFormProps = obj.restFormProps,
       FormItemProps = obj.FormItemProps,
       fieldProps = obj.fieldProps,
       columns = obj.columns,
@@ -21,6 +20,12 @@ var processTableProps = function processTableProps(props) {
       recordCreatorProps = obj.recordCreatorProps,
       locale = obj.locale,
       rest = _objectWithoutPropertiesLoose(obj, _excluded);
+    var _ref = FormItemProps !== null && FormItemProps !== void 0 ? FormItemProps : {},
+      restFormProps = _ref.restFormProps,
+      restFormItemProps = _objectWithoutPropertiesLoose(_ref, _excluded2);
+    var _ref2 = fieldProps !== null && fieldProps !== void 0 ? fieldProps : {},
+      restFieldProps = _ref2.restFieldProps,
+      restFieldItemProps = _objectWithoutPropertiesLoose(_ref2, _excluded3);
     return _extends({}, locale ? {
       locale: processJsonOrFunctionProps(locale)
     } : {}, scroll ? {
@@ -36,13 +41,13 @@ var processTableProps = function processTableProps(props) {
     } : {}, render ? {
       render: render
     } : {}, FormItemProps ? {
-      formItemProps: _extends({}, FormItemProps, typeof restFormProps === 'function' ? restFormProps === null || restFormProps === void 0 ? void 0 : restFormProps() : restFormProps)
+      formItemProps: _extends({}, restFormItemProps, typeof restFormProps === 'function' ? restFormProps === null || restFormProps === void 0 ? void 0 : restFormProps() : restFormProps)
     } : {}, fieldProps ? {
-      fieldProps: _extends({}, fieldProps, typeof restFieldProps === 'function' ? restFieldProps === null || restFieldProps === void 0 ? void 0 : restFieldProps() : restFieldProps)
+      fieldProps: _extends({}, restFieldItemProps, typeof restFieldProps === 'function' ? restFieldProps === null || restFieldProps === void 0 ? void 0 : restFieldProps() : restFieldProps)
     } : {}, columns !== null && columns !== void 0 && columns.length ? {
       columns: columns === null || columns === void 0 ? void 0 : columns.map(function (v) {
         var columnsEditable = v.editable,
-          restColumns = _objectWithoutPropertiesLoose(v, _excluded2);
+          restColumns = _objectWithoutPropertiesLoose(v, _excluded4);
         return _extends({}, editable ? {
           editable: columnsEditable
         } : {}, processObjectValue(restColumns));
@@ -54,11 +59,13 @@ var processTableProps = function processTableProps(props) {
       return processObjectValue(e);
     });
   }
-  return processObjectValue(props);
+  var data = processObjectValue(props);
+  console.log(data, 'editTable Props');
+  return data;
 };
 export var processEditTableProps = function processEditTableProps(props, extra) {
-  var _ref = extra !== null && extra !== void 0 ? extra : {},
-    proEditableFormRef = _ref.proEditableFormRef;
+  var _ref3 = extra !== null && extra !== void 0 ? extra : {},
+    proEditableFormRef = _ref3.proEditableFormRef;
   return _extends({}, processTableProps(props), {
     proEditableFormRef: proEditableFormRef
   });

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

@@ -6,6 +6,7 @@ exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _spin = _interopRequireDefault(require("antd/lib/spin"));
 var _radio = _interopRequireDefault(require("antd/lib/radio"));
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = require("react");
@@ -15,6 +16,7 @@ var _moment = _interopRequireDefault(require("moment"));
 var _dataCommon = require("../../data-common.helper");
 var _tableRenderer = require("../table-renderer/table-renderer.helper");
 require("./index.less");
+var _excluded = ["pageNum", "pageSize"];
 var linkStateDefault = {
   custom: false,
   dataSetName: '',
@@ -108,7 +110,7 @@ var LinkRenderer = function LinkRenderer(props) {
   var getDataSource = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
       var _dimJson$data;
-      var dataSetName, index, dimension, record, columns, _linkPage$index, queryBind, formatter, queryCache, query, queryKeys, recordKeys, dim, queryParams, data, queryData;
+      var dataSetName, index, dimension, record, columns, _linkPage$index, queryBind, formatter, queryCache, query, queryKeys, recordKeys, dim, queryParams, _params, pageNum, pageSize, other, data, queryData;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -184,10 +186,10 @@ var LinkRenderer = function LinkRenderer(props) {
               });
             }
             queryParams = (0, _dataCommon.handleQueryParams)(query);
-            data = (0, _extends2["default"])({
-              pageNum: 1,
-              pageSize: defaultPageSize
-            }, params, {
+            _params = params, pageNum = _params.pageNum, pageSize = _params.pageSize, other = (0, _objectWithoutPropertiesLoose2["default"])(_params, _excluded);
+            data = (0, _extends2["default"])({}, other, {
+              pageNum: pageNum || 1,
+              pageSize: pageSize || defaultPageSize,
               queryParams: queryParams,
               dim: dim,
               target: columns.map(function (item) {
@@ -221,7 +223,7 @@ var LinkRenderer = function LinkRenderer(props) {
                 setResult(null);
               }
             }));
-          case 16:
+          case 17:
           case "end":
             return _context.stop();
         }

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

@@ -3,6 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports["default"] = void 0;
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _table = _interopRequireDefault(require("antd/lib/table"));
@@ -14,6 +15,7 @@ var _dataCommon = require("../../data-common.helper");
 var _tableRenderer = require("./table-renderer.helper");
 var _dimTarget = _interopRequireDefault(require("../dim-target"));
 var _linkRenderer = _interopRequireDefault(require("../link-renderer"));
+var _excluded = ["pageNum", "pageSize"];
 function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -249,13 +251,17 @@ var TableRenderer = function TableRenderer(props) {
       }
     }
     var queryParams = (0, _dataCommon.handleQueryParams)(query);
+    var _params = params,
+      pageNum = _params.pageNum,
+      pageSize = _params.pageSize,
+      other = (0, _objectWithoutPropertiesLoose2["default"])(_params, _excluded);
     var data = (0, _extends2["default"])({
       queryParams: queryParams,
       dim: dim,
       target: target
-    }, params, {
-      pageNum: 1,
-      pageSize: defaultPageSize,
+    }, other, {
+      pageNum: pageNum || 1,
+      pageSize: pageSize || defaultPageSize,
       dataSetName: dataSetName
     });
     return formatter ? formatter === null || formatter === void 0 ? void 0 : formatter(data) : data;

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

@@ -239,12 +239,14 @@ var handleColumns = function handleColumns(option, expressions, linkPage, onLink
     };
   });
   if (option !== null && option !== void 0 && (_option$actionJson = option.actionJson) !== null && _option$actionJson !== void 0 && _option$actionJson.custom) {
+    var _columns$fn;
     var _ref5 = (option === null || option === void 0 ? void 0 : option.actionJson) || {},
       isFixed = _ref5.isFixed,
       fixed = _ref5.fixed,
       _render = _ref5.render,
       values = (0, _objectWithoutPropertiesLoose2["default"])(_ref5, _excluded);
-    columns.push((0, _extends2["default"])({}, values, {
+    var fn = fixed === 'left' ? 'unshift' : 'push';
+    (_columns$fn = columns[fn]) === null || _columns$fn === void 0 ? void 0 : _columns$fn.call(columns, (0, _extends2["default"])({}, values, {
       dataIndex: 'action',
       fixed: isFixed ? fixed || isFixed : false,
       render: function render(_, record) {

package/lib/utils/props/editTable.js

@@ -6,18 +6,17 @@ exports.processEditTableProps = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _lib = require("../../../lib");
-var _excluded = ["scroll", "value", "onChange", "restEditableProps", "restRecordCreatorProps", "restFieldProps", "restFormProps", "FormItemProps", "fieldProps", "columns", "editable", "render", "recordCreatorProps", "locale"],
-  _excluded2 = ["editable"];
+var _excluded = ["scroll", "value", "onChange", "restEditableProps", "restRecordCreatorProps", "FormItemProps", "fieldProps", "columns", "editable", "render", "recordCreatorProps", "locale"],
+  _excluded2 = ["restFormProps"],
+  _excluded3 = ["restFieldProps"],
+  _excluded4 = ["editable"];
 var processTableProps = function processTableProps(props) {
-  console.log(props, 2);
   var processObjectValue = function processObjectValue(obj) {
     var scroll = obj.scroll,
       value = obj.value,
       onChange = obj.onChange,
       restEditableProps = obj.restEditableProps,
       restRecordCreatorProps = obj.restRecordCreatorProps,
-      restFieldProps = obj.restFieldProps,
-      restFormProps = obj.restFormProps,
       FormItemProps = obj.FormItemProps,
       fieldProps = obj.fieldProps,
       columns = obj.columns,
@@ -26,6 +25,12 @@ var processTableProps = function processTableProps(props) {
       recordCreatorProps = obj.recordCreatorProps,
       locale = obj.locale,
       rest = (0, _objectWithoutPropertiesLoose2["default"])(obj, _excluded);
+    var _ref = FormItemProps !== null && FormItemProps !== void 0 ? FormItemProps : {},
+      restFormProps = _ref.restFormProps,
+      restFormItemProps = (0, _objectWithoutPropertiesLoose2["default"])(_ref, _excluded2);
+    var _ref2 = fieldProps !== null && fieldProps !== void 0 ? fieldProps : {},
+      restFieldProps = _ref2.restFieldProps,
+      restFieldItemProps = (0, _objectWithoutPropertiesLoose2["default"])(_ref2, _excluded3);
     return (0, _extends2["default"])({}, locale ? {
       locale: (0, _lib.processJsonOrFunctionProps)(locale)
     } : {}, scroll ? {
@@ -41,13 +46,13 @@ var processTableProps = function processTableProps(props) {
     } : {}, render ? {
       render: render
     } : {}, FormItemProps ? {
-      formItemProps: (0, _extends2["default"])({}, FormItemProps, typeof restFormProps === 'function' ? restFormProps === null || restFormProps === void 0 ? void 0 : restFormProps() : restFormProps)
+      formItemProps: (0, _extends2["default"])({}, restFormItemProps, typeof restFormProps === 'function' ? restFormProps === null || restFormProps === void 0 ? void 0 : restFormProps() : restFormProps)
     } : {}, fieldProps ? {
-      fieldProps: (0, _extends2["default"])({}, fieldProps, typeof restFieldProps === 'function' ? restFieldProps === null || restFieldProps === void 0 ? void 0 : restFieldProps() : restFieldProps)
+      fieldProps: (0, _extends2["default"])({}, restFieldItemProps, typeof restFieldProps === 'function' ? restFieldProps === null || restFieldProps === void 0 ? void 0 : restFieldProps() : restFieldProps)
     } : {}, columns !== null && columns !== void 0 && columns.length ? {
       columns: columns === null || columns === void 0 ? void 0 : columns.map(function (v) {
         var columnsEditable = v.editable,
-          restColumns = (0, _objectWithoutPropertiesLoose2["default"])(v, _excluded2);
+          restColumns = (0, _objectWithoutPropertiesLoose2["default"])(v, _excluded4);
         return (0, _extends2["default"])({}, editable ? {
           editable: columnsEditable
         } : {}, processObjectValue(restColumns));
@@ -59,11 +64,13 @@ var processTableProps = function processTableProps(props) {
       return processObjectValue(e);
     });
   }
-  return processObjectValue(props);
+  var data = processObjectValue(props);
+  console.log(data, 'editTable Props');
+  return data;
 };
 var processEditTableProps = function processEditTableProps(props, extra) {
-  var _ref = extra !== null && extra !== void 0 ? extra : {},
-    proEditableFormRef = _ref.proEditableFormRef;
+  var _ref3 = extra !== null && extra !== void 0 ? extra : {},
+    proEditableFormRef = _ref3.proEditableFormRef;
   return (0, _extends2["default"])({}, processTableProps(props), {
     proEditableFormRef: proEditableFormRef
   });

package/package.json

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