@tmagic/editor 1.2.0-beta.1 → 1.2.0-beta.3

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.0-beta.1",
+  "version": "1.2.0-beta.3",
   "name": "@tmagic/editor",
   "sideEffects": [
     "dist/*",
@@ -45,14 +45,14 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons-vue": "^2.0.9",
-    "@tmagic/core": "1.2.0-beta.1",
-    "@tmagic/form": "1.2.0-beta.1",
-    "@tmagic/schema": "1.2.0-beta.1",
-    "@tmagic/stage": "1.2.0-beta.1",
-    "@tmagic/utils": "1.2.0-beta.1",
+    "@tmagic/core": "1.2.0-beta.3",
+    "@tmagic/design": "1.2.0-beta.3",
+    "@tmagic/form": "1.2.0-beta.3",
+    "@tmagic/schema": "1.2.0-beta.3",
+    "@tmagic/stage": "1.2.0-beta.3",
+    "@tmagic/utils": "1.2.0-beta.3",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
-    "element-plus": "^2.2.17",
     "events": "^3.3.0",
     "gesto": "^1.7.0",
     "keycon": "^1.1.2",
@@ -62,8 +62,8 @@
     "vue": "^3.2.37"
   },
   "peerDependencies": {
-    "@tmagic/form": "1.2.0-beta.1",
-    "element-plus": "^2.2.17",
+    "@tmagic/design": "1.2.0-beta.3",
+    "@tmagic/form": "1.2.0-beta.3",
     "monaco-editor": "^0.34.0",
     "vue": "^3.2.37"
   },

package/src/Editor.vue

@@ -27,8 +27,8 @@
             <slot name="code-block-panel-header"></slot>
           </template>
 
-          <template #code-block-panel-tool="{ id }">
-            <slot name="code-block-panel-tool" :id="id"></slot>
+          <template #code-block-panel-tool="{ id, data }">
+            <slot name="code-block-panel-tool" :id="id" :data="data"></slot>
           </template>
 
           <template #code-block-edit-panel-header="{ id }">

package/src/components/ContentMenu.vue

@@ -1,14 +1,14 @@
 <template>
   <div v-if="menuData.length && visible" class="magic-editor-content-menu" ref="menu" :style="menuStyle">
     <div>
-      <tool-button
+      <ToolButton
         v-for="(item, index) in menuData"
         event-type="mouseup"
         :data="item"
         :key="index"
         @mouseup="hide"
         @mouseenter="showSubMenu(item)"
-      ></tool-button>
+      ></ToolButton>
     </div>
     <teleport to="body">
       <content-menu

package/src/components/Icon.vue

@@ -1,16 +1,18 @@
 <template>
-  <el-icon v-if="!icon" class="magic-editor-icon"><Edit></Edit></el-icon>
-  <el-icon v-else-if="typeof icon === 'string' && icon.startsWith('http')" class="magic-editor-icon"
+  <TMagicIcon v-if="!icon" class="magic-editor-icon"><Edit></Edit></TMagicIcon>
+  <TMagicIcon v-else-if="typeof icon === 'string' && icon.startsWith('http')" class="magic-editor-icon"
     ><img :src="icon"
-  /></el-icon>
+  /></TMagicIcon>
   <i v-else-if="typeof icon === 'string'" class="magic-editor-icon" :class="icon"></i>
-  <el-icon v-else class="magic-editor-icon"><component :is="toRaw(icon)"></component></el-icon>
+  <TMagicIcon v-else class="magic-editor-icon"><component :is="toRaw(icon)"></component></TMagicIcon>
 </template>
 
 <script lang="ts" setup>
 import { toRaw } from 'vue';
 import { Edit } from '@element-plus/icons-vue';
 
+import { TMagicIcon } from '@tmagic/design';
+
 defineProps<{
   icon?: any;
 }>();

package/src/components/ToolButton.vue

@@ -7,32 +7,37 @@
     @mousedown="mousedownHandler(data, $event)"
     @mouseup="mouseupHandler(data, $event)"
   >
-    <el-divider v-if="data.type === 'divider'" :direction="data.direction || 'vertical'"></el-divider>
+    <TMagicDivider v-if="data.type === 'divider'" :direction="data.direction || 'vertical'"></TMagicDivider>
     <div v-else-if="data.type === 'text'" class="menu-item-text">{{ data.text }}</div>
 
     <template v-else-if="data.type === 'button'">
