yy-forms 1.0.38 → 1.0.40

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/index.esm.js +20 -2
  2. package/dist/index.js +20 -2
  3. package/package.json +1 -1
  4. package/src/components/Settings/ItemSettings.jsx +5 -4
  5. package/src/settings/index.js +21 -0
package/dist/index.esm.js CHANGED
@@ -3578,6 +3578,24 @@ var defaultSettings = [{
3578
3578
  // widgets: saves,
3579
3579
  // },
3580
3580
  ];
3581
+ var USdefaultSettings = [{
3582
+ "title": "Basic Components",
3583
+ "widgets": USelements,
3584
+ "show": true,
3585
+ "useCommon": true // TODO: Should include common components?
3586
+ }, {
3587
+ "title": "Advanced Components",
3588
+ "widgets": USadvancedElements
3589
+ }
3590
+ // {
3591
+ // "title": "Layout Components",
3592
+ // "widgets": layouts,
3593
+ // },
3594
+ // {
3595
+ // "title": "Templates",
3596
+ // "widgets": saves,
3597
+ // },
3598
+ ];
3581
3599
  var defaultGlobalSettings = {
3582
3600
  type: 'object',
3583
3601
  properties: {
@@ -3909,14 +3927,14 @@ function ItemSettings(_ref) {
3909
3927
  isReady.current = false;
3910
3928
  var item = flatten[selected];
3911
3929
  if (!item || selected === '#') return;
3912
- var elementsInfo = i18n.language === 'cn' ? USelements : elements;
3930
+ var elementsInfo = i18n.language === 'cn' ? elements : USelements;
3913
3931
  var advancedElementsInfo = i18n.language === 'cn' ? advancedElements : USadvancedElements;
3914
3932
  var layoutsInfo = i18n.language === 'cn' ? layouts : USlayouts;
3915
3933
  // 算 widgetList
3916
3934
  var _settings = Array.isArray(settings) ? [].concat(_toConsumableArray(settings), [{
3917
3935
  widgets: [].concat(_toConsumableArray(elementsInfo), _toConsumableArray(advancedElementsInfo), _toConsumableArray(layoutsInfo))
3918
3936
  }]) // TODO: 不是最优解
3919
- : defaultSettings;
3937
+ : i18n.language === 'cn' ? defaultSettings : USdefaultSettings;
3920
3938
  var _commonSettings = isObject(commonSettings) ? commonSettings : i18n.language === 'cn' ? defaultCommonSettings : USdefaultCommonSettings;
3921
3939
  var widgetList = getWidgetList(_settings, _commonSettings);
3922
3940
  var widgetName = getWidgetName(item.schema, globalMapping);
package/dist/index.js CHANGED
@@ -3605,6 +3605,24 @@ var defaultSettings = [{
3605
3605
  // widgets: saves,
3606
3606
  // },
3607
3607
  ];
3608
+ var USdefaultSettings = [{
3609
+ "title": "Basic Components",
3610
+ "widgets": USelements,
3611
+ "show": true,
3612
+ "useCommon": true // TODO: Should include common components?
3613
+ }, {
3614
+ "title": "Advanced Components",
3615
+ "widgets": USadvancedElements
3616
+ }
3617
+ // {
3618
+ // "title": "Layout Components",
3619
+ // "widgets": layouts,
3620
+ // },
3621
+ // {
3622
+ // "title": "Templates",
3623
+ // "widgets": saves,
3624
+ // },
3625
+ ];
3608
3626
  var defaultGlobalSettings = {
3609
3627
  type: 'object',
3610
3628
  properties: {
@@ -3936,14 +3954,14 @@ function ItemSettings(_ref) {
3936
3954
  isReady.current = false;
3937
3955
  var item = flatten[selected];
3938
3956
  if (!item || selected === '#') return;
3939
- var elementsInfo = i18n.language === 'cn' ? USelements : elements;
3957
+ var elementsInfo = i18n.language === 'cn' ? elements : USelements;
3940
3958
  var advancedElementsInfo = i18n.language === 'cn' ? advancedElements : USadvancedElements;
3941
3959
  var layoutsInfo = i18n.language === 'cn' ? layouts : USlayouts;
3942
3960
  // 算 widgetList
3943
3961
  var _settings = Array.isArray(settings) ? [].concat(_toConsumableArray(settings), [{
3944
3962
  widgets: [].concat(_toConsumableArray(elementsInfo), _toConsumableArray(advancedElementsInfo), _toConsumableArray(layoutsInfo))
3945
3963
  }]) // TODO: 不是最优解
3946
- : defaultSettings;
3964
+ : i18n.language === 'cn' ? defaultSettings : USdefaultSettings;
3947
3965
  var _commonSettings = isObject(commonSettings) ? commonSettings : i18n.language === 'cn' ? defaultCommonSettings : USdefaultCommonSettings;
3948
3966
  var widgetList = getWidgetList(_settings, _commonSettings);
3949
3967
  var widgetName = getWidgetName(item.schema, globalMapping);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "yy-forms",
3
- "version": "1.0.38",
3
+ "version": "1.0.40",
4
4
  "main": "dist/index.js",
5
5
  "module": "dist/index.esm.js",
6
6
  "typings": "dist/index.d.ts",
package/src/components/Settings/ItemSettings.jsx CHANGED
@@ -10,7 +10,8 @@ import {
10
10
  elements,
11
11
  USelements,
12
12
  layouts,
13
- USlayouts
13
+ USlayouts,
14
+ USdefaultSettings
14
15
  } from '../../settings';
15
16
 
16
17
  import { isObject, mergeInOrder } from '../../utils';
@@ -91,7 +92,7 @@ export default function ItemSettings({ widgets }) {
91
92
  isReady.current = false;
92
93
  const item = flatten[selected];
93
94
  if (!item || selected === '#') return;
94
- const elementsInfo= i18n.language === 'cn' ? USelements : elements
95
+ const elementsInfo= i18n.language === 'cn' ? elements : USelements
95
96
  const advancedElementsInfo= i18n.language === 'cn' ? advancedElements : USadvancedElements
96
97
  const layoutsInfo= i18n.language === 'cn' ? layouts : USlayouts
97
98
  // 算 widgetList
@@ -100,10 +101,10 @@ export default function ItemSettings({ widgets }) {
100
101
  ...settings,
101
102
  { widgets: [...elementsInfo, ...advancedElementsInfo, ...layoutsInfo] },
102
103
  ] // TODO: 不是最优解
103
- : defaultSettings;
104
+ : i18n.language === 'cn' ? defaultSettings : USdefaultSettings;
104
105
  const _commonSettings = isObject(commonSettings)
105
106
  ? commonSettings
106
- : i18n.language === 'cn' ?defaultCommonSettings : USdefaultCommonSettings;
107
+ : i18n.language === 'cn' ? defaultCommonSettings : USdefaultCommonSettings;
107
108
  const widgetList = getWidgetList(_settings, _commonSettings);
108
109
  const widgetName = getWidgetName(item.schema, globalMapping);
109
110
  const element = widgetList.find(e => e.widget === widgetName) || {}; // 有可能会没有找到
package/src/settings/index.js CHANGED
@@ -1941,6 +1941,27 @@ export const defaultSettings = [
1941
1941
  // },
1942
1942
  ];
1943
1943
 
1944
+ export const USdefaultSettings = [
1945
+ {
1946
+ "title": "Basic Components",
1947
+ "widgets": USelements,
1948
+ "show": true,
1949
+ "useCommon": true, // TODO: Should include common components?
1950
+ },
1951
+ {
1952
+ "title": "Advanced Components",
1953
+ "widgets": USadvancedElements,
1954
+ },
1955
+ // {
1956
+ // "title": "Layout Components",
1957
+ // "widgets": layouts,
1958
+ // },
1959
+ // {
1960
+ // "title": "Templates",
1961
+ // "widgets": saves,
1962
+ // },
1963
+ ]
1964
+
1944
1965
 
1945
1966
  export const defaultGlobalSettings = {
1946
1967
  type: 'object',