yy-forms 1.0.1 → 1.0.3

package/dist/index.esm.js

@@ -1834,11 +1834,6 @@ var Canvas = function Canvas(_ref) {
   }))));
 };
 
-// import { useTranslation } from 'react-i18next';
-// const { t } = useTranslation();
-var t = function t(text) {
-  return text;
-};
 // 只需写配置，方便可扩展
 var baseCommonSettings = {
   type: {
@@ -2738,42 +2733,46 @@ var defaultSettings = [{
 //   widgets: saves,
 // },
 ];
-var defaultGlobalSettings = {
-  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
+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'
       }
-    },
-    displayType: {
-      title: t('标签展示模式'),
-      type: 'string',
-      default: 'row',
-      enum: ['row', 'column'],
-      enumNames: [t('同行'), t('单独一行')],
-      widget: 'radio'
     }
-  }
+  };
 };
 
 function GlobalSettings(_ref) {
   var widgets = _ref.widgets;
   var form = useForm();
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     innerUpdate = _useState2[0],
@@ -2782,10 +2781,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;
+  // const globalSettings = userProps.globalSettings || defaultGlobalSettings(t);
+
   var onDataChange = function onDataChange(value) {
     setInnerUpdate(!!Object.keys(value).length);
     setGlobal({
@@ -2810,7 +2809,7 @@ function GlobalSettings(_ref) {
     }
   }, /*#__PURE__*/React.createElement(FormRender, {
     form: form,
-    schema: globalSettings,
+    schema: defaultGlobalSettings(t),
     watch: {
       '#': function _(v) {
         return onDataChange(v);

package/dist/index.js

@@ -1861,11 +1861,6 @@ var Canvas = function Canvas(_ref) {
   }))));
 };
 
-// import { useTranslation } from 'react-i18next';
-// const { t } = useTranslation();
-var t = function t(text) {
-  return text;
-};
 // 只需写配置，方便可扩展
 var baseCommonSettings = {
   type: {
@@ -2765,42 +2760,46 @@ var defaultSettings = [{
 //   widgets: saves,
 // },
 ];
-var defaultGlobalSettings = {
-  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
+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'
       }
-    },
-    displayType: {
-      title: t('标签展示模式'),
-      type: 'string',
-      default: 'row',
-      enum: ['row', 'column'],
-      enumNames: [t('同行'), t('单独一行')],
-      widget: 'radio'
     }
-  }
+  };
 };
 
 function GlobalSettings(_ref) {
   var widgets = _ref.widgets;
   var form = FormRender.useForm();
+  var _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     innerUpdate = _useState2[0],
@@ -2809,10 +2808,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;
+  // const globalSettings = userProps.globalSettings || defaultGlobalSettings(t);
+
   var onDataChange = function onDataChange(value) {
     setInnerUpdate(!!Object.keys(value).length);
     setGlobal({
@@ -2837,7 +2836,7 @@ function GlobalSettings(_ref) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(FormRender__default['default'], {
     form: form,
-    schema: globalSettings,
+    schema: defaultGlobalSettings(t),
     watch: {
       '#': function _(v) {
         return onDataChange(v);

package/package.json

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

package/src/components/Settings/GlobalSettings.jsx

@@ -2,9 +2,11 @@ import FormRender, { useForm } from 'form-render';
 import React, { useEffect, useState } from 'react';
 import { defaultGlobalSettings } 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 [innerUpdate, setInnerUpdate] = useState(false);
   const {
     widgets: globalWidgets,
@@ -13,7 +15,7 @@ export default function GlobalSettings({ widgets }) {
     mapping,
   } = useStore();
   const setGlobal = useGlobal();
-  const globalSettings = userProps.globalSettings || defaultGlobalSettings;
+  // const globalSettings = userProps.globalSettings || defaultGlobalSettings(t);
 
   const onDataChange = value => {
     setInnerUpdate(!!Object.keys(value).length);
@@ -36,7 +38,7 @@ export default function GlobalSettings({ widgets }) {
     <div style={{ paddingRight: 24 }}>
       <FormRender
         form={form}
-        schema={globalSettings}
+        schema={defaultGlobalSettings(t)}
         watch={{
           '#': v => onDataChange(v),
         }}

package/src/settings/index.js

@@ -1,6 +1,3 @@
-// import { useTranslation } from 'react-i18next';
-// const { t } = useTranslation();
-const t = (text) => text
 // 只需写配置，方便可扩展
 export const baseCommonSettings = {
   type: {
@@ -1025,35 +1022,37 @@ export const defaultSettings = [
   // },
 ];
 
-export const defaultGlobalSettings = {
-  type: 'object',
-  properties: {
-    column: {
-      title: t('整体布局'),
-      type: 'number',
-      enum: [1, 2, 3],
-      enumNames: [t('一行一列'), t('一行二列'), t('一行三列')],
-      props: {
-        placeholder: t('默认一行一列'),
+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,
+      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',
       },
     },
-    displayType: {
-      title: t('标签展示模式'),
-      type: 'string',
-      default: 'row',
-      enum: ['row', 'column'],
-      enumNames: [t('同行'), t('单独一行')],
-      widget: 'radio',
-    },
-  },
+  }
 };