yy-forms 1.0.35 → 1.0.37

package/dist/index.esm.js

@@ -1936,6 +1936,90 @@ var defaultCommonSettings = {
     }
   }
 };
+var USdefaultCommonSettings = {
+  "$id": {
+    "title": "ID",
+    "description": "Field Name / English",
+    "type": "string",
+    "widget": "idInput",
+    "require": true,
+    "rules": [{
+      "pattern": "^#/.+$",
+      "message": "ID is required"
+    }]
+  },
+  "title": {
+    "title": "Title",
+    "type": "string",
+    "widget": "htmlInput"
+  },
+  "displayType": {
+    "title": "Title Display Mode",
+    "type": "string",
+    "enum": ["row", "column"],
+    "enumNames": ["Same Line", "Separate Line"],
+    "widget": "radio"
+  },
+  "description": {
+    "title": "Description",
+    "type": "string"
+  },
+  "default": {
+    "title": "Default Value",
+    "type": "string"
+  },
+  "required": {
+    "title": "Required",
+    "type": "boolean"
+  },
+  "placeholder": {
+    "title": "Placeholder",
+    "type": "string"
+  },
+  "bind": {
+    "title": "Bind",
+    "type": "string"
+  },
+  "min": {
+    "title": "Minimum Value",
+    "type": "number"
+  },
+  "max": {
+    "title": "Maximum Value",
+    "type": "number"
+  },
+  "disabled": {
+    "title": "Disabled",
+    "type": "boolean"
+  },
+  "readOnly": {
+    "title": "Read Only",
+    "type": "boolean"
+  },
+  "hidden": {
+    "title": "Hidden",
+    "type": "boolean"
+  },
+  "readOnlyWidget": {
+    "title": "Read Only Widget",
+    "type": "string"
+  },
+  "width": {
+    "title": "Element Width",
+    "type": "string",
+    "widget": "percentSlider"
+  },
+  "labelWidth": {
+    "title": "Label Width",
+    "description": "Default: 120",
+    "type": "number",
+    "widget": "slider",
+    "max": 400,
+    "props": {
+      "hideNumber": true
+    }
+  }
+};
 
 // widget 用于指定 schema 右侧配置对应的 setting
 var elements = [{
@@ -2839,7 +2923,7 @@ function GlobalSettings(_ref) {
     }
   }, /*#__PURE__*/React.createElement(FormRender, {
     form: form,
-    schema: i18n.language === 'zh-CN' ? defaultGlobalSettings : USdefaultGlobalSettings,
+    schema: i18n.language === 'cn' ? defaultGlobalSettings : USdefaultGlobalSettings,
     watch: {
       '#': function _(v) {
         return onDataChange(v);
@@ -3003,6 +3087,8 @@ var frgWidgets = /*#__PURE__*/Object.freeze({
 
 function ItemSettings(_ref) {
   var widgets = _ref.widgets;
+  var _useTranslation = useTranslation(),
+    i18n = _useTranslation.i18n;
   var setGlobal = useGlobal();
   var form = useForm();
   var isReady = useRef(false);
@@ -3067,7 +3153,7 @@ function ItemSettings(_ref) {
         widgets: [].concat(_toConsumableArray(elements), _toConsumableArray(advancedElements), _toConsumableArray(layouts))
       }]) // TODO: 不是最优解
       : defaultSettings;
-      var _commonSettings = isObject(commonSettings) ? commonSettings : defaultCommonSettings;
+      var _commonSettings = isObject(commonSettings) ? commonSettings : i18n.language === 'cn' ? defaultCommonSettings : USdefaultCommonSettings;
       var widgetList = getWidgetList(_settings, _commonSettings);
       var widgetName = getWidgetName(item.schema, globalMapping);
       var element = widgetList.find(function (e) {
@@ -3091,7 +3177,7 @@ function ItemSettings(_ref) {
       isReady.current = true;
       console.error(error);
     }
-  }, [selected]);
+  }, [selected, i18n.language]);
   useEffect(function () {
     validation && onItemErrorChange(form === null || form === void 0 ? void 0 : form.errorFields);
   }, [validation, form === null || form === void 0 ? void 0 : form.errorFields]);

package/dist/index.js

@@ -1963,6 +1963,90 @@ var defaultCommonSettings = {
     }
   }
 };
+var USdefaultCommonSettings = {
+  "$id": {
+    "title": "ID",
+    "description": "Field Name / English",
+    "type": "string",
+    "widget": "idInput",
+    "require": true,
+    "rules": [{
+      "pattern": "^#/.+$",
+      "message": "ID is required"
+    }]
+  },
+  "title": {
+    "title": "Title",
+    "type": "string",
+    "widget": "htmlInput"
+  },
+  "displayType": {
+    "title": "Title Display Mode",
+    "type": "string",
+    "enum": ["row", "column"],
+    "enumNames": ["Same Line", "Separate Line"],
+    "widget": "radio"
+  },
+  "description": {
+    "title": "Description",
+    "type": "string"
+  },
+  "default": {
+    "title": "Default Value",
+    "type": "string"
+  },
+  "required": {
+    "title": "Required",
+    "type": "boolean"
+  },
+  "placeholder": {
+    "title": "Placeholder",
+    "type": "string"
+  },
+  "bind": {
+    "title": "Bind",
+    "type": "string"
+  },
+  "min": {
+    "title": "Minimum Value",
+    "type": "number"
+  },
+  "max": {
+    "title": "Maximum Value",
+    "type": "number"
+  },
+  "disabled": {
+    "title": "Disabled",
+    "type": "boolean"
+  },
+  "readOnly": {
+    "title": "Read Only",
+    "type": "boolean"
+  },
+  "hidden": {
+    "title": "Hidden",
+    "type": "boolean"
+  },
+  "readOnlyWidget": {
+    "title": "Read Only Widget",
+    "type": "string"
+  },
+  "width": {
+    "title": "Element Width",
+    "type": "string",
+    "widget": "percentSlider"
+  },
+  "labelWidth": {
+    "title": "Label Width",
+    "description": "Default: 120",
+    "type": "number",
+    "widget": "slider",
+    "max": 400,
+    "props": {
+      "hideNumber": true
+    }
+  }
+};
 
 // widget 用于指定 schema 右侧配置对应的 setting
 var elements = [{
@@ -2866,7 +2950,7 @@ function GlobalSettings(_ref) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(FormRender__default['default'], {
     form: form,
-    schema: i18n.language === 'zh-CN' ? defaultGlobalSettings : USdefaultGlobalSettings,
+    schema: i18n.language === 'cn' ? defaultGlobalSettings : USdefaultGlobalSettings,
     watch: {
       '#': function _(v) {
         return onDataChange(v);
@@ -3030,6 +3114,8 @@ var frgWidgets = /*#__PURE__*/Object.freeze({
 
 function ItemSettings(_ref) {
   var widgets = _ref.widgets;
+  var _useTranslation = reactI18next.useTranslation(),
+    i18n = _useTranslation.i18n;
   var setGlobal = useGlobal();
   var form = FormRender.useForm();
   var isReady = React.useRef(false);
@@ -3094,7 +3180,7 @@ function ItemSettings(_ref) {
         widgets: [].concat(_toConsumableArray(elements), _toConsumableArray(advancedElements), _toConsumableArray(layouts))
       }]) // TODO: 不是最优解
       : defaultSettings;
-      var _commonSettings = isObject(commonSettings) ? commonSettings : defaultCommonSettings;
+      var _commonSettings = isObject(commonSettings) ? commonSettings : i18n.language === 'cn' ? defaultCommonSettings : USdefaultCommonSettings;
       var widgetList = getWidgetList(_settings, _commonSettings);
       var widgetName = getWidgetName(item.schema, globalMapping);
       var element = widgetList.find(function (e) {
@@ -3118,7 +3204,7 @@ function ItemSettings(_ref) {
       isReady.current = true;
       console.error(error);
     }
-  }, [selected]);
+  }, [selected, i18n.language]);
   React.useEffect(function () {
     validation && onItemErrorChange(form === null || form === void 0 ? void 0 : form.errorFields);
   }, [validation, form === null || form === void 0 ? void 0 : form.errorFields]);

package/package.json

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

package/src/components/Settings/GlobalSettings.jsx

@@ -38,7 +38,7 @@ export default function GlobalSettings({ widgets }) {
     <div style={{ paddingRight: 24 }}>
       <FormRender
         form={form}
-        schema={i18n.language === 'zh-CN' ? defaultGlobalSettings : USdefaultGlobalSettings}
+        schema={i18n.language === 'cn' ? defaultGlobalSettings : USdefaultGlobalSettings}
         watch={{
           '#': v => onDataChange(v),
         }}

package/src/components/Settings/ItemSettings.jsx

@@ -4,16 +4,20 @@ import {
   advancedElements,
   baseCommonSettings,
   defaultCommonSettings,
+  USdefaultCommonSettings,
   defaultSettings,
   elements,
   layouts,
 } from '../../settings';
+
 import { isObject, mergeInOrder } from '../../utils';
 import { useGlobal, useStore } from '../../utils/hooks';
 import { getWidgetName } from '../../utils/mapping';
 import * as frgWidgets from '../../widgets';
+import { useTranslation } from 'react-i18next';
 
 export default function ItemSettings({ widgets }) {
+  const { i18n } = useTranslation();
   const setGlobal = useGlobal();
   const form = useForm();
   const isReady = useRef(false);
@@ -93,7 +97,7 @@ export default function ItemSettings({ widgets }) {
         : defaultSettings;
       const _commonSettings = isObject(commonSettings)
         ? commonSettings
-        : defaultCommonSettings;
+        : i18n.language === 'cn' ?defaultCommonSettings : USdefaultCommonSettings;
       const widgetList = getWidgetList(_settings, _commonSettings);
       const widgetName = getWidgetName(item.schema, globalMapping);
       const element = widgetList.find(e => e.widget === widgetName) || {}; // 有可能会没有找到
@@ -117,7 +121,7 @@ export default function ItemSettings({ widgets }) {
       isReady.current = true;
       console.error(error);
     }
-  }, [selected]);
+  }, [selected,i18n.language]);
 
   useEffect(() => {
     validation && onItemErrorChange(form?.errorFields);

package/src/settings/index.js

@@ -104,6 +104,93 @@ export const defaultCommonSettings = {
   },
 };
 
+export const USdefaultCommonSettings = {
+  "$id": {
+    "title": "ID",
+    "description": "Field Name / English",
+    "type": "string",
+    "widget": "idInput",
+    "require": true,
+    "rules": [
+      {
+        "pattern": "^#/.+$",
+        "message": "ID is required"
+      }
+    ]
+  },
+  "title": {
+    "title": "Title",
+    "type": "string",
+    "widget": "htmlInput"
+  },
+  "displayType": {
+    "title": "Title Display Mode",
+    "type": "string",
+    "enum": ["row", "column"],
+    "enumNames": ["Same Line", "Separate Line"],
+    "widget": "radio"
+  },
+  "description": {
+    "title": "Description",
+    "type": "string"
+  },
+  "default": {
+    "title": "Default Value",
+    "type": "string"
+  },
+  "required": {
+    "title": "Required",
+    "type": "boolean"
+  },
+  "placeholder": {
+    "title": "Placeholder",
+    "type": "string"
+  },
+  "bind": {
+    "title": "Bind",
+    "type": "string"
+  },
+  "min": {
+    "title": "Minimum Value",
+    "type": "number"
+  },
+  "max": {
+    "title": "Maximum Value",
+    "type": "number"
+  },
+  "disabled": {
+    "title": "Disabled",
+    "type": "boolean"
+  },
+  "readOnly": {
+    "title": "Read Only",
+    "type": "boolean"
+  },
+  "hidden": {
+    "title": "Hidden",
+    "type": "boolean"
+  },
+  "readOnlyWidget": {
+    "title": "Read Only Widget",
+    "type": "string"
+  },
+  "width": {
+    "title": "Element Width",
+    "type": "string",
+    "widget": "percentSlider"
+  },
+  "labelWidth": {
+    "title": "Label Width",
+    "description": "Default: 120",
+    "type": "number",
+    "widget": "slider",
+    "max": 400,
+    "props": {
+      "hideNumber": true
+    }
+  }
+}
+
 // widget 用于指定 schema 右侧配置对应的 setting
 export const elements = [
   {
@@ -1022,6 +1109,7 @@ export const defaultSettings = [
   // },
 ];
 
+
 export const defaultGlobalSettings = {
   type: 'object',
   properties: {