yy-forms 1.0.37 → 1.0.39

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "yy-forms",
3
- "version": "1.0.37",
3
+ "version": "1.0.39",
4
4
  "main": "dist/index.js",
5
5
  "module": "dist/index.esm.js",
6
6
  "typings": "dist/index.d.ts",
@@ -2,12 +2,15 @@ import FormRender, { useForm } from 'form-render';
2
2
  import React, { useEffect, useState, useRef } from 'react';
3
3
  import {
4
4
  advancedElements,
5
+ USadvancedElements,
5
6
  baseCommonSettings,
6
7
  defaultCommonSettings,
7
8
  USdefaultCommonSettings,
8
9
  defaultSettings,
9
10
  elements,
11
+ USelements,
10
12
  layouts,
13
+ USlayouts
11
14
  } from '../../settings';
12
15
 
13
16
  import { isObject, mergeInOrder } from '../../utils';
@@ -88,11 +91,14 @@ export default function ItemSettings({ widgets }) {
88
91
  isReady.current = false;
89
92
  const item = flatten[selected];
90
93
  if (!item || selected === '#') return;
94
+ const elementsInfo= i18n.language === 'cn' ? elements : USelements
95
+ const advancedElementsInfo= i18n.language === 'cn' ? advancedElements : USadvancedElements
96
+ const layoutsInfo= i18n.language === 'cn' ? layouts : USlayouts
91
97
  // 算 widgetList
92
98
  const _settings = Array.isArray(settings)
93
99
  ? [
94
100
  ...settings,
95
- { widgets: [...elements, ...advancedElements, ...layouts] },
101
+ { widgets: [...elementsInfo, ...advancedElementsInfo, ...layoutsInfo] },
96
102
  ] // TODO: 不是最优解
97
103
  : defaultSettings;
98
104
  const _commonSettings = isObject(commonSettings)