-      <el-tooltip v-if="data.tooltip" effect="dark" placement="bottom-start" :content="data.tooltip">
-        <el-button size="small" text :disabled="disabled"
-          ><MIcon v-if="data.icon" :icon="data.icon"></MIcon><span>{{ data.text }}</span></el-button
+      <TMagicTooltip v-if="data.tooltip" effect="dark" placement="bottom-start" :content="data.tooltip">
+        <TMagicButton size="small" text :disabled="disabled"
+          ><MIcon v-if="data.icon" :icon="data.icon"></MIcon><span>{{ data.text }}</span></TMagicButton
         >
-      </el-tooltip>
-      <el-button v-else size="small" text :disabled="disabled"
-        ><MIcon v-if="data.icon" :icon="data.icon"></MIcon><span>{{ data.text }}</span></el-button
+      </TMagicTooltip>
+      <TMagicButton v-else size="small" text :disabled="disabled"
+        ><MIcon v-if="data.icon" :icon="data.icon"></MIcon><span>{{ data.text }}</span></TMagicButton
       >
     </template>
 
-    <el-dropdown v-else-if="data.type === 'dropdown'" trigger="click" :disabled="disabled" @command="dropdownHandler">
+    <TMagicDropdown
+      v-else-if="data.type === 'dropdown'"
+      trigger="click"
+      :disabled="disabled"
+      @command="dropdownHandler"
+    >
       <span class="el-dropdown-link menubar-menu-button">
-        {{ data.text }}<el-icon class="el-icon--right"><ArrowDown></ArrowDown></el-icon>
+        {{ data.text }}<TMagicIcon class="el-icon--right"><ArrowDown></ArrowDown></TMagicIcon>
       </span>
       <template #dropdown>
-        <el-dropdown-menu v-if="data.items && data.items.length">
-          <el-dropdown-item v-for="(subItem, index) in data.items" :key="index" :command="{ data, subItem }">{{
+        <TMagicDropdownMenu v-if="data.items && data.items.length">
+          <TMagicDropdownItem v-for="(subItem, index) in data.items" :key="index" :command="{ data, subItem }">{{
             subItem.text
-          }}</el-dropdown-item>
-        </el-dropdown-menu>
+          }}</TMagicDropdownItem>
+        </TMagicDropdownMenu>
       </template>
-    </el-dropdown>
+    </TMagicDropdown>
 
     <component v-else-if="data.type === 'component'" v-bind="data.props || {}" :is="data.component"></component>
   </div>
@@ -42,6 +47,16 @@
 import { computed, inject } from 'vue';
 import { ArrowDown } from '@element-plus/icons-vue';
 
+import {
+  TMagicButton,
+  TMagicDivider,
+  TMagicDropdown,
+  TMagicDropdownItem,
+  TMagicDropdownMenu,
+  TMagicIcon,
+  TMagicTooltip,
+} from '@tmagic/design';
+
 import MIcon from '../components/Icon.vue';
 import type { MenuButton, MenuComponent, Services } from '../type';
 

package/src/fields/Code.vue

@@ -3,6 +3,7 @@
     :style="`height: ${height}`"
     :init-values="model[name]"
     :language="language"
+    :options="config.options"
     @save="save"
   ></magic-code-editor>
 </template>
@@ -17,12 +18,14 @@ const props = defineProps<{
   name: string;
   config: {
     language?: string;
+    options?: Object;
+    height?: string;
   };
   prop: string;
 }>();
 
 const language = computed(() => props.config.language || 'javascript');
