@tmagic/editor 1.3.0-alpha.4 → 1.3.0-alpha.5

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.0-alpha.4",
+  "version": "1.3.0-alpha.5",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -46,13 +46,13 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons-vue": "^2.0.9",
-    "@tmagic/core": "1.3.0-alpha.4",
-    "@tmagic/design": "1.3.0-alpha.4",
-    "@tmagic/form": "1.3.0-alpha.4",
-    "@tmagic/schema": "1.3.0-alpha.4",
-    "@tmagic/stage": "1.3.0-alpha.4",
-    "@tmagic/table": "1.3.0-alpha.4",
-    "@tmagic/utils": "1.3.0-alpha.4",
+    "@tmagic/core": "1.3.0-alpha.5",
+    "@tmagic/design": "1.3.0-alpha.5",
+    "@tmagic/form": "1.3.0-alpha.5",
+    "@tmagic/schema": "1.3.0-alpha.5",
+    "@tmagic/stage": "1.3.0-alpha.5",
+    "@tmagic/table": "1.3.0-alpha.5",
+    "@tmagic/utils": "1.3.0-alpha.5",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
     "events": "^3.3.0",
@@ -64,8 +64,8 @@
     "vue": "^3.3.4"
   },
   "peerDependencies": {
-    "@tmagic/design": "1.3.0-alpha.4",
-    "@tmagic/form": "1.3.0-alpha.4",
+    "@tmagic/design": "1.3.0-alpha.5",
+    "@tmagic/form": "1.3.0-alpha.5",
     "monaco-editor": "^0.34.0",
     "vue": "^3.3.4"
   },

package/src/Editor.vue

@@ -1,9 +1,19 @@
 <template>
-  <Framework :code-options="codeOptions">
+  <Framework>
+    <template #header>
+      <slot name="header"></slot>
+    </template>
+
     <template #nav>
       <slot name="nav" :editorService="editorService"><TMagicNavMenu :data="menu"></TMagicNavMenu></slot>
     </template>
 
+    <template #content-before>
+      <slot name="content-before"></slot>
+    </template>
+
+    <template #src-code><slot name="src-code" :editorService="editorService"></slot></template>
+
     <template #sidebar>
       <slot name="sidebar" :editorService="editorService">
         <Sidebar :data="sidebar" :layer-content-menu="layerContentMenu">
@@ -60,6 +70,14 @@
     </template>
 
     <template #empty><slot name="empty" :editorService="editorService"></slot></template>
+
+    <template #content-after>
+      <slot name="content-after"></slot>
+    </template>
+
+    <template #footer>
+      <slot name="footer"></slot>
+    </template>
   </Framework>
 </template>
 

package/src/layouts/CodeEditor.vue

