@openli1115/lowcode-edit-pro-table 1.0.47 → 1.0.49

package/es/components/edit-pro-table/edit-pro-table.js

@@ -150,6 +150,10 @@ var EditProTable = function EditProTable(_ref) {
       }, "\u5220\u9664"))];
     }
   }];
+  var formatMap = {
+    date: 'YYYY-MM-DD',
+    time: 'HH:mm:ss'
+  };
   useEffect(function () {
     console.log('columns', columns);
     setOriginalColumns(columns);
@@ -257,20 +261,21 @@ var EditProTable = function EditProTable(_ref) {
     if (toType === void 0) {
       toType = 'moment';
     }
+    console.log('editProTable convertTimeData', data);
     return data.map(function (row) {
       var newRow = _extends({}, row);
       Object.keys(newRow).forEach(function (key) {
         var col = columns.find(function (c) {
           return c.dataIndex === key;
         });
-        if (!col || !['time', 'date'].includes(col.valueType)) return;
+        if (!col || !['date', 'time'].includes(col.valueType)) return;
         var value = newRow[key];
         if (toType === 'moment') {
           if (!value || value === '') {
             newRow[key] = null;
           }
-          if (typeof value === 'string' && value.length && col.valueType === 'time') {
-            var m = moment(value, 'HH:mm:ss', true);
+          if (typeof value === 'string' && value.length && ['date', 'time'].includes(col.valueType)) {
+            var m = moment(value, formatMap[col.valueType], true);
             newRow[key] = m.isValid() ? m : null;
           }
         }

package/es/components/pro-table/pro-table.js

@@ -1,13 +1,14 @@
 import _Card from "antd/es/card";
 import _Space from "antd/es/space";
-import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["rowKey", "columns", "dataSource", "tableName", "headerTitle", "exportButton", "importButton", "importTemplateList", "tableHeaderBold", "tableHeaderSize", "toolBarRender", "screen_inner_id", "scroll", "pagination"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import * as React from 'react';
 import { useEffect, useState } from 'react';
 import { ProTable as OriginalProTable } from '@ant-design/pro-components';
+import moment from 'moment';
 import ImportExcelButton from "../edit-pro-table/components/ImportExcelButton";
 import ExportExcelButton from "../edit-pro-table/components/ExportExcelButton";
 var ProTable = function ProTable(_ref) {
@@ -46,13 +47,46 @@ var ProTable = function ProTable(_ref) {
     fixed: 'left',
     hideInTable: true
   }];
+  var formatMap = {
+    date: 'YYYY-MM-DD',
+    time: 'HH:mm:ss'
+  };
   useEffect(function () {
     setOriginalColumns(columns);
     if (dataSource.length) {
-      setTableDataSource(dataSource);
+      var convertedDataSource = convertTimeData(dataSource, 'moment');
+      setTableDataSource(JSON.parse(JSON.stringify(convertedDataSource)));
     }
   }, [dataSource]);
 
+  // 只在初始化 dataSource 时，把时间组件的字符串格式的值转为 moment 对象
+  var convertTimeData = function convertTimeData(data, toType) {
+    if (toType === void 0) {
+      toType = 'moment';
+    }
+    console.log('proTable convertTimeData', data);
+    return data.map(function (row) {
+      var newRow = _extends({}, row);
+      Object.keys(newRow).forEach(function (key) {
+        var col = columns.find(function (c) {
+          return c.dataIndex === key;
+        });
+        if (!col || !['date', 'time'].includes(col.valueType)) return;
+        var value = newRow[key];
+        if (toType === 'moment') {
+          if (!value || value === '') {
+            newRow[key] = null;
+          }
+          if (typeof value === 'string' && value.length && ['date', 'time'].includes(col.valueType)) {
+            var m = moment(value, formatMap[col.valueType], true);
+            newRow[key] = m.isValid() ? m : null;
+          }
+        }
+      });
+      return newRow;
+    });
+  };
+
   // 处理导入
   var handleImport = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(response) {

package/lib/components/edit-pro-table/edit-pro-table.js

@@ -155,6 +155,10 @@ var EditProTable = function EditProTable(_ref) {
       }, "\u5220\u9664"))];
     }
   }];
+  var formatMap = {
+    date: 'YYYY-MM-DD',
+    time: 'HH:mm:ss'
+  };
   (0, _react.useEffect)(function () {
     console.log('columns', columns);
     setOriginalColumns(columns);
@@ -262,20 +266,21 @@ var EditProTable = function EditProTable(_ref) {
     if (toType === void 0) {
       toType = 'moment';
     }
+    console.log('editProTable convertTimeData', data);
     return data.map(function (row) {
       var newRow = (0, _extends2["default"])({}, row);
       Object.keys(newRow).forEach(function (key) {
         var col = columns.find(function (c) {
           return c.dataIndex === key;
         });
-        if (!col || !['time', 'date'].includes(col.valueType)) return;
+        if (!col || !['date', 'time'].includes(col.valueType)) return;
         var value = newRow[key];
         if (toType === 'moment') {
           if (!value || value === '') {
             newRow[key] = null;
           }
-          if (typeof value === 'string' && value.length && col.valueType === 'time') {
-            var m = (0, _moment["default"])(value, 'HH:mm:ss', true);
+          if (typeof value === 'string' && value.length && ['date', 'time'].includes(col.valueType)) {
+            var m = (0, _moment["default"])(value, formatMap[col.valueType], true);
             newRow[key] = m.isValid() ? m : null;
           }
         }

package/lib/components/pro-table/pro-table.js

@@ -6,12 +6,13 @@ exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _card = _interopRequireDefault(require("antd/lib/card"));
 var _space = _interopRequireDefault(require("antd/lib/space"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _react = _interopRequireWildcard(require("react"));
 var React = _react;
 var _proComponents = require("@ant-design/pro-components");
+var _moment = _interopRequireDefault(require("moment"));
 var _ImportExcelButton = _interopRequireDefault(require("../edit-pro-table/components/ImportExcelButton"));
 var _ExportExcelButton = _interopRequireDefault(require("../edit-pro-table/components/ExportExcelButton"));
 var _excluded = ["rowKey", "columns", "dataSource", "tableName", "headerTitle", "exportButton", "importButton", "importTemplateList", "tableHeaderBold", "tableHeaderSize", "toolBarRender", "screen_inner_id", "scroll", "pagination"];
@@ -52,13 +53,46 @@ var ProTable = function ProTable(_ref) {
     fixed: 'left',
     hideInTable: true
   }];
+  var formatMap = {
+    date: 'YYYY-MM-DD',
+    time: 'HH:mm:ss'
+  };
   (0, _react.useEffect)(function () {
     setOriginalColumns(columns);
     if (dataSource.length) {
-      setTableDataSource(dataSource);
+      var convertedDataSource = convertTimeData(dataSource, 'moment');
+      setTableDataSource(JSON.parse(JSON.stringify(convertedDataSource)));
     }
   }, [dataSource]);
 
+  // 只在初始化 dataSource 时，把时间组件的字符串格式的值转为 moment 对象
+  var convertTimeData = function convertTimeData(data, toType) {
+    if (toType === void 0) {
+      toType = 'moment';
+    }
+    console.log('proTable convertTimeData', data);
+    return data.map(function (row) {
+      var newRow = (0, _extends2["default"])({}, row);
+      Object.keys(newRow).forEach(function (key) {
+        var col = columns.find(function (c) {
+          return c.dataIndex === key;
+        });
+        if (!col || !['date', 'time'].includes(col.valueType)) return;
+        var value = newRow[key];
+        if (toType === 'moment') {
+          if (!value || value === '') {
+            newRow[key] = null;
+          }
+          if (typeof value === 'string' && value.length && ['date', 'time'].includes(col.valueType)) {
+            var m = (0, _moment["default"])(value, formatMap[col.valueType], true);
+            newRow[key] = m.isValid() ? m : null;
+          }
+        }
+      });
+      return newRow;
+    });
+  };
+
   // 处理导入
   var handleImport = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(response) {

package/lowcode_es/meta.js

@@ -101,7 +101,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = '@openli1115/lowcode-edit-pro-table';
   }
   if (version === void 0) {
-    version = '1.0.47';
+    version = '1.0.49';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_lib/meta.js

@@ -106,7 +106,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = '@openli1115/lowcode-edit-pro-table';
   }
   if (version === void 0) {
-    version = '1.0.47';
+    version = '1.0.49';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openli1115/lowcode-edit-pro-table",
-  "version": "1.0.47",
+  "version": "1.0.49",
   "description": "@openli1115/lowcode-edit-pro-table",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -100,10 +100,10 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.47/build/lowcode/assets-prod.json"
+    "materialSchema": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.49/build/lowcode/assets-prod.json"
   },
   "lcMeta": {
     "type": "component"
   },
-  "homepage": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.47/build/index.html"
+  "homepage": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.49/build/index.html"
 }