-const height = computed(() => `${document.body.clientHeight - 168}px`);
+const height = computed(() => props.config.height || `${document.body.clientHeight - 168}px`);
 
 const save = (v: string) => {
   props.model[props.name] = v;

package/src/fields/CodeLink.vue

@@ -12,6 +12,7 @@ const props = defineProps<{
     name: string;
     text?: string;
     formTitle?: string;
+    codeOptions?: Object;
   };
   model: any;
   name: string;
@@ -20,17 +21,24 @@ const props = defineProps<{
 
 const emit = defineEmits(['change']);
 
-const formConfig = computed(() => ({
-  ...props.config,
-  text: '',
-  type: 'link',
-  form: [
-    {
-      name: props.name,
-      type: 'vs-code',
-    },
-  ],
-}));
+const formConfig = computed(() => {
+  const { codeOptions, ...config } = props.config;
+  return {
+    ...config,
+    text: '',
+    type: 'link',
+    form: [
+      {
+        name: props.name,
+        type: 'vs-code',
+        options: {
+          tabSize: 2,
+          ...(codeOptions || {}),
+        },
+      },
+    ],
+  };
+});
 
 const modelValue = reactive<{ form: Record<string, string> }>({
   form: {

package/src/fields/CodeSelect.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-fields-code-select" :key="fieldKey">
-    <el-card shadow="never">
+    <TMagicCard shadow="never">
       <template #header>
         <m-fields-select
           :config="selectConfig"
@@ -12,7 +12,7 @@
         ></m-fields-select>
       </template>
       <div class="tool-bar">
-        <el-tooltip class="tool-item" effect="dark" content="查看代码块" placement="top">
+        <TMagicTooltip class="tool-item" effect="dark" content="查看代码块" placement="top">
           <svg
             @click="viewHandler"
             preserveAspectRatio="xMidYMid meet"
@@ -26,17 +26,17 @@
               d="m23 12l-7.071 7.071l-1.414-1.414L20.172 12l-5.657-5.657l1.414-1.414L23 12zM3.828 12l5.657 5.657l-1.414 1.414L1 12l7.071-7.071l1.414 1.414L3.828 12z"
             ></path>
           </svg>
-        </el-tooltip>
+        </TMagicTooltip>
       </div>
-    </el-card>
+    </TMagicCard>
   </div>
 </template>
 
 <script lang="ts" setup>
 import { computed, defineEmits, defineProps, inject, ref, watchEffect } from 'vue';
-import { ElMessage } from 'element-plus';
 import { cloneDeep, map, xor } from 'lodash-es';
 
+import { TMagicCard, tMagicMessage, TMagicTooltip } from '@tmagic/design';
 import { SelectConfig } from '@tmagic/form';
 
 import type { Services } from '../type';
@@ -128,7 +128,7 @@ const setCombineIds = async (codeIds: string[]) => {
 
 const viewHandler = async () => {
   if (props.model[props.name].length === 0) {
-    ElMessage.error('请先绑定代码块');
+    tMagicMessage.error('请先绑定代码块');
     return;
   }
   // 记录当前已被绑定的代码块，为查看弹窗的展示内容

package/src/fields/UISelect.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="m-fields-ui-select" v-if="uiSelectMode" @click="cancelHandler">
-    <el-button type="danger" :icon="Delete" text style="padding: 0">取消</el-button>
+    <TMagicButton type="danger" :icon="Delete" text style="padding: 0">取消</TMagicButton>
   </div>
   <div class="m-fields-ui-select" v-else @click="startSelect" style="display: flex">
-    <el-tooltip v-if="val" content="清除">
-      <el-button style="padding: 0" type="danger" :icon="Close" text @click.stop="deleteHandler"></el-button>
-    </el-tooltip>
-    <el-tooltip :content="val ? toName + '_' + val : '点击此处选择'">
-      <el-button text style="padding: 0; margin: 0">{{ val ? toName + '_' + val : '点击此处选择' }}</el-button>
-    </el-tooltip>
+    <TMagicTooltip v-if="val" content="清除">
+      <TMagicButton style="padding: 0" type="danger" :icon="Close" text @click.stop="deleteHandler"></TMagicButton>
+    </TMagicTooltip>
+    <TMagicTooltip :content="val ? toName + '_' + val : '点击此处选择'">
+      <TMagicButton text style="padding: 0; margin: 0">{{ val ? toName + '_' + val : '点击此处选择' }}</TMagicButton>
+    </TMagicTooltip>
   </div>
 </template>
 
@@ -16,6 +16,7 @@
 import { computed, inject, ref } from 'vue';
 import { Close, Delete } from '@element-plus/icons-vue';
 
+import { TMagicButton, TMagicTooltip } from '@tmagic/design';
 import { FormState } from '@tmagic/form';
 
 import { Services } from '../type';

package/src/index.ts

@@ -42,6 +42,7 @@ export { default as uiService } from './services/ui';
 export { default as codeBlockService } from './services/codeBlock';
 export { default as ComponentListPanel } from './layouts/sidebar/ComponentListPanel.vue';
 export { default as LayerPanel } from './layouts/sidebar/LayerPanel.vue';
+export { default as CodeSelect } from './fields/CodeSelect.vue';
 export { default as CodeBlockList } from './layouts/sidebar/code-block/CodeBlockList.vue';
 export { default as PropsPanel } from './layouts/PropsPanel.vue';
 export { default as ToolButton } from './components/ToolButton.vue';
@@ -63,7 +64,7 @@ export default {
     app.component('m-fields-ui-select', uiSelect);
     app.component('m-fields-code-link', CodeLink);
     app.component('m-fields-vs-code', Code);
-    app.component(CodeEditor.name, CodeEditor);
+    app.component('magic-code-editor', CodeEditor);
     app.component('m-fields-code-select', CodeSelect);
   },
 };

package/src/layouts/AddPageBox.vue

@@ -3,7 +3,7 @@
     <div class="m-editor-empty-content">
       <div class="m-editor-empty-button" @click="clickHandler">
         <div>
-          <el-icon><plus /></el-icon>
+          <MIcon :icon="Plus"></MIcon>
         </div>
         <p>新增页面</p>
       </div>
@@ -11,33 +11,26 @@
   </div>
 </template>
 
-<script lang="ts">
-import { defineComponent, inject, toRaw } from 'vue';
+<script lang="ts" setup>
+import { inject, toRaw } from 'vue';
 import { Plus } from '@element-plus/icons-vue';
 
 import { NodeType } from '@tmagic/schema';
 
+import MIcon from '../components/Icon.vue';
 import type { Services } from '../type';
 import { generatePageNameByApp } from '../utils';
 
-export default defineComponent({
-  components: { Plus },
+const services = inject<Services>('services');
 
-  setup() {
-    const services = inject<Services>('services');
+const clickHandler = () => {
+  const { editorService } = services || {};
 
-    return {
-      clickHandler() {
-        const { editorService } = services || {};
+  if (!editorService) return;
 
-        if (!editorService) return;
-
-        editorService.add({
-          type: NodeType.PAGE,
-          name: generatePageNameByApp(toRaw(editorService.get('root'))),
-        });
-      },
-    };
-  },
-});
+  editorService.add({
+    type: NodeType.PAGE,
+    name: generatePageNameByApp(toRaw(editorService.get('root'))),
+  });
+};
 </script>

package/src/layouts/CodeEditor.vue

@@ -2,12 +2,35 @@
   <div ref="codeEditor" class="magic-code-editor"></div>
 </template>
 
-<script lang="ts">
-import { defineComponent, onMounted, onUnmounted, ref, watch } from 'vue';
+<script lang="ts" setup>
+import { onMounted, onUnmounted, ref, watch } from 'vue';
 import { throttle } from 'lodash-es';
 import * as monaco from 'monaco-editor';
 import serialize from 'serialize-javascript';
 
+const props = withDefaults(
+  defineProps<{
+    initValues?: string | Object;
+    modifiedValues?: string | Object;
+    type?: string;
+    language?: string;
+    options?: {
+      [key: string]: any;
+    };
+    autoSave?: boolean;
+  }>(),
+  {
+    type: '',
+    autoSave: true,
+    language: 'javascript',
+    options: () => ({
+      tabSize: 2,
+    }),
+  },
+);
+
+const emit = defineEmits(['initd', 'save']);
+
 const toString = (v: string | any, language: string): string => {
   let value = '';
   if (typeof v !== 'string') {
@@ -24,148 +47,111 @@ const toString = (v: string | any, language: string): string => {
   return value;
 };
 
-export default defineComponent({
-  name: 'magic-code-editor',
+let vsEditor: monaco.editor.IStandaloneCodeEditor | null = null;
+let vsDiffEditor: monaco.editor.IStandaloneDiffEditor | null = null;
 
-  props: {
-    initValues: {
-      type: [String, Object],
-    },
+const values = ref('');
+const loading = ref(false);
+const codeEditor = ref<HTMLDivElement>();
 
-    modifiedValues: {
-      type: [String, Object],
-    },
+const resizeObserver = new globalThis.ResizeObserver(
+  throttle((): void => {
+    vsEditor?.layout();
+    vsDiffEditor?.layout();
+  }, 300),
+);
 
-    type: {
-      type: String,
-      default: () => '',
-    },
+const setEditorValue = (v: string | any, m: string | any) => {
+  values.value = toString(v, props.language);
 
-    language: {
-      type: String,
-      default: () => 'javascript',
-    },
+  if (props.type === 'diff') {
+    const originalModel = monaco.editor.createModel(values.value, 'text/javascript');
+    const modifiedModel = monaco.editor.createModel(toString(m, props.language), 'text/javascript');
 
-    options: {
-      type: Object,
-      default: () => ({}),
-    },
-  },
-
-  emits: ['initd', 'save'],
+    return vsDiffEditor?.setModel({
+      original: originalModel,
+      modified: modifiedModel,
+    });
+  }
 
-  setup(props, { emit }) {
-    let vsEditor: monaco.editor.IStandaloneCodeEditor | null = null;
-    let vsDiffEditor: monaco.editor.IStandaloneDiffEditor | null = null;
+  return vsEditor?.setValue(values.value);
+};
 
-    const values = ref('');
-    const loading = ref(false);
-    const codeEditor = ref<HTMLDivElement>();
+const getEditorValue = () =>
+  props.type === 'diff' ? vsDiffEditor?.getModifiedEditor().getValue() : vsEditor?.getValue();
 
-    const resizeObserver = new globalThis.ResizeObserver(
-      throttle((): void => {
-        vsEditor?.layout();
-        vsDiffEditor?.layout();
-      }, 300),
-    );
+const init = async () => {
+  if (!codeEditor.value) return;
 
-    const setEditorValue = (v: string | any, m: string | any) => {
-      values.value = toString(v, props.language);
+  const options = {
+    value: values.value,
+    language: props.language,
+    theme: 'vs-dark',
+    ...props.options,
+  };
 
-      if (props.type === 'diff') {
-        const originalModel = monaco.editor.createModel(values.value, 'text/javascript');
-        const modifiedModel = monaco.editor.createModel(toString(m, props.language), 'text/javascript');
+  if (props.type === 'diff') {
+    vsDiffEditor = monaco.editor.createDiffEditor(codeEditor.value, options);
+  } else {
+    vsEditor = monaco.editor.create(codeEditor.value, options);
+  }
 
-        return vsDiffEditor?.setModel({
-          original: originalModel,
-          modified: modifiedModel,
-        });
-      }
+  setEditorValue(props.initValues, props.modifiedValues);
 
-      return vsEditor?.setValue(values.value);
-    };
+  loading.value = false;
 
-    const getEditorValue = () =>
-      props.type === 'diff' ? vsDiffEditor?.getModifiedEditor().getValue() : vsEditor?.getValue();
+  emit('initd', vsEditor);
 
-    const init = async () => {
-      if (!codeEditor.value) return;
+  codeEditor.value.addEventListener('keydown', (e) => {
+    if (e.keyCode === 83 && (navigator.platform.match('Mac') ? e.metaKey : e.ctrlKey)) {
+      e.preventDefault();
+      e.stopPropagation();
+      emit('save', getEditorValue());
+    }
+  });
 
-      const options = {
-        value: values.value,
-        language: props.language,
-        theme: 'vs-dark',
-        ...props.options,
-      };
+  if (props.type !== 'diff' && props.autoSave) {
+    vsEditor?.onDidBlurEditorWidget(() => {
+      emit('save', getEditorValue());
+    });
+  }
 
-      if (props.type === 'diff') {
-        vsDiffEditor = monaco.editor.createDiffEditor(codeEditor.value, options);
-      } else {
-        vsEditor = monaco.editor.create(codeEditor.value, options);
-      }
+  resizeObserver.observe(codeEditor.value);
+};
 
+watch(
+  () => props.initValues,
+  (v, preV) => {
+    if (v !== preV) {
       setEditorValue(props.initValues, props.modifiedValues);
+    }
+  },
+  {
+    deep: true,
+    immediate: true,
+  },
+);
 
-      loading.value = false;
-
-      emit('initd', vsEditor);
-
-      codeEditor.value.addEventListener('keydown', (e) => {
-        if (e.keyCode === 83 && (navigator.platform.match('Mac') ? e.metaKey : e.ctrlKey)) {
-          e.preventDefault();
-          e.stopPropagation();
-          emit('save', getEditorValue());
-        }
-      });
-
-      if (props.type !== 'diff') {
-        vsEditor?.onDidBlurEditorWidget(() => {
-          emit('save', getEditorValue());
-        });
-      }
-
-      resizeObserver.observe(codeEditor.value);
-    };
-
-    watch(
-      () => props.initValues,
-      (v, preV) => {
-        if (v !== preV) {
-          setEditorValue(props.initValues, props.modifiedValues);
-        }
-      },
-      {
-        deep: true,
-        immediate: true,
-      },
-    );
-
-    onMounted(async () => {
-      loading.value = true;
-
-      init();
-    });
+onMounted(async () => {
+  loading.value = true;
 
-    onUnmounted(() => {
-      resizeObserver.disconnect();
-    });
+  init();
+});
 
-    return {
-      values,
-      loading,
-      codeEditor,
+onUnmounted(() => {
+  resizeObserver.disconnect();
+});
 
-      getEditor() {
-        return vsEditor || vsDiffEditor;
-      },
+defineExpose({
+  getEditor() {
+    return vsEditor || vsDiffEditor;
+  },
 
-      setEditorValue,
+  setEditorValue,
 
-      focus() {
-        vsEditor?.focus();
-        vsDiffEditor?.focus();
-      },
-    };
+  focus() {
+    vsEditor?.focus();
+    vsDiffEditor?.focus();
   },
 });
 </script>