From 2c013dbfc546ca085dccfd347b4425831ac6ff93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8B=E7=BE=8A?= Date: Fri, 13 Mar 2020 09:48:37 +0800 Subject: [PATCH] daily tag --- packages/editor/.eslintrc.js | 6 +++--- packages/editor/ice.config.js | 2 +- packages/editor/src/framework/definitions.ts | 15 ++++++++------- packages/editor/src/framework/editor.ts | 4 +++- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/packages/editor/.eslintrc.js b/packages/editor/.eslintrc.js index 1c034b884..f877f9390 100644 --- a/packages/editor/.eslintrc.js +++ b/packages/editor/.eslintrc.js @@ -1,8 +1,8 @@ -const { eslint, deepmerge } = require('@ice/spec'); +const { tslint, deepmerge } = require('@ice/spec'); -module.exports = deepmerge(eslint, { +module.exports = deepmerge(tslint, { rules: { "global-require": 0, - "interface-name" : [true, "never-prefix"] + "@typescript-eslint/interface-name-prefix": 0 }, }); diff --git a/packages/editor/ice.config.js b/packages/editor/ice.config.js index 6843f35bb..4222f059d 100644 --- a/packages/editor/ice.config.js +++ b/packages/editor/ice.config.js @@ -12,7 +12,7 @@ module.exports = { }, plugins: [ ['ice-plugin-fusion', { - themePackage: '@alife/theme-lowcode-light', + themePackage: '@alife/theme-lowcode-dark', }], ['ice-plugin-moment-locales', { locales: ['zh-cn'], diff --git a/packages/editor/src/framework/definitions.ts b/packages/editor/src/framework/definitions.ts index 968a1935e..9233b660c 100644 --- a/packages/editor/src/framework/definitions.ts +++ b/packages/editor/src/framework/definitions.ts @@ -9,7 +9,7 @@ export interface EditorConfig { shortCuts?: ShortCutsConfig; utils?: UtilsConfig; constants?: ConstantsConfig; - lifeCycles?: lifeCyclesConfig; + lifeCycles?: LifeCyclesConfig; i18n?: I18nConfig; } @@ -38,7 +38,7 @@ export interface ThemeConfig { } export interface PluginsConfig { - [propName: string]: Array; + [propName: string]: PluginConfig[]; } export interface PluginConfig { @@ -63,7 +63,7 @@ export interface PluginConfig { pluginProps?: object; } -export type HooksConfig = Array; +export type HooksConfig = HookConfig[]; export interface HookConfig { message: string; @@ -71,14 +71,14 @@ export interface HookConfig { handler: (editor: Editor, ...args) => void; } -export type ShortCutsConfig = Array; +export type ShortCutsConfig = ShortCutConfig[]; export interface ShortCutConfig { keyboard: string; handler: (editor: Editor, ev: React.KeyboardEventHandler, keymaster: any) => void; } -export type UtilsConfig = Array; +export type UtilsConfig = UtilConfig[]; export interface UtilConfig { name: string; @@ -88,7 +88,7 @@ export interface UtilConfig { export type ConstantsConfig = object; -export interface lifeCyclesConfig { +export interface LifeCyclesConfig { init?: (editor: Editor) => any; destroy?: (editor: Editor) => any; } @@ -114,7 +114,7 @@ export interface Utils { export interface PluginClass extends React.ComponentClass<{ editor: Editor; - [key: string]: any + [key: string]: any; }> { init?: (editor: Editor) => void; open?: () => any; @@ -133,3 +133,4 @@ export interface PluginStatus { locked?: boolean; }; } + diff --git a/packages/editor/src/framework/editor.ts b/packages/editor/src/framework/editor.ts index 9fe46806a..6e2217884 100644 --- a/packages/editor/src/framework/editor.ts +++ b/packages/editor/src/framework/editor.ts @@ -17,9 +17,11 @@ if (res && res[1]) { // 重要,用于矫正画布执行new Function的window对象上下文 window.__newFunc = funContext => { - return new Function(funContext); +return new Function(funContext); }; + + // 关闭浏览器前提醒,只有产生过交互才会生效 window.onbeforeunload = function(e) { e = e || window.event;