@tmagic/editor 1.3.0-alpha.9 → 1.3.0-beta.0

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.0-alpha.9",
+  "version": "1.3.0-beta.0",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -46,27 +46,27 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons-vue": "^2.0.9",
-    "@tmagic/core": "1.3.0-alpha.9",
-    "@tmagic/design": "1.3.0-alpha.9",
-    "@tmagic/form": "1.3.0-alpha.9",
-    "@tmagic/schema": "1.3.0-alpha.9",
-    "@tmagic/stage": "1.3.0-alpha.9",
-    "@tmagic/table": "1.3.0-alpha.9",
-    "@tmagic/utils": "1.3.0-alpha.9",
+    "@tmagic/core": "1.3.0-beta.0",
+    "@tmagic/design": "1.3.0-beta.0",
+    "@tmagic/form": "1.3.0-beta.0",
+    "@tmagic/schema": "1.3.0-beta.0",
+    "@tmagic/stage": "1.3.0-beta.0",
+    "@tmagic/table": "1.3.0-beta.0",
+    "@tmagic/utils": "1.3.0-beta.0",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
     "events": "^3.3.0",
-    "gesto": "^1.7.0",
-    "keycon": "^1.1.2",
+    "gesto": "^1.19.1",
+    "keycon": "^1.4.0",
     "lodash-es": "^4.17.21",
-    "monaco-editor": "^0.39.0",
+    "monaco-editor": "^0.41.0",
     "serialize-javascript": "^6.0.0",
     "vue": "^3.3.4"
   },
   "peerDependencies": {
-    "@tmagic/design": "1.3.0-alpha.9",
-    "@tmagic/form": "1.3.0-alpha.9",
-    "monaco-editor": "^0.39.0",
+    "@tmagic/design": "1.3.0-beta.0",
+    "@tmagic/form": "1.3.0-beta.0",
+    "monaco-editor": "^0.41.0",
     "vue": "^3.3.4"
   },
   "devDependencies": {
@@ -81,7 +81,7 @@
     "sass": "^1.35.1",
     "tsc-alias": "^1.8.5",
     "typescript": "^5.0.4",
-    "vite": "^4.3.8",
+    "vite": "^4.4.4",
     "vue-tsc": "^1.6.5"
   }
 }

package/src/Editor.vue

@@ -40,10 +40,6 @@
           <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 }">
-            <slot name="code-block-edit-panel-header" :id="id"></slot>
-          </template>
         </Sidebar>
       </slot>
     </template>
@@ -61,7 +57,10 @@
 
     <template #props-panel>
       <slot name="props-panel">
-        <PropsPanel @mounted="(instance: any) => $emit('props-panel-mounted', instance)">
+        <PropsPanel
+          :extend-state="extendFormState"
+          @mounted="(instance: any) => $emit('props-panel-mounted', instance)"
+        >
           <template #props-panel-header>
             <slot name="props-panel-header"></slot>
           </template>

package/src/components/CodeBlockEditor.vue

