Merge pull request #1409 from alibaba/feat-mobile

feat: 增加 fr-mobile form.item layout setting

Author: lhbxs

packages/form-render-mobile/CHANGELOG.md

@@ -1,6 +1,9 @@
 # 更新日志
 
-
+### 1.0.13
+- [+] 增加输入控件单独配置布局 layout = 'row' | 'column'
+- [+] 补齐 tooltip 字段，与 PC 端保持一致
+- [!] 修复 title 不存在时，校验信息不提示
 ### 1.0.5
 - [+] 增加 form.getFieldRef API，自定义组件可以暴露实例，供 getFieldRef 使用
 ### 1.0.0

packages/form-render-mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-render-mobile",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "通过 JSON Schema 生成标准 Form，常用于自定义搭建配置界面生成",
   "keywords": [
     "Form",

packages/form-render-mobile/src/render-core/FieldItem/main.tsx

@@ -36,7 +36,7 @@ export default (props: any) => {
   const configCtx = useContext(ConfigContext);
 
   const { form, widgets, methods, globalProps }: any = configCtx;
-  const { hidden, properties, dependencies, inlineMode: _inlineMode, remove, removeText, visible = true, ...otherSchema } = schema;
+  const { hidden, properties, dependencies, inlineMode: _inlineMode, remove, removeText, visible = true, layout, ...otherSchema } = schema;
   const getValueFromKey = getParamValue(formCtx, upperCtx, schema);
 
   useEffect(() => {
@@ -105,6 +105,7 @@ export default (props: any) => {
 
   const extra = getExtraView('extra', schema, widgets);
   const help = getExtraView('help', schema, widgets);
+  const tooltip = getExtraView('tooltip', schema, widgets);
   const ruleList = getRuleList(schema, form, methods);
   const readOnly = getValueFromKey('readOnly');
   const valuePropName = schema.valuePropName || valuePropNameMap[schema.widget] || undefined;
@@ -113,10 +114,6 @@ export default (props: any) => {
     fieldProps.readOnly = readOnly;
   }
 
-  if (!label) {
-    noStyle = true;
-  }
-
   if (readOnly) {
     Widget = getWidget(widgets, schema.readOnlyWidget, schema, true);
   }
@@ -128,7 +125,7 @@ export default (props: any) => {
     valuePropName,
     hidden,
     extra,
-    help,
+    help: tooltip || help,
     noStyle,
     dependencies,
     name: path,
@@ -137,6 +134,13 @@ export default (props: any) => {
     className:classnames('fr-field', {'fr-field-visibility': !visible})
   };
 
+  if (layout) {
+    itemProps.layout = {
+      column: 'vertical',
+      row: 'horizontal',
+    }[layout];
+  }
+
   if (!readOnly && needOnClick) {
     itemProps.onClick = () => {
       fieldRef.current.open();