yy-forms 1.0.39 → 1.0.41

package/dist/index.esm.js

@@ -3578,6 +3578,24 @@ var defaultSettings = [{
 //   widgets: saves,
 // },
 ];
+var USdefaultSettings = [{
+  "title": "Basic Components",
+  "widgets": USelements,
+  "show": true,
+  "useCommon": true // TODO: Should include common components?
+}, {
+  "title": "Advanced Components",
+  "widgets": USadvancedElements
+}
+// {
+//   "title": "Layout Components",
+//   "widgets": layouts,
+// },
+// {
+//   "title": "Templates",
+//   "widgets": saves,
+// },
+];
 var defaultGlobalSettings = {
   type: 'object',
   properties: {
@@ -3690,6 +3708,7 @@ function GlobalSettings(_ref) {
         return onDataChange(v);
       }
     },
+    locale: 'en',
     widgets: _objectSpread2(_objectSpread2({}, globalWidgets), widgets),
     mapping: mapping
   }));
@@ -3916,7 +3935,7 @@ function ItemSettings(_ref) {
       var _settings = Array.isArray(settings) ? [].concat(_toConsumableArray(settings), [{
         widgets: [].concat(_toConsumableArray(elementsInfo), _toConsumableArray(advancedElementsInfo), _toConsumableArray(layoutsInfo))
       }]) // TODO: 不是最优解
-      : defaultSettings;
+      : i18n.language === 'cn' ? defaultSettings : USdefaultSettings;
       var _commonSettings = isObject(commonSettings) ? commonSettings : i18n.language === 'cn' ? defaultCommonSettings : USdefaultCommonSettings;
       var widgetList = getWidgetList(_settings, _commonSettings);
       var widgetName = getWidgetName(item.schema, globalMapping);
@@ -3959,6 +3978,7 @@ function ItemSettings(_ref) {
     schema: settingSchema,
     widgets: _objectSpread2(_objectSpread2({}, _widgets), widgets),
     mapping: globalMapping,
+    locale: 'en',
     watch: {
       '#': function _(v) {
         return setTimeout(function () {

package/dist/index.js

@@ -3605,6 +3605,24 @@ var defaultSettings = [{
 //   widgets: saves,
 // },
 ];
+var USdefaultSettings = [{
+  "title": "Basic Components",
+  "widgets": USelements,
+  "show": true,
+  "useCommon": true // TODO: Should include common components?
+}, {
+  "title": "Advanced Components",
+  "widgets": USadvancedElements
+}
+// {
+//   "title": "Layout Components",
+//   "widgets": layouts,
+// },
+// {
+//   "title": "Templates",
+//   "widgets": saves,
+// },
+];
 var defaultGlobalSettings = {
   type: 'object',
   properties: {
@@ -3717,6 +3735,7 @@ function GlobalSettings(_ref) {
         return onDataChange(v);
       }
     },
+    locale: 'en',
     widgets: _objectSpread2(_objectSpread2({}, globalWidgets), widgets),
     mapping: mapping
   }));
@@ -3943,7 +3962,7 @@ function ItemSettings(_ref) {
       var _settings = Array.isArray(settings) ? [].concat(_toConsumableArray(settings), [{
         widgets: [].concat(_toConsumableArray(elementsInfo), _toConsumableArray(advancedElementsInfo), _toConsumableArray(layoutsInfo))
       }]) // TODO: 不是最优解
-      : defaultSettings;
+      : i18n.language === 'cn' ? defaultSettings : USdefaultSettings;
       var _commonSettings = isObject(commonSettings) ? commonSettings : i18n.language === 'cn' ? defaultCommonSettings : USdefaultCommonSettings;
       var widgetList = getWidgetList(_settings, _commonSettings);
       var widgetName = getWidgetName(item.schema, globalMapping);
@@ -3986,6 +4005,7 @@ function ItemSettings(_ref) {
     schema: settingSchema,
     widgets: _objectSpread2(_objectSpread2({}, _widgets), widgets),
     mapping: globalMapping,
+    locale: 'en',
     watch: {
       '#': function _(v) {
         return setTimeout(function () {

package/package.json

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

package/src/components/Settings/GlobalSettings.jsx

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

package/src/components/Settings/ItemSettings.jsx

@@ -10,7 +10,8 @@ import {
   elements,
   USelements,
   layouts,
-  USlayouts
+  USlayouts,
+  USdefaultSettings
 } from '../../settings';
 
 import { isObject, mergeInOrder } from '../../utils';
@@ -100,10 +101,10 @@ export default function ItemSettings({ widgets }) {
             ...settings,
             { widgets: [...elementsInfo, ...advancedElementsInfo, ...layoutsInfo] },
           ] // TODO: 不是最优解
-        : defaultSettings;
+        : i18n.language === 'cn' ? defaultSettings : USdefaultSettings;
       const _commonSettings = isObject(commonSettings)
         ? commonSettings
-        : i18n.language === 'cn' ?defaultCommonSettings : USdefaultCommonSettings;
+        : i18n.language === 'cn' ? defaultCommonSettings : USdefaultCommonSettings;
       const widgetList = getWidgetList(_settings, _commonSettings);
       const widgetName = getWidgetName(item.schema, globalMapping);
       const element = widgetList.find(e => e.widget === widgetName) || {}; // 有可能会没有找到
@@ -144,6 +145,7 @@ export default function ItemSettings({ widgets }) {
         schema={settingSchema}
         widgets={{ ..._widgets, ...widgets }}
         mapping={globalMapping}
+        locale={'en'}
         watch={{
           '#': v => setTimeout(() => onDataChange(v), 0),
         }}

package/src/settings/index.js

@@ -1941,6 +1941,27 @@ export const defaultSettings = [
   // },
 ];
 
+export const USdefaultSettings = [
+  {
+    "title": "Basic Components",
+    "widgets": USelements,
+    "show": true,
+    "useCommon": true, // TODO: Should include common components?
+  },
+  {
+    "title": "Advanced Components",
+    "widgets": USadvancedElements,
+  },
+  // {
+  //   "title": "Layout Components",
+  //   "widgets": layouts,
+  // },
+  // {
+  //   "title": "Templates",
+  //   "widgets": saves,
+  // },
+]
+
 
 export const defaultGlobalSettings = {
   type: 'object',