Merge branch 'master' into dev

xdd-lisa · Feb 25, 2022 · 8fab04d · 8fab04d
2 parents 7507e9d + e803b19
commit 8fab04d
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 23 deletions.
diff --git a/packages/form-render/src/widgets/antd/date.js b/packages/form-render/src/widgets/antd/date.js
@@ -1,36 +1,40 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import moment from 'moment';
 import { DatePicker } from 'antd';
 import { getFormat } from '../../utils';
 
-// TODO: 不要使用moment，使用dayjs
+// TODO: 不要使用 moment，使用 dayjs
 export default ({ onChange, format, value, style, ...rest }) => {
   const dateFormat = getFormat(format);
-  // week的时候会返回 2020-31周 quarter会返回 2020-Q2 需要处理之后才能被 moment
-  let _value = value || undefined;
-  if (typeof _value === 'string') {
-    if (format === 'week') {
-      _value = _value ? _value.substring(0, _value.length - 1) : _value;
+
+  const valueObj = useMemo(() => {
+    // week 的时候会返回 2020-31周 quarter 会返回 2020-Q2 需要处理之后才能被 moment
+    let _value = value || undefined;
+    if (typeof _value === 'string') {
+      if (format === 'week') {
+        _value = _value ? _value.substring(0, _value.length - 1) : _value;
+      }
+      if (format === 'quarter') {
+        _value = _value.replace('Q', '');
+      }
     }
-    if (format === 'quarter') {
-      _value = _value.replace('Q', '');
+    if (_value) {
+      _value = moment(_value, dateFormat);
     }
-  }
-  if (_value) {
-    _value = moment(_value, dateFormat);
-  }
+    return _value
+  }, [value]);
 
   const handleChange = (value, string) => {
     onChange(string);
   };
 
-  let dateParams = {
-    value: _value,
+  const dateParams = {
+    value: valueObj,
     style: { width: '100%', ...style },
     onChange: handleChange,
   };
 
-  // TODO: format是在options里自定义的情况，是否要判断一下要不要showTime
+  // TODO: format 是在 options 里自定义的情况，是否要判断一下要不要 showTime
   if (format === 'dateTime') {
     dateParams.showTime = true;
   }
@@ -39,11 +43,9 @@ export default ({ onChange, format, value, style, ...rest }) => {
     dateParams.picker = format;
   }
 
-  dateParams = { ...dateParams, ...rest };
-
   if (dateFormat === format) {
     dateParams.format = format;
   }
 
-  return <DatePicker {...dateParams} />;
+  return <DatePicker {...dateParams} {...rest} />;
 };
diff --git a/packages/table-render/CHANGELOG.md b/packages/table-render/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+### 1.2.2
+
+- [+] `valueType`兼容`object`值类型。
+
+### 1.2.1
+
+- [+] `searchText`和`resetText`属性为非必填属性。
+
 ### 1.2.0
 
 - [+] `Search` 组件新增`searchText`和`resetText`属性，支持自定义`搜索/重置`按钮文本。

diff --git a/packages/table-render/package.json b/packages/table-render/package.json
@@ -1,6 +1,6 @@
 {
   "name": "table-render",
-  "version": "1.2.0",
+  "version": "1.2.3",
   "description": "中后台表格解决方案",
   "scripts": {
     "start": "dumi dev",

diff --git a/packages/table-render/src/components/field.tsx b/packages/table-render/src/components/field.tsx
@@ -68,6 +68,9 @@ export const renderCode = (code: string) => {
 
 // 渲染单元格
 export const renderDom = (val: string, item: any) => {
+  if (typeof val === 'object') {
+    return;
+  }
   if (item.valueType === 'code') {
     return renderCode(val);
   }

diff --git a/packages/table-render/src/interface.ts b/packages/table-render/src/interface.ts
@@ -83,8 +83,8 @@ export interface SearchProps<RecordType> {
     submit: Function,
     clearSearch: Function
   ) => React.ReactNode[];
-  searchText: string;
-  resetText: string;
+  searchText?: string;
+  resetText?: string;
   onSearch?: (search: any) => any;
   afterSearch?: (params: any) => any;
   widgets?: any;

diff --git a/tools/schema-generator/src/components/Settings/ItemSettings.jsx b/tools/schema-generator/src/components/Settings/ItemSettings.jsx
@@ -131,7 +131,6 @@ export default function ItemSettings({ widgets }) {
     <div style={{ paddingRight: 24 }}>
       <FormRender
         form={form}
-        removeHiddenData
         schema={settingSchema}
         widgets={{ ..._widgets, ...widgets }}
         watch={{