yy-forms 1.0.41 → 1.0.43

package/dist/index.esm.js

@@ -1039,6 +1039,8 @@ var RenderField = function RenderField(_ref) {
     _useStore$frProps = _useStore.frProps,
     frProps = _useStore$frProps === void 0 ? {} : _useStore$frProps,
     fieldRender = _useStore.fieldRender;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   var labelWidth = frProps.labelWidth,
     displayType = frProps.displayType,
     showValidate = frProps.showValidate;
@@ -1107,7 +1109,7 @@ var RenderField = function RenderField(_ref) {
       'no-colon': widgetName === 'checkbox' || displayType === 'column'
     }) // checkbox不带冒号
     ,
-    title: title
+    title: t(title)
   }, required && /*#__PURE__*/React.createElement("span", {
     className: "fr-label-required"
   }, " *"), /*#__PURE__*/React.createElement("span", {
@@ -1117,7 +1119,7 @@ var RenderField = function RenderField(_ref) {
     })
   }, /*#__PURE__*/React.createElement("span", {
     dangerouslySetInnerHTML: {
-      __html: title
+      __html: t(title)
     }
   })), description && /*#__PURE__*/React.createElement("span", {
     className: "fr-desc ml2"
@@ -3708,7 +3710,6 @@ function GlobalSettings(_ref) {
         return onDataChange(v);
       }
     },
-    locale: 'en',
     widgets: _objectSpread2(_objectSpread2({}, globalWidgets), widgets),
     mapping: mapping
   }));
@@ -3978,7 +3979,6 @@ function ItemSettings(_ref) {
     schema: settingSchema,
     widgets: _objectSpread2(_objectSpread2({}, _widgets), widgets),
     mapping: globalMapping,
-    locale: 'en',
     watch: {
       '#': function _(v) {
         return setTimeout(function () {
@@ -4189,7 +4189,7 @@ var Sidebar = function Sidebar(props) {
     _useStore$userProps = _useStore.userProps,
     userProps = _useStore$userProps === void 0 ? {} : _useStore$userProps;
   var settings = userProps.settings;
-  var _settings = Array.isArray(settings) ? settings : defaultSettings;
+  var _settings = Array.isArray(settings) ? settings : USdefaultSettings;
   return /*#__PURE__*/React.createElement("div", {
     className: "left-layout w5-l w4"
   }, Array.isArray(_settings) ? _settings.map(function (item, idx) {

package/dist/index.js

@@ -1066,6 +1066,8 @@ var RenderField = function RenderField(_ref) {
     _useStore$frProps = _useStore.frProps,
     frProps = _useStore$frProps === void 0 ? {} : _useStore$frProps,
     fieldRender = _useStore.fieldRender;
+  var _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
   var labelWidth = frProps.labelWidth,
     displayType = frProps.displayType,
     showValidate = frProps.showValidate;
@@ -1134,7 +1136,7 @@ var RenderField = function RenderField(_ref) {
       'no-colon': widgetName === 'checkbox' || displayType === 'column'
     }) // checkbox不带冒号
     ,
-    title: title
+    title: t(title)
   }, required && /*#__PURE__*/React__default['default'].createElement("span", {
     className: "fr-label-required"
   }, " *"), /*#__PURE__*/React__default['default'].createElement("span", {
@@ -1144,7 +1146,7 @@ var RenderField = function RenderField(_ref) {
     })
   }, /*#__PURE__*/React__default['default'].createElement("span", {
     dangerouslySetInnerHTML: {
-      __html: title
+      __html: t(title)
     }
   })), description && /*#__PURE__*/React__default['default'].createElement("span", {
     className: "fr-desc ml2"
@@ -3735,7 +3737,6 @@ function GlobalSettings(_ref) {
         return onDataChange(v);
       }
     },
-    locale: 'en',
     widgets: _objectSpread2(_objectSpread2({}, globalWidgets), widgets),
     mapping: mapping
   }));
@@ -4005,7 +4006,6 @@ function ItemSettings(_ref) {
     schema: settingSchema,
     widgets: _objectSpread2(_objectSpread2({}, _widgets), widgets),
     mapping: globalMapping,
-    locale: 'en',
     watch: {
       '#': function _(v) {
         return setTimeout(function () {
@@ -4216,7 +4216,7 @@ var Sidebar = function Sidebar(props) {
     _useStore$userProps = _useStore.userProps,
     userProps = _useStore$userProps === void 0 ? {} : _useStore$userProps;
   var settings = userProps.settings;
-  var _settings = Array.isArray(settings) ? settings : defaultSettings;
+  var _settings = Array.isArray(settings) ? settings : USdefaultSettings;
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "left-layout w5-l w4"
   }, Array.isArray(_settings) ? _settings.map(function (item, idx) {

package/package.json

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

package/src/components/Canvas/core/RenderField.jsx

@@ -1,4 +1,5 @@
 import React, { Suspense } from 'react';
+import { useTranslation } from 'react-i18next';
 import {
   getParentProps,
   isCssLength,
@@ -26,6 +27,7 @@ const RenderField = ({
     frProps = {},
     fieldRender,
   } = useStore();
+    const { t } = useTranslation();
   const { labelWidth, displayType, showValidate } = frProps;
   const { title, description, required } = schema;
 
@@ -94,7 +96,7 @@ const RenderField = ({
             className={cn('fr-label-title', {
               'no-colon': widgetName === 'checkbox' || displayType === 'column',
             })} // checkbox不带冒号
-            title={title}
+            title={t(title)}
           >
             {required && <span className="fr-label-required"> *</span>}
             <span
@@ -103,7 +105,7 @@ const RenderField = ({
                 'flex-none': displayType === 'column',
               })}
             >
-              <span dangerouslySetInnerHTML={{ __html: title }} />
+              <span dangerouslySetInnerHTML={{ __html: t(title) }} />
             </span>
             {description && (
               <span className="fr-desc ml2">(&nbsp;{description}&nbsp;)</span>

package/src/components/Settings/GlobalSettings.jsx

@@ -42,7 +42,6 @@ export default function GlobalSettings({ widgets }) {
         watch={{
           '#': v => onDataChange(v),
         }}
-        locale={'en'}
         widgets={{ ...globalWidgets, ...widgets }}
         mapping={mapping}
       />

package/src/components/Settings/ItemSettings.jsx

@@ -145,7 +145,6 @@ export default function ItemSettings({ widgets }) {
         schema={settingSchema}
         widgets={{ ..._widgets, ...widgets }}
         mapping={globalMapping}
-        locale={'en'}
         watch={{
           '#': v => setTimeout(() => onDataChange(v), 0),
         }}

package/src/components/Sidebar/index.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { defaultSettings } from '../../settings';
+import { defaultSettings,USdefaultSettings } from '../../settings';
 import { useStore } from '../../utils/hooks';
 import Element from './Element';
 import './index.less';
@@ -9,7 +9,7 @@ const Sidebar = props => {
   const { t } = useTranslation();
   const { userProps = {} } = useStore();
   const { settings } = userProps;
-  const _settings = Array.isArray(settings) ? settings : defaultSettings;
+  const _settings = Array.isArray(settings) ? settings : USdefaultSettings;
 
   return (
     <div className="left-layout w5-l w4">