@@ -14,8 +14,8 @@ defineOptions({
 
 const props = withDefaults(
   defineProps<{
-    initValues?: string | Object;
-    modifiedValues?: string | Object;
+    initValues?: string | Record<string | number, any> | null;
+    modifiedValues?: string | Record<string | number, any> | null;
     type?: 'diff';
     language?: string;
     options?: {

package/src/layouts/Framework.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="m-editor">
-    <slot name="nav" class="m-editor-nav-menu"></slot>
+    <slot name="header"></slot>
 
-    <magic-code-editor
-      v-if="showSrc"
-      class="m-editor-content"
-      :init-values="root"
-      :options="codeOptions"
-      @save="saveCode"
-    ></magic-code-editor>
+    <slot name="nav"></slot>
+
+    <slot name="content-before"></slot>
+
+    <slot name="src-code" v-if="showSrc">
+      <CodeEditor class="m-editor-content" :init-values="root" :options="codeOptions" @save="saveCode"></CodeEditor>
+    </slot>
 
     <Layout
       v-else
@@ -39,6 +39,9 @@
         </TMagicScrollbar>
       </template>
     </Layout>
+
+    <slot name="content-after"></slot>
+    <slot name="footer"></slot>
   </div>
 </template>
 
@@ -51,6 +54,7 @@ import Layout from '@editor/components/Layout.vue';
 import type { GetColumnWidth, Services } from '@editor/type';
 
 import AddPageBox from './AddPageBox.vue';
+import CodeEditor from './CodeEditor.vue';
 
 defineOptions({
   name: 'MEditorFramework',
@@ -59,15 +63,7 @@ defineOptions({
 const DEFAULT_LEFT_COLUMN_WIDTH = 310;
 const DEFAULT_RIGHT_COLUMN_WIDTH = 480;
 
-withDefaults(
-  defineProps<{
-    codeOptions?: Record<string, any>;
-  }>(),
-  {
-    codeOptions: () => ({}),
-  },
-);
-
+const codeOptions = inject('codeOptions', {});
 const { editorService, uiService } = inject<Services>('services') || {};
 
 const root = computed(() => editorService?.get('root'));

package/types/components/FunctionEditor.vue.d.ts

@@ -70,9 +70,9 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
             class?: unknown;
             style?: unknown;
             readonly id: Id;
+            readonly language?: string | undefined;
             readonly codeOptions?: Object | undefined;
             readonly content: string;
-            readonly language?: string | undefined;
             onClose?: ((...args: any[]) => any) | undefined;
             onSaveAndClose?: ((...args: any[]) => any) | undefined;
         };
@@ -98,6 +98,9 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
                 type: import("vue").PropType<boolean>;
                 default: boolean;
             };
+            language: {
+                type: import("vue").PropType<string>;
+            };
             codeOptions: {
                 type: import("vue").PropType<Object>;
             };
@@ -105,9 +108,6 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
                 type: import("vue").PropType<string>;
                 required: true;
             };
-            language: {
-                type: import("vue").PropType<string>;
-            };
             autoSaveDraft: {
                 type: import("vue").PropType<boolean>;
                 default: boolean;
@@ -150,6 +150,9 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
+        language: {
+            type: import("vue").PropType<string>;
+        };
         codeOptions: {
             type: import("vue").PropType<Object>;
         };
@@ -157,9 +160,6 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
             type: import("vue").PropType<string>;
             required: true;
         };
-        language: {
-            type: import("vue").PropType<string>;
-        };
         autoSaveDraft: {
             type: import("vue").PropType<boolean>;
             default: boolean;

package/types/layouts/CodeEditor.vue.d.ts

@@ -1,7 +1,7 @@
 import * as monaco from 'monaco-editor';
 declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
-    initValues?: string | Object | undefined;
-    modifiedValues?: string | Object | undefined;
+    initValues?: string | Record<string | number, any> | null | undefined;
+    modifiedValues?: string | Record<string | number, any> | null | undefined;
     type?: "diff" | undefined;
     language?: string | undefined;
     options?: {
@@ -18,9 +18,9 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     getEditor(): monaco.editor.IStandaloneCodeEditor | monaco.editor.IStandaloneDiffEditor | null;
     setEditorValue: (v: any, m: any) => void | undefined;
     focus(): void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("save" | "initd")[], "save" | "initd", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
-    initValues?: string | Object | undefined;
-    modifiedValues?: string | Object | undefined;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("initd" | "save")[], "initd" | "save", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
+    initValues?: string | Record<string | number, any> | null | undefined;
+    modifiedValues?: string | Record<string | number, any> | null | undefined;
     type?: "diff" | undefined;
     language?: string | undefined;
     options?: {
@@ -34,8 +34,8 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
         tabSize: number;
     };
 }>>> & {
-    onSave?: ((...args: any[]) => any) | undefined;
     onInitd?: ((...args: any[]) => any) | undefined;
+    onSave?: ((...args: any[]) => any) | undefined;
 }, {
     options: {
         [key: string]: any;

package/types/layouts/Framework.vue.d.ts

@@ -1,42 +1,18 @@
-declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
-    codeOptions?: Record<string, any> | undefined;
-}>, {
-    codeOptions: () => {};
-}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
-    codeOptions?: Record<string, any> | undefined;
-}>, {
-    codeOptions: () => {};
-}>>>, {
-    codeOptions: Record<string, any>;
-}, {}>, {
-    nav?(_: {
-        class: string;
-    }): any;
+declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>, {
+    header?(_: {}): any;
+    nav?(_: {}): any;
+    "content-before"?(_: {}): any;
+    "src-code"?(_: {}): any;
     sidebar?(_: {}): any;
     workspace?(_: {}): any;
     empty?(_: {}): any;
     "props-panel"?(_: {}): any;
+    "content-after"?(_: {}): any;
+    footer?(_: {}): any;
 }>;
 export default _default;
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToRuntimeProps<T> = {
-    [K in keyof T]-?: {} extends Pick<T, K> ? {
-        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
-    } : {
-        type: import('vue').PropType<T[K]>;
-        required: true;
-    };
-};
-type __VLS_WithDefaults<P, D> = {
-    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
-        default: D[K];
-    }> : P[K];
-};
 type __VLS_WithTemplateSlots<T, S> = T & {
     new (): {
         $slots: S;
     };
 };
-type __VLS_Prettify<T> = {
-    [K in keyof T]: T[K];
-} & {};