@@ -0,0 +1,257 @@
+<template>
+  <MFormDrawer
+    class="m-editor-code-block-editor"
+    ref="fomDrawer"
+    label-width="80px"
+    :close-on-press-escape="false"
+    :title="content.name"
+    :width="size"
+    :config="functionConfig"
+    :values="content"
+    :disabled="disabled"
+    :before-close="beforeClose"
+    @change="changeHandler"
+    @submit="submitForm"
+    @error="errorHandler"
+    @open="openHandler"
+    @closed="closedHandler"
+  >
+    <template #left>
+      <TMagicButton type="primary" text @click="difVisible = true">查看修改</TMagicButton>
+    </template>
+  </MFormDrawer>
+
+  <TMagicDialog v-model="difVisible" title="查看修改" fullscreen>
+    <div style="display: flex; margin-bottom: 10px">
+      <div style="flex: 1"><TMagicTag size="small" type="info">修改前</TMagicTag></div>
+      <div style="flex: 1"><TMagicTag size="small" type="success">修改后</TMagicTag></div>
+    </div>
+
+    <CodeEditor
+      v-if="difVisible"
+      ref="magicVsEditor"
+      type="diff"
+      language="json"
+      :initValues="content.content"
+      :modifiedValues="fomDrawer?.form?.values.content"
+      :style="`height: ${height - 200}px`"
+    ></CodeEditor>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <TMagicButton size="small" @click="difVisible = false">取消</TMagicButton>
+        <TMagicButton size="small" type="primary" @click="diffChange">确定</TMagicButton>
+      </span>
+    </template>
+  </TMagicDialog>
+</template>
+
+<script lang="ts" setup>
+import { computed, inject, onUnmounted, ref } from 'vue';
+
+import { TMagicButton, TMagicDialog, tMagicMessage, tMagicMessageBox, TMagicTag } from '@tmagic/design';
+import { ColumnConfig, FormState, MFormDrawer } from '@tmagic/form';
+import type { CodeBlockContent } from '@tmagic/schema';
+
+import CodeEditor from '@editor/layouts/CodeEditor.vue';
+import type { Services } from '@editor/type';
+import { getConfig } from '@editor/utils/config';
+
+defineOptions({
+  name: 'MEditorCodeBlockEditor',
+});
+
+const props = defineProps<{
+  content: CodeBlockContent;
+  disabled?: boolean;
+  isDataSource?: boolean;
+}>();
+
+const emit = defineEmits<{
+  submit: [values: CodeBlockContent];
+}>();
+
+const services = inject<Services>('services');
+
+const difVisible = ref(false);
+const height = ref(globalThis.innerHeight);
+
+const windowReizehandler = () => {
+  height.value = globalThis.innerHeight;
+};
+
+globalThis.addEventListener('resize', windowReizehandler);
+
+onUnmounted(() => {
+  globalThis.removeEventListener('resize', windowReizehandler);
+});
+
+const magicVsEditor = ref<InstanceType<typeof CodeEditor>>();
+
+const diffChange = () => {
+  if (!magicVsEditor.value || !fomDrawer.value?.form) {
+    return;
+  }
+
+  fomDrawer.value.form.values.content = magicVsEditor.value.getEditorValue();
+
+  difVisible.value = false;
+};
+
+const columnWidth = computed(() => services?.uiService.get('columnWidth'));
+const size = computed(() =>
+  columnWidth.value ? columnWidth.value.center + columnWidth.value.right - (props.isDataSource ? 100 : 0) : 600,
+);
+
+const codeEditorHeight = ref('600px');
+
+const defaultParamColConfig: ColumnConfig = {
+  type: 'row',
+  label: '参数类型',
+  items: [
+    {
+      text: '参数类型',
+      labelWidth: '70px',
+      type: 'select',
+      name: 'type',
+      options: [
+        {
+          text: '数字',
+          label: '数字',
+          value: 'number',
+        },
+        {
+          text: '字符串',
+          label: '字符串',
+          value: 'text',
+        },
+        {
+          text: '组件',
+          label: '组件',
+          value: 'ui-select',
+        },
+      ],
+    },
+  ],
+};
+
+const functionConfig = computed(() => [
+  {
+    text: '名称',
+    name: 'name',
+  },
+  {
+    text: '描述',
+    name: 'desc',
+  },
+  {
+    text: '执行时机',
+    name: 'timing',
+    type: 'select',
+    options: [
+      { text: '初始化前', value: 'beforeInit' },
+      { text: '初始化后', value: 'afterInit' },
+    ],
+    display: () => props.isDataSource,
+  },
+  {
+    type: 'table',
+    border: true,
+    text: '参数',
+    enableFullscreen: false,
+    enableToggleMode: false,
+    name: 'params',
+    dropSort: false,
+    items: [
+      {
+        type: 'text',
+        label: '参数名',
+        name: 'name',
+      },
+      {
+        type: 'text',
+        label: '描述',
+        name: 'extra',
+      },
+      services?.codeBlockService.getParamsColConfig() || defaultParamColConfig,
+    ],
+  },
+  {
+    name: 'content',
+    type: 'vs-code',
+    options: inject('codeOptions', {}),
+    height: codeEditorHeight.value,
+    onChange: (formState: FormState | undefined, code: string) => {
+      try {
+        // 检测js代码是否存在语法错误
+        getConfig('parseDSL')(code);
+
+        return code;
+      } catch (error: any) {
+        tMagicMessage.error(error.message);
+
+        throw error;
+      }
+    },
+  },
+]);
+
+const submitForm = (values: CodeBlockContent) => {
+  emit('submit', values);
+};
+
+const errorHandler = (error: any) => {
+  tMagicMessage.error(error.message);
+};
+
+const fomDrawer = ref<InstanceType<typeof MFormDrawer>>();
+
+const openHandler = () => {
+  setTimeout(() => {
+    if (fomDrawer.value) {
+      const height = fomDrawer.value?.bodyHeight - 348 - (props.isDataSource ? 50 : 0);
+      codeEditorHeight.value = `${height > 100 ? height : 600}px`;
+    }
+  });
+};
+
+const changedValue = ref<CodeBlockContent>();
+const changeHandler = (values: CodeBlockContent) => {
+  changedValue.value = values;
+};
+
+const beforeClose = (done: (cancel?: boolean) => void) => {
+  if (!changedValue.value) {
+    done();
+    return;
+  }
+  tMagicMessageBox
+    .confirm('当前代码块已修改，是否保存？', '提示', {
+      confirmButtonText: '保存并关闭',
+      cancelButtonText: '不保存并关闭',
+      type: 'warning',
+      distinguishCancelAndClose: true,
+    })
+    .then(() => {
+      changedValue.value && submitForm(changedValue.value);
+      done();
+    })
+    .catch((action: string) => {
+      done(action === 'close');
+    });
+};
+
+const closedHandler = () => {
+  changedValue.value = undefined;
+};
+
+defineExpose({
+  show() {
+    fomDrawer.value?.show();
+  },
+
+  hide() {
+    fomDrawer.value?.hide();
+  },
+});
+</script>

