@ztocwst/rc-pro-materials 0.2.18 → 0.2.20

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

@@ -6,7 +6,8 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useEffect, useState, useRef, useContext, useImperativeHandle } from 'react';
 import { ProTable, RcConfigContext } from '@ztocwst/rc-pro';
 import { ArrowLeftOutlined } from '@ant-design/icons';
-import { tableConfigDefault, separator, timeUnit, getMaxWidth, handleQueryParams, getReportData } from "../../data-common.helper";
+import moment from 'moment';
+import { tableConfigDefault, dateStart, separator, timeUnit, getType, getMaxWidth, handleQueryParams, getReportData } from "../../data-common.helper";
 import { handleDimTargetFormat, handleColumns } from "../table-renderer/table-renderer.helper";
 import "./index.less";
 var linkStateDefault = {
@@ -75,7 +76,7 @@ var LinkRenderer = function LinkRenderer(props) {
     return function () {
       handleClearInterval();
     };
-  }, [linkState.dataSetName, linkState.index, linkState.custom, linkState.autoLoad]);
+  }, [linkState]);
 
   // 获取表头
   var handleGetColumns = function handleGetColumns(stateParams) {
@@ -118,7 +119,7 @@ var LinkRenderer = function LinkRenderer(props) {
             queryKeys = Object.keys(queryCache);
             if (queryKeys !== null && queryKeys !== void 0 && queryKeys.length) {
               queryKeys.forEach(function (k) {
-                // 查看是否有绑定关联关系
+                // 查看是否有绑定关联关系 有取绑定的入参"键" 没有则取默认的"键"
                 var queryBindFilter = queryBind === null || queryBind === void 0 ? void 0 : queryBind.filter(function (item) {
                   return (item === null || item === void 0 ? void 0 : item.currentQueryKey) === k;
                 });
@@ -127,9 +128,18 @@ var LinkRenderer = function LinkRenderer(props) {
                   // 参数为时间时会出现多个绑定关系
                   queryBindFilter.forEach(function (item) {
                     var key = item.sourceQueryKey;
+                    // "值"（当前查询条件的"值"）
+                    var value = queryCache[k];
                     if (key) {
-                      // "值"（当前查询条件的"值"）
-                      query[key] = queryCache[k];
+                      // 类型为时间时 处理
+                      if (getType(value) === 'array' && value.length === 2 && value.some(function (d) {
+                        return moment(d).isValid();
+                      })) {
+                        var i = key.includes(dateStart) ? 0 : 1;
+                        query[key] = value[i];
+                      } else {
+                        query[key] = value;
+                      }
                     }
                   });
                 } else {
@@ -260,8 +270,8 @@ var LinkRenderer = function LinkRenderer(props) {
       index: index
     });
     /** 当前进入与上次进入link页不同时需要清空数据 */
-    var isSource = "" + stateData.dataSetName + separator + index === "" + linkState.dataSetName + separator + (linkState === null || linkState === void 0 ? void 0 : linkState.index);
-    var isSame = JSON.stringify(stateData === null || stateData === void 0 ? void 0 : stateData.record) === JSON.stringify(linkState === null || linkState === void 0 ? void 0 : linkState.record);
+    var isSource = "" + paramsState.dataSetName + separator + index === "" + linkState.dataSetName + separator + (linkState === null || linkState === void 0 ? void 0 : linkState.index);
+    var isSame = JSON.stringify(paramsState === null || paramsState === void 0 ? void 0 : paramsState.record) === JSON.stringify(linkState === null || linkState === void 0 ? void 0 : linkState.record);
     if (!currentState.custom && (!isSource || !isSame)) {
       var _tableRef$current2, _tableRef$current2$up;
       (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$up = _tableRef$current2.updateDataSource) === null || _tableRef$current2$up === void 0 ? void 0 : _tableRef$current2$up.call(_tableRef$current2, []);

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

@@ -7,7 +7,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useRef, useState, useEffect, useImperativeHandle, useContext } from 'react';
 import { ProTable, RcConfigContext } from '@ztocwst/rc-pro';
-import { tableConfigDefault, separator, timeUnit, handleQueryParams, getReportData } from "../../data-common.helper";
+import moment from 'moment';
+import { tableConfigDefault, dateStart, separator, timeUnit, getType, handleQueryParams, getReportData } from "../../data-common.helper";
 import { handleColumns, handleValueFormat, getDimTargetData } from "./table-renderer.helper";
 import DimTarget from "../dim-target";
 import LinkRenderer from "../link-renderer";
@@ -190,12 +191,33 @@ var TableRenderer = function TableRenderer(props) {
     var queryKeys = Object.keys(queryCache);
     if (queryKeys !== null && queryKeys !== void 0 && queryKeys.length) {
       queryKeys.forEach(function (k) {
-        var _queryBind$find;
-        // "键"（有建立绑定关系 取当前数据源参数（paraJson）的"键"，没有则是默认查询配置的"键"）
-        var key = (queryBind === null || queryBind === void 0 ? void 0 : (_queryBind$find = queryBind.find(function (item) {
+        // 查看是否有绑定关联关系 有取绑定的入参"键" 没有则取默认的"键"
+        var queryBindFilter = queryBind === null || queryBind === void 0 ? void 0 : queryBind.filter(function (item) {
           return (item === null || item === void 0 ? void 0 : item.currentQueryKey) === k;
-        })) === null || _queryBind$find === void 0 ? void 0 : _queryBind$find.sourceQueryKey) || k;
-        query[key] = queryCache[k];
+        });
+        // "键"（有建立绑定关系 取当前数据源参数（paraJson）的"键"，没有则是默认查询配置的"键"）
+        if (queryBindFilter !== null && queryBindFilter !== void 0 && queryBindFilter.length) {
+          // 参数为时间时会出现多个绑定关系
+          queryBindFilter.forEach(function (item) {
+            var key = item.sourceQueryKey;
+            // "值"（当前查询条件的"值"）
+            var value = queryCache[k];
+            if (key) {
+              // 类型为时间时 处理
+              if (getType(value) === 'array' && value.length === 2 && value.some(function (d) {
+                return moment(d).isValid();
+              })) {
+                var i = key.includes(dateStart) ? 0 : 1;
+                query[key] = value[i];
+              } else {
+                query[key] = value;
+              }
+            }
+          });
+        } else {
+          // "值"（当前查询条件的"值"）
+          query[k] = queryCache[k];
+        }
       });
     }
 

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/components/z-templates-data-common/data-common.helper.d.ts

@@ -6,6 +6,8 @@ export declare const tableConfigDefault: {
     hideDefRowSelection: boolean;
     columns: any[];
 };
+/** 时间区间 开始键包含的字符串 */
+export declare const dateStart = "_start";
 /** 字符串拼接分割符 */
 export declare const separator = "***";
 /** 时间单位 */
@@ -14,6 +16,11 @@ export declare const timeUnit: number;
 export declare const BETWEEN = "<=,<";
 /** 数据类型 */
 export type valueType = number | string | null | undefined;
+/**
+ * 获取数据类型
+ * @param {any} value
+ */
+export declare const getType: (value: any) => string;
 /**
  * 计算宽
  * @param length

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

@@ -14,6 +14,9 @@ export var tableConfigDefault = {
   columns: []
 };
 
+/** 时间区间 开始键包含的字符串 */
+export var dateStart = '_start';
+
 /** 字符串拼接分割符 */
 export var separator = '***';
 
@@ -22,8 +25,20 @@ export var timeUnit = 60 * 1000;
 
 /** 介于 前闭后开 */
 export var BETWEEN = '<=,<';
+
 /** 数据类型 */
 
+/**
+ * 获取数据类型
+ * @param {any} value
+ */
+export var getType = function getType(value) {
+  var type = typeof value;
+  if (type !== 'object') return type;
+  var string = Object.prototype.toString.call(value);
+  return string.replace(/^\[object (\S+)\]$/, '$1').toLocaleLowerCase();
+};
+
 /**
  * 计算宽
  * @param length
@@ -157,7 +172,7 @@ export var handleCondition = function handleCondition(value, handledValue, condi
 };
 
 // mock
-var token = 'scm:tenant:token:2:9:64174758CFF5CA5921E1EC31750DDBDC';
+var token = 'scm:tenant:token:2:104:DB0D80CD71B76AF4A8858729478BA945';
 
 /** 获取维度指标 */
 export var getDimTarget = /*#__PURE__*/function () {

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

@@ -11,6 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _react = require("react");
 var _rcPro = require("@ztocwst/rc-pro");
 var _icons = require("@ant-design/icons");
+var _moment = _interopRequireDefault(require("moment"));
 var _dataCommon = require("../../data-common.helper");
 var _tableRenderer = require("../table-renderer/table-renderer.helper");
 require("./index.less");
@@ -80,7 +81,7 @@ var LinkRenderer = function LinkRenderer(props) {
     return function () {
       handleClearInterval();
     };
-  }, [linkState.dataSetName, linkState.index, linkState.custom, linkState.autoLoad]);
+  }, [linkState]);
 
   // 获取表头
   var handleGetColumns = function handleGetColumns(stateParams) {
@@ -123,7 +124,7 @@ var LinkRenderer = function LinkRenderer(props) {
             queryKeys = Object.keys(queryCache);
             if (queryKeys !== null && queryKeys !== void 0 && queryKeys.length) {
               queryKeys.forEach(function (k) {
-                // 查看是否有绑定关联关系
+                // 查看是否有绑定关联关系 有取绑定的入参"键" 没有则取默认的"键"
                 var queryBindFilter = queryBind === null || queryBind === void 0 ? void 0 : queryBind.filter(function (item) {
                   return (item === null || item === void 0 ? void 0 : item.currentQueryKey) === k;
                 });
@@ -132,9 +133,18 @@ var LinkRenderer = function LinkRenderer(props) {
                   // 参数为时间时会出现多个绑定关系
                   queryBindFilter.forEach(function (item) {
                     var key = item.sourceQueryKey;
+                    // "值"（当前查询条件的"值"）
+                    var value = queryCache[k];
                     if (key) {
-                      // "值"（当前查询条件的"值"）
-                      query[key] = queryCache[k];
+                      // 类型为时间时 处理
+                      if ((0, _dataCommon.getType)(value) === 'array' && value.length === 2 && value.some(function (d) {
+                        return (0, _moment["default"])(d).isValid();
+                      })) {
+                        var i = key.includes(_dataCommon.dateStart) ? 0 : 1;
+                        query[key] = value[i];
+                      } else {
+                        query[key] = value;
+                      }
                     }
                   });
                 } else {
@@ -265,8 +275,8 @@ var LinkRenderer = function LinkRenderer(props) {
       index: index
     });
     /** 当前进入与上次进入link页不同时需要清空数据 */
-    var isSource = "" + stateData.dataSetName + _dataCommon.separator + index === "" + linkState.dataSetName + _dataCommon.separator + (linkState === null || linkState === void 0 ? void 0 : linkState.index);
-    var isSame = JSON.stringify(stateData === null || stateData === void 0 ? void 0 : stateData.record) === JSON.stringify(linkState === null || linkState === void 0 ? void 0 : linkState.record);
+    var isSource = "" + paramsState.dataSetName + _dataCommon.separator + index === "" + linkState.dataSetName + _dataCommon.separator + (linkState === null || linkState === void 0 ? void 0 : linkState.index);
+    var isSame = JSON.stringify(paramsState === null || paramsState === void 0 ? void 0 : paramsState.record) === JSON.stringify(linkState === null || linkState === void 0 ? void 0 : linkState.record);
     if (!currentState.custom && (!isSource || !isSame)) {
       var _tableRef$current2, _tableRef$current2$up;
       (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$up = _tableRef$current2.updateDataSource) === null || _tableRef$current2$up === void 0 ? void 0 : _tableRef$current2$up.call(_tableRef$current2, []);

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

@@ -9,6 +9,7 @@ var _table = _interopRequireDefault(require("antd/lib/table"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = require("react");
 var _rcPro = require("@ztocwst/rc-pro");
+var _moment = _interopRequireDefault(require("moment"));
 var _dataCommon = require("../../data-common.helper");
 var _tableRenderer = require("./table-renderer.helper");
 var _dimTarget = _interopRequireDefault(require("../dim-target"));
@@ -195,12 +196,33 @@ var TableRenderer = function TableRenderer(props) {
     var queryKeys = Object.keys(queryCache);
     if (queryKeys !== null && queryKeys !== void 0 && queryKeys.length) {
       queryKeys.forEach(function (k) {
-        var _queryBind$find;
-        // "键"（有建立绑定关系 取当前数据源参数（paraJson）的"键"，没有则是默认查询配置的"键"）
-        var key = (queryBind === null || queryBind === void 0 ? void 0 : (_queryBind$find = queryBind.find(function (item) {
+        // 查看是否有绑定关联关系 有取绑定的入参"键" 没有则取默认的"键"
+        var queryBindFilter = queryBind === null || queryBind === void 0 ? void 0 : queryBind.filter(function (item) {
           return (item === null || item === void 0 ? void 0 : item.currentQueryKey) === k;
-        })) === null || _queryBind$find === void 0 ? void 0 : _queryBind$find.sourceQueryKey) || k;
-        query[key] = queryCache[k];
+        });
+        // "键"（有建立绑定关系 取当前数据源参数（paraJson）的"键"，没有则是默认查询配置的"键"）
+        if (queryBindFilter !== null && queryBindFilter !== void 0 && queryBindFilter.length) {
+          // 参数为时间时会出现多个绑定关系
+          queryBindFilter.forEach(function (item) {
+            var key = item.sourceQueryKey;
+            // "值"（当前查询条件的"值"）
+            var value = queryCache[k];
+            if (key) {
+              // 类型为时间时 处理
+              if ((0, _dataCommon.getType)(value) === 'array' && value.length === 2 && value.some(function (d) {
+                return (0, _moment["default"])(d).isValid();
+              })) {
+                var i = key.includes(_dataCommon.dateStart) ? 0 : 1;
+                query[key] = value[i];
+              } else {
+                query[key] = value;
+              }
+            }
+          });
+        } else {
+          // "值"（当前查询条件的"值"）
+          query[k] = queryCache[k];
+        }
       });
     }
 

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/components/z-templates-data-common/data-common.helper.d.ts

@@ -6,6 +6,8 @@ export declare const tableConfigDefault: {
     hideDefRowSelection: boolean;
     columns: any[];
 };
+/** 时间区间 开始键包含的字符串 */
+export declare const dateStart = "_start";
 /** 字符串拼接分割符 */
 export declare const separator = "***";
 /** 时间单位 */
@@ -14,6 +16,11 @@ export declare const timeUnit: number;
 export declare const BETWEEN = "<=,<";
 /** 数据类型 */
 export type valueType = number | string | null | undefined;
+/**
+ * 获取数据类型
+ * @param {any} value
+ */
+export declare const getType: (value: any) => string;
 /**
  * 计算宽
  * @param length

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

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.timeUnit = exports.tableConfigDefault = exports.separator = exports.saveDimTarget = exports.handleThousand = exports.handleQueryParams = exports.handlePercent = exports.handleLink = exports.handleDecimal = exports.handleCondition = exports.getReportData = exports.getMaxWidth = exports.getDimTarget = exports.computeWidth = exports.BETWEEN = void 0;
+exports.timeUnit = exports.tableConfigDefault = exports.separator = exports.saveDimTarget = exports.handleThousand = exports.handleQueryParams = exports.handlePercent = exports.handleLink = exports.handleDecimal = exports.handleCondition = exports.getType = exports.getReportData = exports.getMaxWidth = exports.getDimTarget = exports.dateStart = exports.computeWidth = exports.BETWEEN = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
@@ -18,8 +18,12 @@ var tableConfigDefault = {
   columns: []
 };
 
-/** 字符串拼接分割符 */
+/** 时间区间 开始键包含的字符串 */
 exports.tableConfigDefault = tableConfigDefault;
+var dateStart = '_start';
+
+/** 字符串拼接分割符 */
+exports.dateStart = dateStart;
 var separator = '***';
 
 /** 时间单位 */
@@ -29,13 +33,26 @@ var timeUnit = 60 * 1000;
 /** 介于 前闭后开 */
 exports.timeUnit = timeUnit;
 var BETWEEN = '<=,<';
+
 /** 数据类型 */
 exports.BETWEEN = BETWEEN;
+/**
+ * 获取数据类型
+ * @param {any} value
+ */
+var getType = function getType(value) {
+  var type = typeof value;
+  if (type !== 'object') return type;
+  var string = Object.prototype.toString.call(value);
+  return string.replace(/^\[object (\S+)\]$/, '$1').toLocaleLowerCase();
+};
+
 /**
  * 计算宽
  * @param length
  * @param width
  */
+exports.getType = getType;
 var computeWidth = function computeWidth(length, width) {
   if (width === void 0) {
     width = 40;
@@ -172,7 +189,7 @@ var handleCondition = function handleCondition(value, handledValue, conditions)
 
 // mock
 exports.handleCondition = handleCondition;
-var token = 'scm:tenant:token:2:9:64174758CFF5CA5921E1EC31750DDBDC';
+var token = 'scm:tenant:token:2:104:DB0D80CD71B76AF4A8858729478BA945';
 
 /** 获取维度指标 */
 var getDimTarget = /*#__PURE__*/function () {

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.18",
+  "version": "0.2.20",
   "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.18/build/lowcode/assets-prod.json"
+    "materialSchema": "https://npm.ztocwst.com/@ztocwst/rc-pro-materials@0.2.20/build/lowcode/assets-prod.json"
   },
-  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.2.18/build/index.html",
+  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.2.20/build/index.html",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"