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

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

@@ -72,7 +72,7 @@ var EditProTable = function EditProTable(_ref) {
     form = _Form$useForm[0];
   var screenStructure = screen_inner_id ? screen_inner_id.split('__')[1] : '';
   console.log('editProTable otherProps', otherProps);
-  console.log('dataSource', dataSource);
+  console.log('editProTable dataSource', dataSource);
   // console.log('screen_inner_id', screen_inner_id);
   // console.log('bind_inner_field', bind_inner_field);
 
@@ -268,9 +268,9 @@ var EditProTable = function EditProTable(_ref) {
         if (toType === 'moment') {
           if (!value || value === '') {
             newRow[key] = null;
-          } else if (typeof value === 'string') {
-            var format = col.valueType === 'time' ? 'HH:mm:ss' : 'YYYY-MM-DD HH:mm:ss';
-            var m = moment(value, format, true);
+          }
+          if (typeof value === 'string' && value.length && col.valueType === 'time') {
+            var m = moment(value, 'HH:mm:ss', true);
             newRow[key] = m.isValid() ? m : null;
           }
         }

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

@@ -2,10 +2,6 @@ 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 _Input from "antd/es/input";
-import _Select from "antd/es/select";
-import _TimePicker from "antd/es/time-picker";
-import _DatePicker from "antd/es/date-picker";
 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";
@@ -43,49 +39,6 @@ var ProTable = function ProTable(_ref) {
   var screenStructure = screen_inner_id ? screen_inner_id.split('__')[1] : '';
   console.log('proTable otherProps', otherProps);
   console.log('proTable dataSource', dataSource);
-  var generateProTableColumns = function generateProTableColumns(columns) {
-    // console.log('generateProTableColumns', columns);
-    columns.forEach(function (column, index) {
-      if (column.hasCheckbox) return;
-      column.title = /*#__PURE__*/React.createElement("span", null, column.title, column.required ? /*#__PURE__*/React.createElement("span", {
-        style: {
-          color: 'red',
-          marginLeft: 5
-        }
-      }, "*") : null);
-      column.renderFormItem = function () {
-        var disabled = column.disableEdit;
-        if (column.valueType === 'date') {
-          return /*#__PURE__*/React.createElement(_DatePicker, {
-            disabled: disabled
-          });
-        }
-        if (column.valueType === 'time') {
-          return /*#__PURE__*/React.createElement(_TimePicker, {
-            disabled: disabled
-          });
-        }
-        if (column.valueType === 'select') {
-          return /*#__PURE__*/React.createElement(_Select, {
-            disabled: disabled,
-            options: column.valueEnum ? Object.keys(column.valueEnum).map(function (key) {
-              return {
-                label: key,
-                value: key
-              };
-            }) : []
-          }); // column.valueEnum[key].text
-        }
-        return /*#__PURE__*/React.createElement(_Input, {
-          disabled: disabled
-        });
-      };
-      column.render = function (node, row) {
-        return node;
-      };
-      column.hasCheckbox = true;
-    });
-  };
   var extraColumns = [{
     title: 'ID',
     dataIndex: 'id',
@@ -144,7 +97,6 @@ var ProTable = function ProTable(_ref) {
   if (tableHeaderSize) {
     tableClassName += " th-font-" + tableHeaderSize;
   }
-  generateProTableColumns(originalColumns);
   return /*#__PURE__*/React.createElement(_Card, {
     bordered: false,
     bodyStyle: {

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

@@ -77,7 +77,7 @@ var EditProTable = function EditProTable(_ref) {
     form = _Form$useForm[0];
   var screenStructure = screen_inner_id ? screen_inner_id.split('__')[1] : '';
   console.log('editProTable otherProps', otherProps);
-  console.log('dataSource', dataSource);
+  console.log('editProTable dataSource', dataSource);
   // console.log('screen_inner_id', screen_inner_id);
   // console.log('bind_inner_field', bind_inner_field);
 
@@ -273,9 +273,9 @@ var EditProTable = function EditProTable(_ref) {
         if (toType === 'moment') {
           if (!value || value === '') {
             newRow[key] = null;
-          } else if (typeof value === 'string') {
-            var format = col.valueType === 'time' ? 'HH:mm:ss' : 'YYYY-MM-DD HH:mm:ss';
-            var m = (0, _moment["default"])(value, format, true);
+          }
+          if (typeof value === 'string' && value.length && col.valueType === 'time') {
+            var m = (0, _moment["default"])(value, 'HH:mm:ss', true);
             newRow[key] = m.isValid() ? m : null;
           }
         }

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

@@ -8,10 +8,6 @@ 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 _input = _interopRequireDefault(require("antd/lib/input"));
-var _select = _interopRequireDefault(require("antd/lib/select"));
-var _timePicker = _interopRequireDefault(require("antd/lib/time-picker"));
-var _datePicker = _interopRequireDefault(require("antd/lib/date-picker"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _react = _interopRequireWildcard(require("react"));
 var React = _react;
@@ -49,49 +45,6 @@ var ProTable = function ProTable(_ref) {
   var screenStructure = screen_inner_id ? screen_inner_id.split('__')[1] : '';
   console.log('proTable otherProps', otherProps);
   console.log('proTable dataSource', dataSource);
-  var generateProTableColumns = function generateProTableColumns(columns) {
-    // console.log('generateProTableColumns', columns);
-    columns.forEach(function (column, index) {
-      if (column.hasCheckbox) return;
-      column.title = /*#__PURE__*/React.createElement("span", null, column.title, column.required ? /*#__PURE__*/React.createElement("span", {
-        style: {
-          color: 'red',
-          marginLeft: 5
-        }
-      }, "*") : null);
-      column.renderFormItem = function () {
-        var disabled = column.disableEdit;
-        if (column.valueType === 'date') {
-          return /*#__PURE__*/React.createElement(_datePicker["default"], {
-            disabled: disabled
-          });
-        }
-        if (column.valueType === 'time') {
-          return /*#__PURE__*/React.createElement(_timePicker["default"], {
-            disabled: disabled
-          });
-        }
-        if (column.valueType === 'select') {
-          return /*#__PURE__*/React.createElement(_select["default"], {
-            disabled: disabled,
-            options: column.valueEnum ? Object.keys(column.valueEnum).map(function (key) {
-              return {
-                label: key,
-                value: key
-              };
-            }) : []
-          }); // column.valueEnum[key].text
-        }
-        return /*#__PURE__*/React.createElement(_input["default"], {
-          disabled: disabled
-        });
-      };
-      column.render = function (node, row) {
-        return node;
-      };
-      column.hasCheckbox = true;
-    });
-  };
   var extraColumns = [{
     title: 'ID',
     dataIndex: 'id',
@@ -150,7 +103,6 @@ var ProTable = function ProTable(_ref) {
   if (tableHeaderSize) {
     tableClassName += " th-font-" + tableHeaderSize;
   }
-  generateProTableColumns(originalColumns);
   return /*#__PURE__*/React.createElement(_card["default"], {
     bordered: false,
     bodyStyle: {

package/lowcode/pro-table/meta.ts

@@ -118,14 +118,14 @@ const ProTableMeta: IPublicTypeComponentMetadata = {
                         props: {
                           options: [
                             { title: '文本', value: 'text' },
-                            { title: '标签', value: 'tag' },
-                            { title: '数字', value: 'digit' },
-                            { title: '金额', value: 'money' },
+                            // { title: '标签', value: 'tag' },
+                            // { title: '数字', value: 'digit' },
+                            // { title: '金额', value: 'money' },
                             { title: '日期', value: 'date' },
-                            { title: '日期时间', value: 'dateTime' },
-                            { title: '链接', value: 'link' },
-                            { title: '头像', value: 'avatar' },
-                            { title: '进度条', value: 'progress' }
+                            { title: '时间', value: 'time' },
+                            // { title: '链接', value: 'link' },
+                            // { title: '头像', value: 'avatar' },
+                            // { title: '进度条', value: 'progress' }
                           ]
                         }
                       }

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.45';
+    version = '1.0.47';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_es/pro-table/meta.js

@@ -121,31 +121,21 @@ var ProTableMeta = {
                       options: [{
                         title: '文本',
                         value: 'text'
-                      }, {
-                        title: '标签',
-                        value: 'tag'
-                      }, {
-                        title: '数字',
-                        value: 'digit'
-                      }, {
-                        title: '金额',
-                        value: 'money'
-                      }, {
+                      },
+                      // { title: '标签', value: 'tag' },
+                      // { title: '数字', value: 'digit' },
+                      // { title: '金额', value: 'money' },
+                      {
                         title: '日期',
                         value: 'date'
                       }, {
-                        title: '日期时间',
-                        value: 'dateTime'
-                      }, {
-                        title: '链接',
-                        value: 'link'
-                      }, {
-                        title: '头像',
-                        value: 'avatar'
-                      }, {
-                        title: '进度条',
-                        value: 'progress'
-                      }]
+                        title: '时间',
+                        value: 'time'
+                      }
+                      // { title: '链接', value: 'link' },
+                      // { title: '头像', value: 'avatar' },
+                      // { title: '进度条', value: 'progress' }
+                      ]
                     }
                   }
                 }, {

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.45';
+    version = '1.0.47';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_lib/pro-table/meta.js

@@ -126,31 +126,21 @@ var ProTableMeta = {
                       options: [{
                         title: '文本',
                         value: 'text'
-                      }, {
-                        title: '标签',
-                        value: 'tag'
-                      }, {
-                        title: '数字',
-                        value: 'digit'
-                      }, {
-                        title: '金额',
-                        value: 'money'
-                      }, {
+                      },
+                      // { title: '标签', value: 'tag' },
+                      // { title: '数字', value: 'digit' },
+                      // { title: '金额', value: 'money' },
+                      {
                         title: '日期',
                         value: 'date'
                       }, {
-                        title: '日期时间',
-                        value: 'dateTime'
-                      }, {
-                        title: '链接',
-                        value: 'link'
-                      }, {
-                        title: '头像',
-                        value: 'avatar'
-                      }, {
-                        title: '进度条',
-                        value: 'progress'
-                      }]
+                        title: '时间',
+                        value: 'time'
+                      }
+                      // { title: '链接', value: 'link' },
+                      // { title: '头像', value: 'avatar' },
+                      // { title: '进度条', value: 'progress' }
+                      ]
                     }
                   }
                 }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openli1115/lowcode-edit-pro-table",
-  "version": "1.0.45",
+  "version": "1.0.47",
   "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.45/build/lowcode/assets-prod.json"
+    "materialSchema": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.47/build/lowcode/assets-prod.json"
   },
   "lcMeta": {
     "type": "component"
   },
-  "homepage": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.45/build/index.html"
+  "homepage": "https://unpkg.com/@openli1115/lowcode-edit-pro-table@1.0.47/build/index.html"
 }