amis 1.9.1-beta.1 → 1.9.1-beta.3

package/src/components/schema-editor/Common.tsx

@@ -5,10 +5,13 @@ import type {JSONSchema} from '../../utils/DataScope';
 import {autobind} from '../../utils/helper';
 import Button from '../Button';
 import Checkbox from '../Checkbox';
+import Form from '../Form';
+import FormField, {Controller} from '../FormField';
 import {Icon} from '../icons';
 import InputBox from '../InputBox';
 import PickerContainer from '../PickerContainer';
 import Select from '../Select';
+import Textarea from '../Textarea';
 
 export interface SchemaEditorItemCommonProps extends LocaleProps, ThemeProps {
   value?: JSONSchema;
@@ -38,6 +41,7 @@ export interface SchemaEditorItemCommonProps extends LocaleProps, ThemeProps {
   ) => JSX.Element;
   prefix?: JSX.Element;
   affix?: JSX.Element;
+  enableAdvancedSetting?: boolean;
 }
 
 export class SchemaEditorItemCommon<
@@ -65,6 +69,11 @@ export class SchemaEditorItemCommon<
     });
   }
 
+  @autobind
+  handleBeforeSubmit(form: any) {
+    return form.submit();
+  }
+
   renderCommon() {
     const {
       value,
@@ -76,6 +85,7 @@ export class SchemaEditorItemCommon<
       onRequiredChange,
       renderExtraProps,
       renderModalProps,
+      enableAdvancedSetting,
       prefix,
       affix,
       types
@@ -107,16 +117,63 @@ export class SchemaEditorItemCommon<
 
         {renderExtraProps?.(value!, this.handlePropsChange)}
 
-        {renderModalProps ? (
+        {enableAdvancedSetting ? (
           <PickerContainer
             value={value}
-            bodyRender={renderModalProps as any}
+            bodyRender={({isOpened, value, onChange, ref}) => {
+              return isOpened ? (
+                <Form defaultValues={value} onSubmit={onChange} ref={ref}>
+                  {({control, getValues, setValue}) => (
+                    <>
+                      <Controller
+                        label={__('JSONSchema.title')}
+                        name="title"
+                        control={control}
+                        rules={{maxLength: 20}}
+                        isRequired
+                        render={({field}) => (
+                          <InputBox {...field} disabled={disabled} />
+                        )}
+                      />
+
+                      <Controller
+                        label={__('JSONSchema.description')}
+                        name="description"
+                        control={control}
+                        render={({field}) => (
+                          <Textarea {...field} disabled={disabled} />
+                        )}
+                      />
+
+                      <Controller
+                        label={__('JSONSchema.default')}
+                        name="default"
+                        control={control}
+                        render={({field}) => (
+                          <InputBox {...field} disabled={disabled} />
+                        )}
+                      />
+
+                      {renderModalProps?.(getValues(), (values: any) => {
+                        Object.keys(values).forEach(key =>
+                          setValue(key, values[key])
+                        );
+                      })}
+                    </>
+                  )}
+                </Form>
+              ) : null;
+            }}
+            beforeConfirm={this.handleBeforeSubmit}
             onConfirm={this.handlePropsChange}
-            size="md"
             title={__('SubForm.editDetail')}
           >
             {({onClick}) => (
-              <Button className={cx('SchemaEditor-btn')} onClick={onClick}>
+              <Button
+                disabled={disabled || !!value?.$ref}
+                className={cx('SchemaEditor-btn')}
+                onClick={onClick}
+              >
                 <Icon icon="setting" className="icon" />
               </Button>
             )}

package/src/components/schema-editor/Object.tsx

@@ -195,7 +195,8 @@ export class SchemaEditorItemObject extends SchemaEditorItemCommon<
       disabled,
       showInfo,
       types,
-      onTypeChange
+      onTypeChange,
+      enableAdvancedSetting
     } = this.props;
     const members = this.state.members;
 
@@ -211,6 +212,7 @@ export class SchemaEditorItemObject extends SchemaEditorItemCommon<
               key={member.id}
               types={types}
               onTypeChange={onTypeChange}
+              enableAdvancedSetting={enableAdvancedSetting}
               prefix={
                 <>
                   <InputBox

package/src/components/schema-editor/index.tsx

@@ -35,7 +35,7 @@ export interface SchemaEditorProps extends LocaleProps, ThemeProps {
       type:
         | 'string'
         | 'number'
-        | 'interger'
+        | 'integer'
         | 'object'
         | 'array'
         | 'boolean'
@@ -54,6 +54,11 @@ export interface SchemaEditorProps extends LocaleProps, ThemeProps {
    * 顶层类型信息是否隐藏
    */
   showRootInfo: boolean;
+
+  /**
+   * 是否开启高级配置
+   */
+  enableAdvancedSetting?: boolean;
 }
 
 export class SchemaEditor extends React.Component<SchemaEditorProps> {
@@ -85,8 +90,8 @@ export class SchemaEditor extends React.Component<SchemaEditorProps> {
       },
 
       {
-        label: __('SchemaType.interger'),
-        value: 'interger'
+        label: __('SchemaType.integer'),
+        value: 'integer'
       },
 
       {
@@ -145,7 +150,8 @@ export class SchemaEditor extends React.Component<SchemaEditorProps> {
       rootTypeMutable,
       showRootInfo,
       disabled,
-      definitions
+      definitions,
+      enableAdvancedSetting
     } = this.props;
     const value: JSONSchema = this.props.value || {
       type: defaultType || 'object'
@@ -167,7 +173,7 @@ export class SchemaEditor extends React.Component<SchemaEditorProps> {
           [
             'string',
             'number',
-            'interger',
+            'integer',
             'object',
             'array',
             'boolean',
@@ -202,6 +208,7 @@ export class SchemaEditor extends React.Component<SchemaEditorProps> {
           classPrefix={classPrefix}
           disabled={disabled}
           onTypeChange={this.handleTypeChange}
+          enableAdvancedSetting={enableAdvancedSetting}
         />
       </div>
     );

package/src/hooks/use-validation-resolver.ts

@@ -0,0 +1,45 @@
+/**
+ * @file 用 amis 内置的验证来验证 react-hook-form 里面的表单数据
+ */
+import pick from 'lodash/pick';
+import React from 'react';
+import {validateObject, validations} from '../utils/validations';
+
+function formatErrors(errors: any) {
+  const formated: any = {};
+  Object.keys(errors).forEach(key => {
+    const origin = errors[key][0];
+    if (origin) {
+      formated[key] = {
+        type: origin.rule,
+        message: origin.msg
+      };
+    }
+  });
+  return formated;
+}
+
+export function useValidationResolver(__ = (str: string) => str) {
+  return React.useCallback<any>(
+    async (values: any, context: any, config: any) => {
+      const rules: any = {};
+      const ruleKeys = Object.keys(validations);
+      for (let key of Object.keys(config.fields)) {
+        const field = config.fields[key];
+        rules[key] = pick(field, ruleKeys);
+
+        if (field.required) {
+          rules[key].isRequired = true;
+        }
+      }
+
+      const errors = validateObject(values, rules, undefined, __);
+
+      return {
+        values,
+        errors: formatErrors(errors)
+      };
+    },
+    [__]
+  );
+}

package/src/icons/department.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>部门</title>
+    <g id="PC-流程属性、找人找部门+公式化编辑器+字段权限" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(-3271.000000, -1246.000000)" id="部门">
+            <g transform="translate(3271.000000, 1246.000000)">
+                <rect id="矩形" fill-opacity="0.01" fill="#FFFFFF" fill-rule="nonzero" x="0" y="0" width="16" height="16"></rect>
+                <circle id="椭圆形" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" cx="4.66666667" cy="9.66666667" r="1.66666667"></circle>
+                <circle id="椭圆形" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" cx="11.3333333" cy="9.66666667" r="1.66666667"></circle>
+                <circle id="椭圆形" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" cx="8" cy="3" r="1.66666667"></circle>
+                <path d="M8,14.6666667 C8,12.8257333 6.5076,11.3333333 4.66666667,11.3333333 C2.82571667,11.3333333 1.33333333,12.8257333 1.33333333,14.6666667" id="路径" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></path>
+                <path d="M14.6666667,14.6666667 C14.6666667,12.8257333 13.1742667,11.3333333 11.3333333,11.3333333 C9.4924,11.3333333 8,12.8257333 8,14.6666667" id="路径" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></path>
+                <path d="M11.3333333,8 C11.3333333,6.15906667 9.84093333,4.66666667 8,4.66666667 C6.15906667,4.66666667 4.66666667,6.15906667 4.66666667,8" id="路径" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></path>
+            </g>
+        </g>
+    </g>
+</svg>

package/src/icons/menu.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1649759681558" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1191" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M549.624242 214.626263H113.648485c-18.10101 0-32.840404-14.739394-32.840404-32.840404 0-18.10101 14.739394-32.840404 32.840404-32.840404h436.10505c18.10101 0 32.840404 14.739394 32.840404 32.840404-0.129293 18.10101-14.868687 32.840404-32.969697 32.840404z m0 0M549.624242 545.616162H113.648485c-18.10101 0-32.840404-14.739394-32.840404-32.840404 0-18.10101 14.739394-32.840404 32.840404-32.840404h436.10505c18.10101 0 32.840404 14.739394 32.840404 32.840404-0.129293 18.10101-14.868687 32.840404-32.969697 32.840404z m0 0M549.624242 876.088889H113.648485c-18.10101 0-32.840404-14.739394-32.840404-32.840404s14.739394-32.840404 32.840404-32.840404h436.10505c18.10101 0 32.840404 14.739394 32.840404 32.840404s-14.868687 32.840404-32.969697 32.840404z m0 0M932.589899 659.006061c-12.8-12.8-33.616162-12.8-46.416162 0l-104.727272 104.727272V182.044444c0-18.10101-14.739394-32.840404-32.840404-32.840404-18.10101 0-32.840404 14.739394-32.840404 32.840404v661.462627c0 18.10101 14.739394 32.840404 32.840404 32.840404 8.016162 0 15.385859-2.844444 21.074747-7.628283 0.905051-0.775758 162.779798-163.167677 162.779798-163.167677 12.929293-12.8 12.929293-33.745455 0.129293-46.545454z m0 0" fill="" p-id="1192"></path></svg>

package/src/icons/post.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>岗位</title>
+    <g id="选人选部门" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="补充icon及颜色" transform="translate(-95.000000, -12.000000)">
+            <g id="岗位" transform="translate(95.000000, 12.000000)">
+                <rect id="矩形" fill-opacity="0.01" fill="#FFFFFF" fill-rule="nonzero" x="0" y="0" width="16" height="16"></rect>
+                <path d="M6.33333333,6.66666667 C7.622,6.66666667 8.66666667,5.622 8.66666667,4.33333333 C8.66666667,3.04467 7.622,2 6.33333333,2 C5.04466667,2 4,3.04467 4,4.33333333 C4,5.622 5.04466667,6.66666667 6.33333333,6.66666667 Z" id="路径" stroke="#FFFFFF" fill="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></path>
+                <path d="M10.8692333,2.33333333 C11.5468333,2.74163333 12.0000333,3.48456667 12.0000333,4.33333333 C12.0000333,5.1821 11.5468333,5.92503333 10.8692333,6.33333333" id="路径" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></path>
+                <path d="M1.33333333,13.6 L1.33333333,14 L11.3333333,14 L11.3333333,13.6 C11.3333333,12.1065333 11.3333333,11.3598 11.0427,10.7893667 C10.7870333,10.2876 10.3790667,9.87963333 9.8773,9.62396667 C9.30686667,9.33333333 8.56013333,9.33333333 7.06666667,9.33333333 L5.6,9.33333333 C4.10653333,9.33333333 3.3598,9.33333333 2.78936,9.62396667 C2.28759333,9.87963333 1.87964333,10.2876 1.62398333,10.7893667 C1.33333333,11.3598 1.33333333,12.1065333 1.33333333,13.6 Z" id="路径" stroke="#FFFFFF" fill="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></path>
+                <path d="M14.6666333,14 L14.6666333,13.6 C14.6666333,12.1065333 14.6666333,11.3598 14.376,10.7893667 C14.1203333,10.2876 13.7123667,9.87963333 13.2106,9.62396667" id="路径" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></path>
+            </g>
+        </g>
+    </g>
+</svg>

package/src/icons/role.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>角色</title>
+    <g id="PC-流程属性、找人找部门+公式化编辑器+字段权限" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(-3426.000000, -1246.000000)" id="角色">
+            <g transform="translate(3426.000000, 1246.000000)">
+                <rect id="矩形" fill-opacity="0.01" fill="#FFFFFF" fill-rule="nonzero" x="0" y="0" width="16" height="16"></rect>
+                <circle id="椭圆形" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" cx="8" cy="4" r="2.66666667"></circle>
+                <path d="M14,14.6666667 C14,11.3529667 11.3137,8.66666667 8,8.66666667 C4.6863,8.66666667 2,11.3529667 2,14.6666667" id="路径" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></path>
+                <polygon id="路径" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" points="8 14.6666667 9.33333333 13 8 8.66666667 6.66666667 13"></polygon>
+            </g>
+        </g>
+    </g>
+</svg>

package/src/icons/user-remove.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>应用中心</title>
+    <g id="控件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="排序删除部门" transform="translate(-16.000000, -16.000000)">
+            <g id="编组-39" transform="translate(16.000000, 16.000000)">
+                <circle id="椭圆形" fill="#F6654D" cx="8" cy="8" r="8"></circle>
+                <rect id="矩形" fill="#FFFFFF" x="4" y="7" width="8" height="2" rx="0.5"></rect>
+            </g>
+        </g>
+    </g>
+</svg>

package/src/index.tsx

@@ -87,6 +87,7 @@ import './renderers/Form/ChartRadios';
 import './renderers/Form/InputRating';
 import './renderers/Form/Switch';
 import './renderers/Form/Radios';
+import './renderers/Form/JSONSchema';
 import './renderers/Form/JSONSchemaEditor';
 import './renderers/Form/ListSelect';
 import './renderers/Form/LocationPicker';
@@ -128,6 +129,7 @@ import './renderers/Form/TabsTransfer';
 import './renderers/Form/TabsTransferPicker';
 import './renderers/Form/Group';
 import './renderers/Form/InputGroup';
+import './renderers/Form/UserSelect';
 import './renderers/Grid';
 import './renderers/Grid2D';
 import './renderers/HBox';

package/src/locale/de-DE.ts

@@ -153,6 +153,10 @@ register('de-DE', {
   'Image.width': 'Weite: {{width}} Pixel',
   'Image.zoomIn': 'Vergrößern',
   'Log.mustHaveSource': 'Quelle muss in der Konfiguration vorhanden sein',
+  'Log.showLineNumber': 'Zeilennummer anzeigen',
+  'Log.notShowLineNumber': 'Zeilennummer ausblenden',
+  'Log.expand': 'Erweitern',
+  'Log.collapse': 'Zusammenbruch',
   'link': 'Link',
   'loading': 'Wird geladen...',
   'LocationPicker.placeholder': 'Wählen Sie einen Ort',
@@ -307,15 +311,21 @@ register('de-DE', {
   'pullRefresh.loadingText': 'Laden...',
   'pullRefresh.successText': 'Laden erfolgreich',
   'Picker.placeholder': 'Klicken Sie rechts auf das Symbol',
+  'UserSelect.edit': 'bearbeiten',
+  'UserSelect.save': 'Konservierung',
+  'UserSelect.resultSort': 'Ergebnissortierung auswählen',
+  'UserSelect.selected': 'Ausgewählt',
+  'UserSelect.clear': 'leer',
   'SchemaType.string': 'String',
   'SchemaType.number': 'Number',
-  'SchemaType.interger': 'Interger',
+  'SchemaType.integer': 'integer',
   'SchemaType.object': 'Object',
   'SchemaType.array': 'Array',
   'SchemaType.boolean': 'Boolean',
   'SchemaType.null': 'Null',
   'SchemaType.any': 'Any',
   'JSONSchema.title': 'Title',
+  'JSONSchema.default': 'Default',
   'JSONSchema.description': 'Description',
   'JSONSchema.key': 'Key',
   'JSONSchema.array_items': 'Items'

package/src/locale/en-US.ts

@@ -155,6 +155,10 @@ register('en-US', {
   'Image.width': 'width: {{width}}px',
   'Image.zoomIn': 'Zoom In',
   'Log.mustHaveSource': 'Must have source in config',
+  'Log.showLineNumber': 'Display line number',
+  'Log.notShowLineNumber': 'Hide line number',
+  'Log.expand': 'Expand Operation',
+  'Log.collapse': 'Collapse Operation',
   'link': 'Link',
   'loading': 'Loading',
   'LocationPicker.placeholder': 'Pick location',
@@ -188,6 +192,7 @@ register('en-US', {
   'Select.placeholder': 'Select',
   'Select.searchPromptText': 'Input to search',
   'sort': 'Sort',
+  'stop': 'Stop',
   'SubForm.button': 'Config',
   'SubForm.editDetail': 'Edit Detail',
   'System.error': 'System error',
@@ -309,15 +314,21 @@ register('en-US', {
   'pullRefresh.loadingText': 'Loading...',
   'pullRefresh.successText': 'Loading success',
   'Picker.placeholder': 'Click icon on the right',
+  'UserSelect.edit': 'edit',
+  'UserSelect.save': 'preservation',
+  'UserSelect.resultSort': 'Select result sort',
+  'UserSelect.selected': 'Selected',
+  'UserSelect.clear': 'empty',
   'SchemaType.string': 'String',
   'SchemaType.number': 'Number',
-  'SchemaType.interger': 'Interger',
+  'SchemaType.integer': 'integer',
   'SchemaType.object': 'Object',
   'SchemaType.array': 'Array',
   'SchemaType.boolean': 'Boolean',
   'SchemaType.any': 'Any',
   'SchemaType.null': 'Null',
   'JSONSchema.title': 'Title',
+  'JSONSchema.default': 'Default',
   'JSONSchema.description': 'Description',
   'JSONSchema.key': 'Key',
   'JSONSchema.array_items': 'Items'

package/src/locale/zh-CN.ts

@@ -162,6 +162,10 @@ register('zh-CN', {
   'Image.limitMax': '上传图片大于{{info}},请检查图片尺寸',
   'Image.limitMin': '上传图片小于{{info}},请检查图片尺寸',
   'Log.mustHaveSource': '需要配置 Source',
+  'Log.showLineNumber': '显示行数',
+  'Log.notShowLineNumber': '不现实行数',
+  'Log.expand': '展开工具栏',
+  'Log.collapse': '收起工具栏',
   'link': '链接',
   'loading': '加载中',
   'LocationPicker.placeholder': '请选择位置',
@@ -187,6 +191,7 @@ register('zh-CN', {
   'saveSuccess': '保存成功',
   'search': '搜索',
   'searchResult': '搜索结果',
+  'stop': '停止',
   'Checkboxes.selectAll': '全选/不选',
   'Select.checkAll': '全选',
   'Select.clear': '移除',
@@ -304,8 +309,8 @@ register('zh-CN', {
   'Condition.formula_placeholder': '请输入公式',
   'Condition.fun_error': '方法未定义',
   'InputTable.uniqueError': '列`{{label}}`没有通过唯一验证',
-  'Timeline.collapseText': '展开',
-  'Timeline.expandText': '折叠',
+  'collapse': '展开',
+  'expand': '折叠',
   'FormulaEditor.btnLabel': '公式编辑',
   'FormulaEditor.title': '公式编辑器',
   'FormulaEditor.variable': '变量',
@@ -316,15 +321,21 @@ register('zh-CN', {
   'pullRefresh.loadingText': '加载中...',
   'pullRefresh.successText': '加载成功',
   'Picker.placeholder': '请点击右侧的图标',
+  'UserSelect.edit': '编辑',
+  'UserSelect.save': '保存',
+  'UserSelect.resultSort': '选择结果排序',
+  'UserSelect.selected': '已选',
+  'UserSelect.clear': '清空',
   'SchemaType.string': '文本',
   'SchemaType.number': '数字',
-  'SchemaType.interger': '整数',
+  'SchemaType.integer': '整数',
   'SchemaType.object': '对象',
   'SchemaType.array': '数组',
   'SchemaType.boolean': '布尔',
   'SchemaType.null': 'Null',
   'SchemaType.any': '任意',
   'JSONSchema.title': '名称',
+  'JSONSchema.default': '默认值',
   'JSONSchema.key': '字段名',
   'JSONSchema.description': '描述',
   'JSONSchema.add_prop': '添加属性',

package/src/renderers/Action.tsx

@@ -398,7 +398,8 @@ const ActionProps = [
   'copy',
   'copyFormat',
   'payload',
-  'requireSelected'
+  'requireSelected',
+  'countDown'
 ];
 import {filterContents} from './Remark';
 import {ClassNamesFn, themeable, ThemeProps} from '../theme';
@@ -659,8 +660,7 @@ export class Action extends React.Component<ActionProps, ActionState> {
       (action as AjaxActionSchema).api = api;
     }
 
-    onAction(e, action);
-
+    await onAction(e, action);
     if (countDown) {
       const countDownEnd = Date.now() + countDown * 1000;
       this.setState({
@@ -668,9 +668,7 @@ export class Action extends React.Component<ActionProps, ActionState> {
         inCountDown: true,
         timeLeft: countDown
       });
-
       localStorage.setItem(this.localStorageKey, String(countDownEnd));
-
       setTimeout(() => {
         this.handleCountDown();
       }, 1000);
@@ -874,11 +872,14 @@ export class ActionRenderer extends React.Component<
     }
 
     if (!ignoreConfirm && action.confirmText && env.confirm) {
-      env
-        .confirm(filter(action.confirmText, data))
-        .then((confirmed: boolean) => confirmed && onAction(e, action, data));
+      let confirmed = await env.confirm(filter(action.confirmText, data));
+      if (confirmed) {
+        await onAction(e, action, data);
+      } else if (action.countDown) {
+        throw new Error('cancel');
+      }
     } else {
-      onAction(e, action, data);
+      await onAction(e, action, data);
     }
   }
 

package/src/renderers/CRUD.tsx

@@ -665,7 +665,11 @@ export default class CRUD extends React.Component<CRUDProps, any> {
             : this.search(undefined, undefined, true, true);
           action.close && this.closeTarget(action.close);
         })
-        .catch(() => {});
+        .catch((e) => {
+          if (throwErrors || action.countDown) {
+            throw e;
+          }
+        });
     } else if (
       pickerMode &&
       (action.actionType === 'confirm' || action.actionType === 'submit')

package/src/renderers/Dialog.tsx

@@ -538,7 +538,8 @@ export default class Dialog extends React.Component<DialogProps> {
               </a>
             ) : null}
             {render('title', title, {
-              data: store.formData
+              data: store.formData,
+              onAction: this.handleAction
             })}
           </div>
         ) : showCloseButton !== false && !store.loading ? (
@@ -553,7 +554,8 @@ export default class Dialog extends React.Component<DialogProps> {
 
         {header
           ? render('header', header, {
-              data: store.formData
+              data: store.formData,
+              onAction: this.handleAction
             })
           : null}
 
@@ -827,7 +829,11 @@ export class DialogRenderer extends Dialog {
             this.closeTarget(action.close);
           }
         })
-        .catch(() => {});
+        .catch(e => {
+          if (throwErrors || action.countDown) {
+            throw e;
+          }
+        });
     } else if (onAction) {
       let ret = onAction(
         e,

package/src/renderers/Drawer.tsx

@@ -821,7 +821,11 @@ export class DrawerRenderer extends Drawer {
             this.closeTarget(action.close);
           }
         })
-        .catch(() => {});
+        .catch((e) => {
+          if (throwErrors || action.countDown) {
+            throw e;
+          }
+        });
     } else if (onAction) {
       let ret = onAction(
         e,

package/src/renderers/Form/InputDate.tsx

@@ -8,7 +8,9 @@ import {
 } from '../../utils/tpl-builtin';
 import moment from 'moment';
 import 'moment/locale/zh-cn';
-import DatePicker, {DatePicker as BaseDatePicker} from '../../components/DatePicker';
+import DatePicker, {
+  DatePicker as BaseDatePicker
+} from '../../components/DatePicker';
 import {SchemaObject} from '../../Schema';
 import {createObject, anyChanged, isMobile, autobind} from '../../utils/helper';
 import {Action} from '../../types';
@@ -134,7 +136,7 @@ export interface DateTimeControlSchema extends InputDateBaseControlSchema {
   maxDate?: string;
 
   /**
-   * 不记得了
+   * 时间输入范围限制
    */
   timeConstraints?: any;
 }
@@ -169,7 +171,7 @@ export interface TimeControlSchema extends InputDateBaseControlSchema {
   timeFormat?: string;
 
   /**
-   * 不记得了
+   * 时间输入范围限制
    */
   timeConstraints?: any;
 }
@@ -445,7 +447,10 @@ export default class DateControl extends React.PureComponent<
   @autobind
   async handleChange(nextValue: any) {
     const {dispatchEvent, data} = this.props;
-    const dispatcher = dispatchEvent('change', createObject(data, {value: nextValue}));
+    const dispatcher = dispatchEvent(
+      'change',
+      createObject(data, {value: nextValue})
+    );
     if (dispatcher?.prevented) {
       return;
     }

package/src/renderers/Form/JSONSchema.tsx

@@ -0,0 +1,56 @@
+import React from 'react';
+import {FormItem, FormControlProps, FormBaseControl} from './Item';
+import {autobind, isObjectShallowModified} from '../../utils/helper';
+import InputJSONSchema from '../../components/json-schema/index';
+import {
+  isPureVariable,
+  resolveVariableAndFilter
+} from '../../utils/tpl-builtin';
+import {isApiOutdated, isEffectiveApi} from '../../utils/api';
+import {withRemoteConfig} from '../../components/WithRemoteConfig';
+
+/**
+ * JSON Schema
+ * 文档：https://baidu.gitee.io/amis/docs/components/form/json-schema
+ */
+export interface JSONSchemaControlSchema extends FormBaseControl {
+  /**
+   * 指定为 JSON Schema
+   */
+  type: 'json-schema';
+
+  /**
+   * json-schema 详情，支持关联上下文数据
+   */
+  schema?: any;
+}
+
+export interface JSONSchemaProps
+  extends FormControlProps,
+    Omit<
+      JSONSchemaControlSchema,
+      'type' | 'className' | 'descriptionClassName' | 'inputClassName'
+    > {}
+
+const EnhancedInputJSONSchema = withRemoteConfig({
+  sourceField: 'schema',
+  injectedPropsFilter: props => {
+    return {
+      schema: props.config,
+      loading: props.loading
+    };
+  }
+})(InputJSONSchema as any);
+export default class JSONSchemaControl extends React.PureComponent<JSONSchemaProps> {
+  render() {
+    const {...rest} = this.props;
+
+    return <EnhancedInputJSONSchema {...rest} />;
+  }
+}
+
+@FormItem({
+  type: 'json-schema',
+  strictMode: false
+})
+export class JSONSchemaRenderer extends JSONSchemaControl {}