amis-editor 4.1.0-beta.4 → 5.2.0-beta.1

package/lib/validator.d.ts

@@ -0,0 +1,62 @@
+import { SchemaObject } from 'amis/lib/schema';
+/**
+ * 校验规则类名
+ */
+export declare enum ValidationGroup {
+    Pattern = "\u6587\u672C",
+    Number = "\u6570\u5B57",
+    Regex = "\u6B63\u5219",
+    Others = "\u5176\u4ED6"
+}
+export interface Validator {
+    /**
+     * 校验规则名称，英文
+     */
+    name: string;
+    /**
+     * 校验规则标题
+     */
+    label: string;
+    /**
+     * 校验不通过的提示，没有则表示用户不能自定义配置
+     */
+    message?: string;
+    /**
+     * 分类
+     */
+    group?: string;
+    /**
+     * 快速编辑的表单
+     */
+    schema?: SchemaObject[];
+    /**
+     * 输入类型，true则表示是默认
+     */
+    tag: Partial<Record<ValidatorTag, ValidTagMatchType>>;
+}
+declare enum ValidTagMatchType {
+    isDefault = 1,
+    isMore = 2,
+    isBuiltIn = 3
+}
+export declare const registerValidator: (...config: Array<Validator>) => void;
+export declare const getValidatorsByTag: (tag: ValidatorTag) => {
+    defaultValidators: Record<string, Validator>;
+    moreValidators: Record<string, Validator>;
+    builtInValidators: Record<string, Validator>;
+};
+export declare const getValidator: (name: string) => Validator | undefined;
+export declare enum ValidatorTag {
+    All = "0",
+    Text = "1",
+    MultiSelect = "2",
+    Check = "3",
+    Email = "4",
+    Password = "5",
+    URL = "6",
+    Number = "7",
+    File = "8",
+    Date = "9",
+    Code = "10"
+}
+export {};

package/lib/validator.js