package/src/components/CodeParams.vue

@@ -0,0 +1,60 @@
+<template>
+  <MForm
+    ref="form"
+    :config="codeParamsConfig"
+    :init-values="model"
+    :disabled="disabled"
+    :size="size"
+    :watch-props="false"
+    @change="onParamsChangeHandler"
+  ></MForm>
+</template>
+
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
+
+import { FormConfig, MForm } from '@tmagic/form';
+
+import type { CodeParamStatement } from '@editor/type';
+import { error } from '@editor/utils';
+
+defineOptions({
+  name: 'MEditorCodeParams',
+});
+
+const props = defineProps<{
+  model: any;
+  size?: 'small' | 'default' | 'large';
+  disabled?: boolean;
+  name: string;
+  paramsConfig: CodeParamStatement[];
+}>();
+
+const emit = defineEmits(['change']);
+
+const form = ref<InstanceType<typeof MForm>>();
+
+const getFormConfig = (items: FormConfig = []) => [
+  {
+    type: 'fieldset',
+    items,
+    legend: '参数',
+    labelWidth: '70px',
+    name: props.name,
+  },
+];
+
+const codeParamsConfig = computed(() => getFormConfig(props.paramsConfig));
+
+/**
+ * 参数值修改更新
+ */
+const onParamsChangeHandler = async () => {
+  try {
+    const value = await form.value?.submitForm(true);
+    emit('change', value);
+  } catch (e) {
+    error(e);
+  }
+};
+</script>

package/src/components/ContentMenu.vue

@@ -4,10 +4,11 @@
       <ToolButton
         v-for="(item, index) in menuData"
         event-type="mouseup"
+        ref="buttons"
         :data="item"
         :key="index"
         @mouseup="hide"
-        @mouseenter="showSubMenu(item)"
+        @mouseenter="showSubMenu(item, index)"
       ></ToolButton>
     </div>
     <teleport to="body">
@@ -48,6 +49,7 @@ const props = withDefaults(
 const emit = defineEmits(['hide', 'show']);
 
 const menu = ref<HTMLDivElement>();
+const buttons = ref<InstanceType<typeof ToolButton>[]>();
 const subMenu = ref<any>();
 const visible = ref(false);
 const subMenuData = ref<(MenuButton | MenuComponent)[]>([]);
@@ -101,7 +103,7 @@ const show = (e: MouseEvent) => {
   }, 300);
 };
 
