yy-forms 1.0.2 → 1.0.35

package/dist/index.esm.js

@@ -2733,46 +2733,76 @@ var defaultSettings = [{
 //   widgets: saves,
 // },
 ];
-var defaultGlobalSettings = function defaultGlobalSettings(t) {
-  return {
-    type: 'object',
-    properties: {
-      column: {
-        title: t('整体布局'),
-        type: 'number',
-        enum: [1, 2, 3],
-        enumNames: [t('一行一列'), t('一行二列'), t('一行三列')],
-        props: {
-          placeholder: t('默认一行一列')
-        }
-      },
-      labelWidth: {
-        title: t('标签宽度'),
-        type: 'number',
-        widget: 'slider',
-        max: 300,
-        default: 120,
-        props: {
-          hideNumber: true
-        }
-      },
-      displayType: {
-        title: t('标签展示模式'),
-        type: 'string',
-        default: 'row',
-        enum: ['row', 'column'],
-        enumNames: [t('同行'), t('单独一行')],
-        widget: 'radio'
+var defaultGlobalSettings = {
+  type: 'object',
+  properties: {
+    column: {
+      title: '整体布局',
+      type: 'number',
+      enum: [1, 2, 3],
+      enumNames: ['一行一列', '一行二列', '一行三列'],
+      props: {
+        placeholder: '默认一行一列'
+      }
+    },
+    labelWidth: {
+      title: '标签宽度',
+      type: 'number',
+      widget: 'slider',
+      max: 300,
+      default: 120,
+      props: {
+        hideNumber: true
       }
+    },
+    displayType: {
+      title: '标签展示模式',
+      type: 'string',
+      default: 'row',
+      enum: ['row', 'column'],
+      enumNames: ['同行', '单独一行'],
+      widget: 'radio'
     }
-  };
+  }
+};
+var USdefaultGlobalSettings = {
+  "type": "object",
+  "properties": {
+    "column": {
+      "title": "Grid Layout",
+      "type": "number",
+      "enum": [1, 2, 3],
+      "enumNames": ["Single Column", "Two Columns", "Three Columns"],
+      "props": {
+        "placeholder": "Single Column by default"
+      }
+    },
+    "labelWidth": {
+      "title": "Label Width",
+      "type": "number",
+      "widget": "slider",
+      "max": 300,
+      "default": 120,
+      "props": {
+        "hideNumber": true
+      }
+    },
+    "displayType": {
+      "title": "Label Position",
+      "type": "string",
+      "default": "row",
+      "enum": ["row", "column"],
+      "enumNames": ["Inline", "Above Field"],
+      "widget": "radio"
+    }
+  }
 };
 
 function GlobalSettings(_ref) {
   var widgets = _ref.widgets;
   var form = useForm();
   var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
+    i18n = _useTranslation.i18n;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     innerUpdate = _useState2[0],
@@ -2781,10 +2811,10 @@ function GlobalSettings(_ref) {
     globalWidgets = _useStore.widgets,
     frProps = _useStore.frProps,
     _useStore$userProps = _useStore.userProps,
-    userProps = _useStore$userProps === void 0 ? {} : _useStore$userProps,
     mapping = _useStore.mapping;
   var setGlobal = useGlobal();
-  var globalSettings = userProps.globalSettings || defaultGlobalSettings(t);
+  // const globalSettings = userProps.globalSettings || defaultGlobalSettings(t);
+
   var onDataChange = function onDataChange(value) {
     setInnerUpdate(!!Object.keys(value).length);
     setGlobal({
@@ -2809,7 +2839,7 @@ function GlobalSettings(_ref) {
     }
   }, /*#__PURE__*/React.createElement(FormRender, {
     form: form,
-    schema: globalSettings,
+    schema: i18n.language === 'zh-CN' ? defaultGlobalSettings : USdefaultGlobalSettings,
     watch: {
       '#': function _(v) {
         return onDataChange(v);
@@ -3935,15 +3965,6 @@ var components = {
 	"简单列表": "SimpleList",
 	"表格列表": "TableList",
 	"复杂表格列表": "DrawerList",
-	"整体布局": "Grid Columns",
-	"一行一列": "Single Column",
-	"一行二列": "Two Columns",
-	"一行三列": "Three Columns",
-	"默认一行一列": "Single Column by default",
-	"标签宽度": "Form Label Width",
-	"标签展示模式": "Label Alignment",
-	"同行": "Horizontal",
-	"单独一行": "Vertical",
 	"复杂结构样例": "Example"
 };
 var enUS = {

package/dist/index.js

@@ -2760,46 +2760,76 @@ var defaultSettings = [{
 //   widgets: saves,
 // },
 ];
-var defaultGlobalSettings = function defaultGlobalSettings(t) {
-  return {
-    type: 'object',
-    properties: {
-      column: {
-        title: t('整体布局'),
-        type: 'number',
-        enum: [1, 2, 3],
-        enumNames: [t('一行一列'), t('一行二列'), t('一行三列')],
-        props: {
-          placeholder: t('默认一行一列')
-        }
-      },
-      labelWidth: {
-        title: t('标签宽度'),
-        type: 'number',
-        widget: 'slider',
-        max: 300,
-        default: 120,
-        props: {
-          hideNumber: true
-        }
-      },
-      displayType: {
-        title: t('标签展示模式'),
-        type: 'string',
-        default: 'row',
-        enum: ['row', 'column'],
-        enumNames: [t('同行'), t('单独一行')],
-        widget: 'radio'
+var defaultGlobalSettings = {
+  type: 'object',
+  properties: {
+    column: {
+      title: '整体布局',
+      type: 'number',
+      enum: [1, 2, 3],
+      enumNames: ['一行一列', '一行二列', '一行三列'],
+      props: {
+        placeholder: '默认一行一列'
+      }
+    },
+    labelWidth: {
+      title: '标签宽度',
+      type: 'number',
+      widget: 'slider',
+      max: 300,
+      default: 120,
+      props: {
+        hideNumber: true
       }
+    },
+    displayType: {
+      title: '标签展示模式',
+      type: 'string',
+      default: 'row',
+      enum: ['row', 'column'],
+      enumNames: ['同行', '单独一行'],
+      widget: 'radio'
     }
-  };
+  }
+};
+var USdefaultGlobalSettings = {
+  "type": "object",
+  "properties": {
+    "column": {
+      "title": "Grid Layout",
+      "type": "number",
+      "enum": [1, 2, 3],
+      "enumNames": ["Single Column", "Two Columns", "Three Columns"],
+      "props": {
+        "placeholder": "Single Column by default"
+      }
+    },
+    "labelWidth": {
+      "title": "Label Width",
+      "type": "number",
+      "widget": "slider",
+      "max": 300,
+      "default": 120,
+      "props": {
+        "hideNumber": true
+      }
+    },
+    "displayType": {
+      "title": "Label Position",
+      "type": "string",
+      "default": "row",
+      "enum": ["row", "column"],
+      "enumNames": ["Inline", "Above Field"],
+      "widget": "radio"
+    }
+  }
 };
 
 function GlobalSettings(_ref) {
   var widgets = _ref.widgets;
   var form = FormRender.useForm();
   var _useTranslation = reactI18next.useTranslation(),
-    t = _useTranslation.t;
+    i18n = _useTranslation.i18n;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     innerUpdate = _useState2[0],
@@ -2808,10 +2838,10 @@ function GlobalSettings(_ref) {
     globalWidgets = _useStore.widgets,
     frProps = _useStore.frProps,
     _useStore$userProps = _useStore.userProps,
-    userProps = _useStore$userProps === void 0 ? {} : _useStore$userProps,
     mapping = _useStore.mapping;
   var setGlobal = useGlobal();
-  var globalSettings = userProps.globalSettings || defaultGlobalSettings(t);
+  // const globalSettings = userProps.globalSettings || defaultGlobalSettings(t);
+
   var onDataChange = function onDataChange(value) {
     setInnerUpdate(!!Object.keys(value).length);
     setGlobal({
@@ -2836,7 +2866,7 @@ function GlobalSettings(_ref) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(FormRender__default['default'], {
     form: form,
-    schema: globalSettings,
+    schema: i18n.language === 'zh-CN' ? defaultGlobalSettings : USdefaultGlobalSettings,
     watch: {
       '#': function _(v) {
         return onDataChange(v);
@@ -3962,15 +3992,6 @@ var components = {
 	"简单列表": "SimpleList",
 	"表格列表": "TableList",
 	"复杂表格列表": "DrawerList",
-	"整体布局": "Grid Columns",
-	"一行一列": "Single Column",
-	"一行二列": "Two Columns",
-	"一行三列": "Three Columns",
-	"默认一行一列": "Single Column by default",
-	"标签宽度": "Form Label Width",
-	"标签展示模式": "Label Alignment",
-	"同行": "Horizontal",
-	"单独一行": "Vertical",
 	"复杂结构样例": "Example"
 };
 var enUS = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yy-forms",
-  "version": "1.0.2",
+  "version": "1.0.35",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",

package/src/components/Settings/GlobalSettings.jsx

@@ -1,12 +1,12 @@
 import FormRender, { useForm } from 'form-render';
 import React, { useEffect, useState } from 'react';
-import { defaultGlobalSettings } from '../../settings';
+import { defaultGlobalSettings, USdefaultGlobalSettings } from '../../settings';
 import { useGlobal, useStore } from '../../utils/hooks';
 import { useTranslation } from 'react-i18next';
 
 export default function GlobalSettings({ widgets }) {
   const form = useForm();
-  const { t } = useTranslation();
+  const { i18n } = useTranslation();
   const [innerUpdate, setInnerUpdate] = useState(false);
   const {
     widgets: globalWidgets,
@@ -15,7 +15,7 @@ export default function GlobalSettings({ widgets }) {
     mapping,
   } = useStore();
   const setGlobal = useGlobal();
-  const globalSettings = userProps.globalSettings || defaultGlobalSettings(t);
+  // const globalSettings = userProps.globalSettings || defaultGlobalSettings(t);
 
   const onDataChange = value => {
     setInnerUpdate(!!Object.keys(value).length);
@@ -38,7 +38,7 @@ export default function GlobalSettings({ widgets }) {
     <div style={{ paddingRight: 24 }}>
       <FormRender
         form={form}
-        schema={globalSettings}
+        schema={i18n.language === 'zh-CN' ? defaultGlobalSettings : USdefaultGlobalSettings}
         watch={{
           '#': v => onDataChange(v),
         }}

package/src/i18next/locales/enUS.json

@@ -45,15 +45,6 @@
     "简单列表": "SimpleList",
     "表格列表": "TableList",
     "复杂表格列表": "DrawerList",
-    "整体布局":"Grid Columns",
-    "一行一列": "Single Column",
-    "一行二列": "Two Columns",
-    "一行三列": "Three Columns",
-    "默认一行一列":"Single Column by default",
-    "标签宽度":"Form Label Width",
-    "标签展示模式": "Label Alignment",
-    "同行": "Horizontal",
-    "单独一行": "Vertical",
 
     "复杂结构样例": "Example"
   }

package/src/settings/index.js

@@ -1022,37 +1022,68 @@ export const defaultSettings = [
   // },
 ];
 
-export const defaultGlobalSettings = (t) => {
-  return {
-    type: 'object',
-    properties: {
-      column: {
-        title: t('整体布局'),
-        type: 'number',
-        enum: [1, 2, 3],
-        enumNames: [t('一行一列'), t('一行二列'), t('一行三列')],
-        props: {
-          placeholder: t('默认一行一列'),
-        },
-      },
-      labelWidth: {
-        title: t('标签宽度'),
-        type: 'number',
-        widget: 'slider',
-        max: 300,
-        default: 120,
-        props: {
-          hideNumber: true,
-        },
+export const defaultGlobalSettings = {
+  type: 'object',
+  properties: {
+    column: {
+      title: '整体布局',
+      type: 'number',
+      enum: [1, 2, 3],
+      enumNames: ['一行一列', '一行二列', '一行三列'],
+      props: {
+        placeholder: '默认一行一列',
       },
-      displayType: {
-        title: t('标签展示模式'),
-        type: 'string',
-        default: 'row',
-        enum: ['row', 'column'],
-        enumNames: [t('同行'), t('单独一行')],
-        widget: 'radio',
+    },
+    labelWidth: {
+      title: '标签宽度',
+      type: 'number',
+      widget: 'slider',
+      max: 300,
+      default: 120,
+      props: {
+        hideNumber: true,
       },
     },
-  }
+    displayType: {
+      title: '标签展示模式',
+      type: 'string',
+      default: 'row',
+      enum: ['row', 'column'],
+      enumNames: ['同行', '单独一行'],
+      widget: 'radio',
+    },
+  },
 };
+
+export const USdefaultGlobalSettings = {
+  "type": "object",
+  "properties": {
+    "column": {
+      "title": "Grid Layout",
+      "type": "number",
+      "enum": [1, 2, 3],
+      "enumNames": ["Single Column", "Two Columns", "Three Columns"],
+      "props": {
+        "placeholder": "Single Column by default"
+      }
+    },
+    "labelWidth": {
+      "title": "Label Width",
+      "type": "number",
+      "widget": "slider",
+      "max": 300,
+      "default": 120,
+      "props": {
+        "hideNumber": true
+      }
+    },
+    "displayType": {
+      "title": "Label Position",
+      "type": "string",
+      "default": "row",
+      "enum": ["row", "column"],
+      "enumNames": ["Inline", "Above Field"],
+      "widget": "radio"
+    }
+  }
+}