@@ -0,0 +1,417 @@
+/**
+ * amis-editor v5.2.0-beta.1
+ * Copyright 2018-2022 @fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+/**
+ * @file 所有可用验证器
+ */
+var Validators = [];
+/**
+ * 校验规则类名
+ */
+exports.ValidationGroup = void 0;
+(function (ValidationGroup) {
+    ValidationGroup["Pattern"] = "\u6587\u672C";
+    ValidationGroup["Number"] = "\u6570\u5B57";
+    ValidationGroup["Regex"] = "\u6B63\u5219";
+    ValidationGroup["Others"] = "\u5176\u4ED6";
+})(exports.ValidationGroup || (exports.ValidationGroup = {}));
+var ValidTagMatchType;
+(function (ValidTagMatchType) {
+    ValidTagMatchType[ValidTagMatchType["isDefault"] = 1] = "isDefault";
+    ValidTagMatchType[ValidTagMatchType["isMore"] = 2] = "isMore";
+    ValidTagMatchType[ValidTagMatchType["isBuiltIn"] = 3] = "isBuiltIn"; // 默认内置校验， 默认开启，不可操作开关关闭
+})(ValidTagMatchType || (ValidTagMatchType = {}));
+var registerValidator = function () {
+    var config = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        config[_i] = arguments[_i];
+    }
+    Validators.push.apply(Validators, config);
+};
+var getValidatorsByTag = function (tag) {
+    var defaultValidators = {};
+    var moreValidators = {};
+    var builtInValidators = {};
+    Validators.forEach(function (valid) {
+        var tagMatch = valid.tag[tag];
+        if (tagMatch != null) {
+            if (tagMatch === ValidTagMatchType.isDefault) {
+                defaultValidators[valid.name] = valid;
+            }
+            else if (tagMatch === ValidTagMatchType.isMore) {
+                moreValidators[valid.name] = valid;
+            }
+            else if (tagMatch === ValidTagMatchType.isBuiltIn) {
+                builtInValidators[valid.name] = valid;
+            }
+            return;
+        }
+        tagMatch = valid.tag[exports.ValidatorTag.All];
+        if (tagMatch != null) {
+            if (tagMatch === ValidTagMatchType.isDefault) {
+                defaultValidators[valid.name] = valid;
+            }
+            else if (tagMatch === ValidTagMatchType.isMore) {
+                moreValidators[valid.name] = valid;
+            }
+            else if (tagMatch === ValidTagMatchType.isBuiltIn) {
+                builtInValidators[valid.name] = valid;
+            }
+        }
+    });
+    return {
+        defaultValidators: defaultValidators,
+        moreValidators: moreValidators,
+        builtInValidators: builtInValidators
+    };
+};
+var getValidator = function (name) {
+    return Validators.find(function (item) { return item.name === name; });
+};
+exports.ValidatorTag = void 0;
+(function (ValidatorTag) {
+    ValidatorTag["All"] = "0";
+    ValidatorTag["Text"] = "1";
+    ValidatorTag["MultiSelect"] = "2";
+    ValidatorTag["Check"] = "3";
+    ValidatorTag["Email"] = "4";
+    ValidatorTag["Password"] = "5";
+    ValidatorTag["URL"] = "6";
+    ValidatorTag["Number"] = "7";
+    ValidatorTag["File"] = "8";
+    ValidatorTag["Date"] = "9";
+    ValidatorTag["Code"] = "10";
+})(exports.ValidatorTag || (exports.ValidatorTag = {}));
+registerValidator.apply(void 0, tslib.__spreadArray([{
+        label: '必填',
+        name: 'required',
+        tag: (_a = {},
+            _a[exports.ValidatorTag.Text] = ValidTagMatchType.isDefault,
+            _a[exports.ValidatorTag.File] = ValidTagMatchType.isDefault,
+            _a[exports.ValidatorTag.MultiSelect] = ValidTagMatchType.isDefault,
+            _a[exports.ValidatorTag.Date] = ValidTagMatchType.isDefault,
+            _a[exports.ValidatorTag.Code] = ValidTagMatchType.isDefault,
+            _a[exports.ValidatorTag.Email] = ValidTagMatchType.isDefault,
+            _a[exports.ValidatorTag.Password] = ValidTagMatchType.isDefault,
+            _a[exports.ValidatorTag.URL] = ValidTagMatchType.isDefault,
+            _a)
+    },
+    {
+        label: '邮箱格式',
+        name: 'isEmail',
+        group: exports.ValidationGroup.Pattern,
+        message: 'Email 格式不正确',
+        tag: (_b = {},
+            _b[exports.ValidatorTag.Email] = ValidTagMatchType.isBuiltIn,
+            _b[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _b)
+    },
+    {
+        label: 'Url格式',
+        name: 'isUrl',
+        group: exports.ValidationGroup.Pattern,
+        message: 'Url 格式不正确',
+        tag: (_c = {},
+            _c[exports.ValidatorTag.URL] = ValidTagMatchType.isBuiltIn,
+            _c[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _c)
+    },
+    {
+        label: '字母',
+        name: 'isAlpha',
+        group: exports.ValidationGroup.Pattern,
+        message: '请输入字母',
+        tag: (_d = {},
+            _d[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _d)
+    },
+    {
+        label: '数字',
+        name: 'isNumeric',
+        group: exports.ValidationGroup.Number,
+        message: '请输入数字',
+        tag: (_e = {},
+            _e[exports.ValidatorTag.Number] = ValidTagMatchType.isDefault,
+            _e[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _e)
+    },
+    {
+        label: '字母和数字',
+        name: 'isAlphanumeric',
+        group: exports.ValidationGroup.Pattern,
+        message: '请输入字母或者数字',
+        tag: (_f = {},
+            _f[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _f)
+    },
+    {
+        label: '整型数字',
+        name: 'isInt',
+        group: exports.ValidationGroup.Number,
+        message: '请输入整形数字',
+        tag: (_g = {},
+            _g[exports.ValidatorTag.Number] = ValidTagMatchType.isDefault,
+            _g[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _g)
+    },
+    {
+        label: '浮点型数字',
+        name: 'isFloat',
+        group: exports.ValidationGroup.Number,
+        message: '请输入浮点型数值',
+        tag: (_h = {},
+            _h[exports.ValidatorTag.Number] = ValidTagMatchType.isDefault,
+            _h[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _h)
+    },
+    {
+        label: '固定长度',
+        name: 'isLength',
+        group: exports.ValidationGroup.Pattern,
+        message: '请输入长度为 $1 的内容',
+        tag: (_j = {},
+            _j[exports.ValidatorTag.Number] = ValidTagMatchType.isDefault,
+            _j[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _j),
+        schema: [
+            {
+                type: 'input-number',
+                name: 'value',
+                label: '字符数',
+                placeholder: '请输入字符个数'
+            }
+        ]
+    },
+    {
+        label: '最大长度',
+        name: 'maxLength',
+        group: exports.ValidationGroup.Pattern,
+        message: '请控制内容长度, 请不要输入 $1 个字符以上',
+        tag: (_k = {},
+            _k[exports.ValidatorTag.Text] = ValidTagMatchType.isDefault,
+            _k),
+        schema: [
+            {
+                type: 'input-number',
+                name: 'value',
+                label: '字符数'
+                // placeholder: '请输入字符个数'
+            }
+        ]
+    },
+    // {
+    //   label: '最大个数',
+    //   name: 'maxLength',
+    //   group: ValidationGroup.Pattern,
+    //   message: '文件个数不可超过 $1 个',
+    //   tag: {
+    //     [ValidatorTag.File]: true
+    //   },
+    //   schema: [
+    //     {
+    //       type: 'input-number',
+    //       name: 'value',
+    //       label: '文件数'
+    //     }
+    //   ]
+    // },
+    // {
+    //   label: '最小个数',
+    //   name: 'minLength',
+    //   group: ValidationGroup.Pattern,
+    //   message: '文件个数不可少于 $1 个',
+    //   tag: {
+    //     [ValidatorTag.File]: true
+    //   },
+    //   schema: [
+    //     {
+    //       type: 'input-number',
+    //       name: 'value',
+    //       label: '文件数'
+    //     }
+    //   ]
+    // },
+    // {
+    //   label: '最大体积',
+    //   group: ValidationGroup.Pattern,
+    //   name: 'maxSize',
+    //   message: '文件体积不可超过 $1 Byte',
+    //   tag: {
+    //     [ValidatorTag.File]: true
+    //   },
+    //   schema: [
+    //     {
+    //       type: 'input-number',
+    //       label: '体积(Byte)'
+    //     }
+    //   ]
+    // },
+    {
+        label: '最小长度',
+        name: 'minLength',
+        group: exports.ValidationGroup.Pattern,
+        message: '请输入更多的内容，至少输入 $1 个字符',
+        tag: (_l = {},
+            _l[exports.ValidatorTag.Text] = ValidTagMatchType.isDefault,
+            _l),
+        schema: [
+            {
+                type: 'input-number',
+                name: 'value',
+                label: '字符数'
+                // placeholder: '请输入字符个数'
+            }
+        ]
+    },
+    {
+        label: '最大值',
+        name: 'maximum',
+        group: exports.ValidationGroup.Number,
+        message: '当前输入值超出最大值 $1，请检查',
+        tag: (_m = {},
+            _m[exports.ValidatorTag.Number] = ValidTagMatchType.isDefault,
+            _m[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _m),
+        schema: [
+            {
+                type: 'input-number',
+                name: 'value',
+                label: '最大值'
+                // placeholder: '请输入最大值'
+            }
+        ]
+    },
+    {
+        label: '最小值',
+        name: 'minimum',
+        group: exports.ValidationGroup.Number,
+        message: '当前输入值低于最小值 $1，请检查',
+        tag: (_o = {},
+            _o[exports.ValidatorTag.Number] = ValidTagMatchType.isDefault,
+            _o[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _o),
+        schema: [
+            {
+                type: 'input-number',
+                name: 'value',
+                label: '最小值'
+                // placeholder: '请输入最小值'
+            }
+        ]
+    },
+    {
+        label: '手机号码',
+        name: 'isPhoneNumber',
+        group: exports.ValidationGroup.Pattern,
+        message: '请输入合法的手机号码',
+        tag: (_p = {},
+            _p[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _p)
+    },
+    {
+        label: '电话号码',
+        name: 'isTelNumber',
+        group: exports.ValidationGroup.Pattern,
+        message: '请输入合法的电话号码',
+        tag: (_q = {},
+            _q[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _q)
+    },
+    {
+        label: '邮编号码',
+        name: 'isZipcode',
+        group: exports.ValidationGroup.Pattern,
+        message: '请输入合法的邮编地址',
+        tag: (_r = {},
+            _r[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _r)
+    },
+    {
+        label: '身份证号码',
+        name: 'isId',
+        group: exports.ValidationGroup.Pattern,
+        message: '请输入合法的身份证号',
+        tag: (_s = {},
+            _s[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _s)
+    },
+    {
+        label: 'JSON格式',
+        name: 'isJson',
+        group: exports.ValidationGroup.Pattern,
+        message: '请检查 Json 格式',
+        tag: (_t = {},
+            _t[exports.ValidatorTag.Text] = ValidTagMatchType.isMore,
+            _t)
+    },
+    {
+        label: '与指定值相同',
+        name: 'equals',
+        group: exports.ValidationGroup.Others,
+        message: '输入的数据与 $1 不一致',
+        tag: (_u = {},
+            _u[exports.ValidatorTag.All] = ValidTagMatchType.isMore,
+            _u[exports.ValidatorTag.Password] = ValidTagMatchType.isDefault,
+            _u),
+        schema: [
+            {
+                type: 'input-text',
+                name: 'value',
+                label: '值内容'
+            }
+        ]
+    },
+    {
+        label: '与指定字段值相同',
+        name: 'equalsField',
+        group: exports.ValidationGroup.Others,
+        message: '输入的数据与 $1 值不一致',
+        tag: (_v = {},
+            _v[exports.ValidatorTag.All] = ValidTagMatchType.isMore,
+            _v[exports.ValidatorTag.Password] = ValidTagMatchType.isDefault,
+            _v),
+        schema: [
+            {
+                type: 'input-text',
+                name: 'value',
+                label: '字段名'
+            }
+        ]
+    }], Array(5)
+    .fill(null)
+    .map(function (v, index) {
+    var _a;
+    var num = index === 0 ? '' : index;
+    return {
+        label: '自定义正则' + num,
+        name: 'matchRegexp' + num,
+        group: exports.ValidationGroup.Regex,
+        message: '格式不正确, 请输入符合规则为 `$1` 的内容。',
+        tag: (_a = {},
+            _a[exports.ValidatorTag.All] = ValidTagMatchType.isMore,
+            _a),
+        schema: [
+            {
+                type: 'input-text',
+                name: 'value',
+                label: '表达式',
+                placeholder: '请输入Js正则',
+                prefix: '/',
+                suffix: '/'
+            }
+        ]
+    };
+}), false));
+
+exports.getValidator = getValidator;
+exports.getValidatorsByTag = getValidatorsByTag;
+exports.registerValidator = registerValidator;

package/package.json

@@ -1,19 +1,13 @@
 {
   "name": "amis-editor",
-  "version": "4.1.0-beta.4",
+  "version": "5.2.0-beta.1",
   "description": "amis 可视化编辑器",
-  "main": "dist/index.min.js",
-  "types": "dist/index.d.ts",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "concurrently --restart-tries -1 npm:serve npm:dev",
-    "serve": "fis3 server start --www ./public --port 9999 --no-daemon --no-browse",
-    "stop": "fis3 server stop",
-    "dev": "fis3 release -cwd ./public",
-    "prettier": "prettier --write '{src,scss,examples}/**/**/*.{js,jsx,ts,tsx,scss,json}'",
-    "build": "webpack",
-    "publish-to-internal": "git pull && sh publish.sh",
-    "publish2local": "sh publish-local.sh"
+    "build": "npm run clean-dist && NODE_ENV=production rollup -c ",
+    "clean-dist": "rimraf lib/* esm/*"
   },
   "keywords": [
     "amis",
@@ -22,8 +16,7 @@
   "author": "@fex",
   "license": "ISC",
   "files": [
-    "dist/*",
-    "static/*"
+    "lib"
   ],
   "lint-staged": {
     "{src,scss,examples}/**/**/*.{js,jsx,ts,tsx,scss,json}": [
@@ -31,20 +24,22 @@
     ]
   },
   "dependencies": {
-    "@webcomponents/webcomponentsjs": "^2.6.0",
-    "deep-diff": "1.0.2",
-    "json-ast-comments": "^1.1.0",
-    "mobx": "^4.5.0",
-    "mobx-react": "^6.1.4",
-    "mobx-state-tree": "^3.17.3",
-    "react-json-view": "^1.21.3",
-    "sortablejs": "^1.14.0"
+    "amis-editor-comp": "*",
+    "amis-editor-core": "*",
+    "lodash": "^4.17.15",
+    "@webcomponents/webcomponentsjs": "^2.6.0"
   },
   "devDependencies": {
     "@fortawesome/fontawesome-free": "^5.15.3",
+    "@rollup/plugin-commonjs": "^22.0.0",
+    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-typescript": "^8.3.2",
+    "@svgr/rollup": "^6.2.1",
     "@svgr/webpack": "^5.5.0",
     "@types/async": "^2.0.45",
     "@types/classnames": "^2.2.3",
+    "@types/codemirror": "^5.60.5",
     "@types/deep-diff": "^1.0.0",
     "@types/history": "^4.6.0",
     "@types/hoist-non-react-statics": "^3.0.1",
@@ -54,9 +49,14 @@
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.4",
     "@types/react-router": "^4.0.16",
+    "@types/react-router-dom": "^5.1.7",
     "@types/sortablejs": "^1.10.7",
+    "@types/tinycolor2": "^1.4.3",
     "ajv": "^8.8.2",
-    "amis": "^1.8.0-beta.9",
+    "amis": "^2.0.0-rc.10",
+    "amis-core": "^2.0.0-rc.10",
+    "amis-formula": "^2.0.0-rc.10",
+    "amis-ui": "^2.0.0-rc.10",
     "axios": "0.21.1",
     "concurrently": "^6.2.0",
     "css-loader": "^6.2.0",
@@ -78,19 +78,30 @@
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "react-overlays": "5.1.1",
-    "react-router": "3.2.0",
+    "react-router": "5.2.0",
+    "react-router-dom": "5.2.0",
+    "rimraf": "^3.0.2",
+    "rollup": "^2.73.0",
+    "rollup-plugin-auto-external": "^2.0.0",
+    "rollup-plugin-license": "^2.7.0",
     "sass": "^1.49.7",
     "sass-loader": "^12.5.0",
     "style-loader": "^3.2.1",
+    "ts-jest": "^28.0.3",
+    "ts-json-schema-generator": "0.96.0",
     "ts-loader": "^9.2.5",
+    "ts-node": "^10.5.0",
     "tslib": "^2.3.1",
-    "typescript": "^4.4.2",
+    "typescript": "^4.6.4",
     "webpack": "^5.52.1",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-cli": "^4.8.0",
     "webpack-node-externals": "^3.0.0"
   },
   "peerDependencies": {
-    "amis": "*"
+    "amis": "*",
+    "amis-core": "*",
+    "amis-formula": "*",
+    "amis-ui": "*"
   }
 }

package/dist/cebfe0bc5a1dbde02da1.svg

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="6px" height="8px" viewBox="0 0 6 8" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="折叠icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="折叠icon svg" transform="translate(-305.000000, -566.000000)" fill="#A1A6B3" fill-rule="nonzero">
-            <g id="折叠icon svg g" transform="translate(60.000000, 60.000000)">
-                <path d="M245.77735,506.518233 L250.375962,509.583975 C250.605727,509.737151 250.667814,510.047586 250.514637,510.27735 C250.47802,510.332276 250.430888,510.379408 250.375962,510.416025 L245.77735,513.481767 C245.547586,513.634943 245.237151,513.572856 245.083975,513.343092 C245.029219,513.260958 245,513.164454 245,513.065741 L245,506.934259 C245,506.658116 245.223858,506.434259 245.5,506.434259 C245.598712,506.434259 245.695216,506.463478 245.77735,506.518233 Z" id="矩形" transform="translate(248.000000, 510.000000) scale(-1, 1) translate(-248.000000, -510.000000) "></path>
-            </g>
-        </g>
-    </g>
-</svg>

package/dist/compat.d.ts

@@ -1,30 +0,0 @@
-/**
- * 兼容 1.x 里面的注册渲染器的方法。
- */
-import { EditorManager } from './manager';
-import { BasePlugin } from './plugin';
-/**
- * 旧版本注册渲染器编辑器的方法。
- *
- * @deprecated
- * @param rendererName
- * @param config
- */
-export declare function RendererEditor(rendererName: string, config: {
-    name: string;
-    description?: string;
-    type?: string;
-    previewSchema?: any;
-    scaffold?: any;
-}): (Klass: new (manager: EditorManager) => BasicEditor) => void;
-/**
- * 为了兼容旧版的注册方法
- * @deprecated
- */
-export declare class BasicEditor extends BasePlugin {
-    tipName?: string;
-    settingsSchema?: {
-        title: string;
-        body: Array<any>;
-    };
-}

package/dist/component/Breadcrumb.d.ts

@@ -1,12 +0,0 @@
-import React from 'react';
-import { EditorStoreType } from '../store/editor';
-import { EditorManager } from '../manager';
-export interface BreadcrumbProps {
-    store: EditorStoreType;
-    manager: EditorManager;
-}
-export default class Breadcrumb extends React.Component<BreadcrumbProps> {
-    handleClick(e: React.MouseEvent<HTMLAnchorElement>): void;
-    handleMouseEnter(e: React.MouseEvent<HTMLAnchorElement>): void;
-    render(): JSX.Element | null;
-}