-const showSubMenu = (item: MenuButton | MenuComponent) => {
+const showSubMenu = (item: MenuButton | MenuComponent, index: number) => {
   const menuItem = item as MenuButton;
   if (typeof item !== 'object' || !menuItem.items?.length) {
     return;
@@ -110,9 +112,15 @@ const showSubMenu = (item: MenuButton | MenuComponent) => {
   subMenuData.value = menuItem.items || [];
   setTimeout(() => {
     if (menu.value) {
+      // 将子菜单放置在按钮右侧，与按钮齐平
+      let y = menu.value.offsetTop;
+      if (buttons.value?.[index].$el) {
+        const rect = buttons.value?.[index].$el.getBoundingClientRect();
+        y = rect.top;
+      }
       subMenu.value?.show({
         clientX: menu.value.offsetLeft + menu.value.clientWidth,
-        clientY: menu.value.offsetTop,
+        clientY: y,
       });
     }
   }, 0);

package/src/editorProps.ts

@@ -1,8 +1,8 @@
 import type { PropType } from 'vue';
 
 import type { EventOption } from '@tmagic/core';
-import type { FormConfig } from '@tmagic/form';
-import type { MApp, MNode } from '@tmagic/schema';
+import type { FormConfig, FormState } from '@tmagic/form';
+import type { DataSourceSchema, MApp, MNode } from '@tmagic/schema';
 import StageCore, {
   CONTAINER_HIGHLIGHT_CLASS_NAME,
   ContainerHighlightType,
@@ -11,7 +11,15 @@ import StageCore, {
   UpdateDragEl,
 } from '@tmagic/stage';
 
-import type { ComponentGroup, MenuBarData, MenuButton, MenuComponent, SideBarData, StageRect } from './type';
+import type {
+  ComponentGroup,
+  DatasourceTypeOption,
+  MenuBarData,
+  MenuButton,
+  MenuComponent,
+  SideBarData,
+  StageRect,
+} from './type';
 
 export default {
   /** 页面初始值 */
@@ -27,6 +35,12 @@ export default {
     default: () => [],
   },
 
+  /** 左侧面板中的组件列表 */
+  datasourceList: {
+    type: Array as PropType<DatasourceTypeOption[]>,
+    default: () => [],
+  },
+
   /** 左侧面板配置 */
   sidebar: {
     type: Object as PropType<SideBarData>,
@@ -69,7 +83,7 @@ export default {
 
   /** 添加组件时的默认值 */
   propsValues: {
-    type: Object as PropType<Record<string, MNode>>,
+    type: Object as PropType<Record<string, Partial<MNode>>>,
     default: () => ({}),
   },
 
@@ -79,7 +93,14 @@ export default {
     default: () => ({}),
   },
 
-  dataScourceConfigs: {
+  /** 添加数据源时的默认值 */
+  datasourceValues: {
+    type: Object as PropType<Record<string, Partial<DataSourceSchema>>>,
+    default: () => ({}),
+  },
+
+  /** 数据源的属性配置表单的dsl */
+  datasourceConfigs: {
     type: Object as PropType<Record<string, FormConfig>>,
     default: () => ({}),
   },
@@ -137,4 +158,8 @@ export default {
   disabledDragStart: {
     type: Boolean,
   },
+
+  extendFormState: {
+    type: Function as PropType<(state: FormState) => Record<string, any> | Promise<Record<string, any>>>,
+  },
 };

package/src/fields/Code.vue

@@ -1,15 +1,20 @@
 <template>
-  <magic-code-editor
-    :style="`height: ${height}`"
+  <MagicCodeEditor
+    :height="config.height"
     :init-values="model[name]"
-    :language="language"
-    :options="config.options"
+    :language="config.language"
+    :options="{
+      ...config.options,
+      readOnly: disabled,
+    }"
     @save="save"
-  ></magic-code-editor>
+  ></MagicCodeEditor>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue';
+import type { FieldProps } from '@tmagic/form';
+
+import MagicCodeEditor from '@editor/layouts/CodeEditor.vue';
 
 defineOptions({
   name: 'MEditorCode',
@@ -17,19 +22,18 @@ defineOptions({
 
 const emit = defineEmits(['change']);
 
-const props = defineProps<{
-  model: any;
-  name: string;
-  config: {
-    language?: string;
-    options?: Object;
-    height?: string;
-  };
-  prop: string;
-}>();
-
-const language = computed(() => props.config.language || 'javascript');
-const height = computed(() => props.config.height || `${document.body.clientHeight - 168}px`);
+const props = withDefaults(
+  defineProps<
+    FieldProps<{
+      language?: string;
+      options?: Object;
+      height?: string;
+    }>
+  >(),
+  {
+    disabled: false,
+  },
+);
 
 const save = (v: string) => {
   props.model[props.name] = v;

package/src/fields/CodeLink.vue

@@ -6,24 +6,23 @@
 import { computed, reactive, watch } from 'vue';
 import serialize from 'serialize-javascript';
 
+import type { FieldProps } from '@tmagic/form';
+
 import { getConfig } from '@editor/utils/config';
 
 defineOptions({
   name: 'MEditorCodeLink',
 });
 
-const props = defineProps<{
-  config: {
+const props = defineProps<
+  FieldProps<{
     type: 'code-link';
     name: string;
     text?: string;
     formTitle?: string;
     codeOptions?: Object;
-  };
-  model: any;
-  name: string;
-  prop: string;
-}>();
+  }>
+>();
 
 const emit = defineEmits(['change']);
 

package/src/fields/CodeSelect.vue

@@ -7,28 +7,29 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, watch } from 'vue';
+import { computed, inject, watch } from 'vue';
 import { isEmpty } from 'lodash-es';
 
 import { TMagicCard } from '@tmagic/design';
+import type { FieldProps } from '@tmagic/form';
 import { HookType } from '@tmagic/schema';
 
+import type { Services } from '@editor/type';
+
 defineOptions({
   name: 'MEditorCodeSelect',
 });
 
 const emit = defineEmits(['change']);
 
+const services = inject<Services>('services');
+
 const props = withDefaults(
-  defineProps<{
-    config: {
+  defineProps<
+    FieldProps<{
       className?: string;
-    };
-    model: any;
-    prop: string;
-    name: string;
-    size: 'small' | 'default' | 'large';
-  }>(),
+    }>
+  >(),
   {},
 );
 
@@ -41,7 +42,9 @@ const codeConfig = computed(() => ({
   items: [
     {
       type: 'code-select-col',
+      name: 'codeId',
       labelWidth: 0,
+      disabled: () => !services?.codeBlockService.getEditStatus(),
     },
   ],
 }));