Merge branch 'master' of https://github.com/alibaba/x-render

Author: siyi98

packages/form-render/src/form-render-core/src/core/RenderField/Title.js

@@ -2,6 +2,7 @@ import { Tooltip } from 'antd';
 import React from 'react';
 import { useStore2, useTools } from '../../hooks';
 import { isCheckBoxType } from '../../utils';
+import cn from 'classnames';
 
 const Description = ({ displayType, schema }) => {
   const { description, descType, descWidget } = schema;
@@ -113,20 +114,20 @@ const Title = ({
     <div className={labelClass} style={labelStyle}>
       {title ? (
         <label
-          className={`fr-label-title ${
-            isCheckBoxType(schema, readOnly) ||
-            _displayType === 'column' ||
-            !colon
-              ? 'no-colon'
-              : ''
-          }`} // checkbox不带冒号
+          className={cn( 'fr-label-title',{
+            'no-colon':
+              isCheckBoxType(schema, readOnly) ||
+              _displayType === 'column' ||
+              !colon,
+          })} // checkbox不带冒号
           title={title}
         >
           {TitleRequiredMark}
           <span
-            className={`${isObjType ? 'b' : ''} ${
-              _displayType === 'column' ? 'flex-none' : ''
-            }`}
+            className={cn({
+              b: isObjType,
+              'flex-none': _displayType === 'column',
+            })}
           >
             <span dangerouslySetInnerHTML={{ __html: title }} />
           </span>

packages/form-render/src/form-render-core/src/core/RenderField/index.js

@@ -12,6 +12,7 @@ import ErrorMessage from './ErrorMessage';
 import ExtendedWidget from './ExtendedWidget';
 import Extra from './Extra';
 import FieldTitle from './Title';
+import cn from 'classnames';
 
 // TODO: 之后不要直接用get，收口到一个内部方法getValue，便于全局 ctrl + f 查找
 const RenderField = props => {
@@ -241,7 +242,7 @@ const RenderField = props => {
     <>
       {_showTitle && titleElement}
       <div
-        className={`${contentClass} ${hideTitle ? 'fr-content-no-title' : ''}`}
+        className={cn(contentClass, { 'fr-content-no-title': hideTitle })}
         style={contentStyle}
         datapath={dataPath}
       >

packages/form-render/src/form-render-core/src/core/index.js

@@ -259,7 +259,7 @@ const CoreRender = ({
   };
 
   const objChildren = (
-    <div className={`flex flex-wrap`}>
+    <div className={`flex flex-wrap fr-core-obj`}>
       <RenderObject
         dataIndex={dataIndex}
         errorFields={errorFields}

packages/form-render/src/form-render-core/src/index.less

@@ -148,6 +148,11 @@
   }
 
   .fr-list-1 {
+
+    .flex-wrap.flex.fr-core-obj {
+      flex-wrap: nowrap;
+    }
+
     .fr-content {
       min-width: 140px;
     }

packages/table-render/__tests__/utils.spec.ts

@@ -7,7 +7,7 @@ describe('Test TableRender valueType', () => {
   });
   test('Test getDateTime', () => {
     const current = new Date().getTime();
-    expect(getDateTime(current)).toHaveLength(16);
+    expect(getDateTime(current)).toHaveLength(19);
   });
   test('Test getMoneyType', () => {
     expect(getMoneyType(10000)).toEqual('¥10,000');

tools/schema-generator/src/components/Canvas/core/RenderField.jsx

@@ -7,6 +7,7 @@ import {
 } from '../../../utils';
 import { useStore } from '../../../utils/hooks';
 import { getWidgetName } from '../../../utils/mapping';
+import cn from 'classnames';
 
 const RenderField = ({
   $id,
@@ -90,18 +91,17 @@ const RenderField = ({
       {schema.title ? (
         <div className={labelClass} style={labelStyle}>
           <label
-            className={`fr-label-title ${
-              widgetName === 'checkbox' || displayType === 'column'
-                ? 'no-colon'
-                : ''
-            }`} // checkbox不带冒号
+            className={cn('fr-label-title', {
+              'no-colon': widgetName === 'checkbox' || displayType === 'column',
+            })} // checkbox不带冒号
             title={title}
           >
             {required && <span className="fr-label-required"> *</span>}
             <span
-              className={`${isComplex ? 'b' : ''} ${
-                displayType === 'column' ? 'flex-none' : ''
-              }`}
+              className={cn({
+                b: isComplex,
+                'flex-none': displayType === 'column',
+              })}
             >
               <span dangerouslySetInnerHTML={{ __html: title }} />
             </span>

tools/schema-generator/src/components/Canvas/core/Wrapper.less

@@ -8,7 +8,7 @@
   margin: 0;
 }
 
-.fr-generator-container .dnd-container > .field-wrapper > .fr-field {
+.fr-generator-container .dnd-container > .field-wrapper > div.fr-field {
   margin: 0;
 }
 

tools/schema-generator/src/transformer/form-render.js

@@ -47,8 +47,6 @@ const transformTo = schema => {
         label: schema.enumNames[idx],
       }));
       schema.enumList = list;
-      schema.enum;
-      schema.enumNames;
     }
   } else {
     const childrenList = getChildren2(schema);