@tmagic/editor 1.7.8-beta.2 → 1.7.8-beta.3

package/src/utils/data-source/index.ts

@@ -1,11 +1,11 @@
-import { DataSchema, DataSourceFieldType, DataSourceSchema } from '@tmagic/core';
-import { CascaderOption, FormConfig, FormState } from '@tmagic/form';
+import type { DataSchema, DataSourceFieldType, DataSourceSchema } from '@tmagic/core';
+import { type CascaderOption, defineFormItem, type FormConfig } from '@tmagic/form';
 import { dataSourceTemplateRegExp, getKeysArray, isNumber } from '@tmagic/utils';
 
 import BaseFormConfig from './formConfigs/base';
 import HttpFormConfig from './formConfigs/http';
 
-const dataSourceFormConfig = {
+const dataSourceFormConfig = defineFormItem({
   type: 'tab',
   items: [
     {
@@ -50,7 +50,7 @@ const dataSourceFormConfig = {
     },
     {
       title: '请求参数裁剪',
-      display: (_formState: FormState, { model }: any) => model.type === 'http',
+      display: (_formState, { model }) => model.type === 'http',
       items: [
         {
           name: 'beforeRequest',
@@ -62,7 +62,7 @@ const dataSourceFormConfig = {
     },
     {
       title: '响应数据裁剪',
-      display: (_formState: FormState, { model }: any) => model.type === 'http',
+      display: (_formStat, { model }) => model.type === 'http',
       items: [
         {
           name: 'afterResponse',
@@ -73,7 +73,7 @@ const dataSourceFormConfig = {
       ],
     },
   ],
-};
+});
 
 const fillConfig = (config: FormConfig): FormConfig => [...BaseFormConfig(), ...config, dataSourceFormConfig];
 

package/src/utils/props.ts

@@ -24,7 +24,7 @@ import {
   NODE_DISABLE_DATA_SOURCE_KEY,
 } from '@tmagic/core';
 import { tMagicMessage } from '@tmagic/design';
-import type { ChildConfig, FormConfig, TabConfig, TabPaneConfig } from '@tmagic/form';
+import type { ChildConfig, DisplayCondsConfig, FormConfig, TabConfig, TabPaneConfig } from '@tmagic/form';
 
 export const arrayOptions = [
   { text: '包含', value: 'include' },
@@ -168,7 +168,7 @@ export const advancedTabConfig: TabPaneConfig = {
   ],
 };
 
-export const displayTabConfig: TabPaneConfig = {
+export const displayTabConfig: TabPaneConfig<DisplayCondsConfig> = {
   title: '显示条件',
   display: (_state, { model }) => model.type !== 'page',
   items: [

package/types/index.d.ts

@@ -1566,7 +1566,7 @@ declare const numberOptions: {
 declare const styleTabConfig: TabPaneConfig;
 declare const eventTabConfig: TabPaneConfig;
 declare const advancedTabConfig: TabPaneConfig;
-declare const displayTabConfig: TabPaneConfig;
+declare const displayTabConfig: TabPaneConfig<DisplayCondsConfig>;
 /**
  * 统一为组件属性表单加上事件、高级、样式配置
  * @param config 组件属性配置
@@ -1938,13 +1938,13 @@ declare const __VLS_base$12: _vue_runtime_core0.DefineComponent<EditorProps, Ser
         inline: boolean;
         labelPosition: string;
         config: _tmagic_form_schema0.FormConfig;
+        height: string;
         initValues: Record<string, any>;
         lastValues: Record<string, any>;
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
         stepActive: string | number;
-        height: string;
       }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
         P: {};
         B: {};
@@ -1991,13 +1991,13 @@ declare const __VLS_base$12: _vue_runtime_core0.DefineComponent<EditorProps, Ser
         inline: boolean;
         labelPosition: string;
         config: _tmagic_form_schema0.FormConfig;
+        height: string;
         initValues: Record<string, any>;
         lastValues: Record<string, any>;
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
         stepActive: string | number;
-        height: string;
       }> | null>>;
       submit: (v: _tmagic_form_schema0.FormValue, eventData: ContainerChangeEventData$1) => Promise<void>;
     }, {}, {}, {}, _vue_runtime_core0.ComponentOptionsMixin, _vue_runtime_core0.ComponentOptionsMixin, {
@@ -2086,13 +2086,13 @@ declare const __VLS_base$12: _vue_runtime_core0.DefineComponent<EditorProps, Ser
       inline: boolean;
       labelPosition: string;
       config: _tmagic_form_schema0.FormConfig;
+      height: string;
       initValues: Record<string, any>;
       lastValues: Record<string, any>;
       isCompare: boolean;
       keyProp: string;
       parentValues: Record<string, any>;
       stepActive: string | number;
-      height: string;
     }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
       P: {};
       B: {};
@@ -2139,13 +2139,13 @@ declare const __VLS_base$12: _vue_runtime_core0.DefineComponent<EditorProps, Ser
       inline: boolean;
       labelPosition: string;
       config: _tmagic_form_schema0.FormConfig;
+      height: string;
       initValues: Record<string, any>;
       lastValues: Record<string, any>;
       isCompare: boolean;
       keyProp: string;
       parentValues: Record<string, any>;
       stepActive: string | number;
-      height: string;
     }> | null>>;
     submit: (v: _tmagic_form_schema0.FormValue, eventData: ContainerChangeEventData$1) => Promise<void>;
   }> & {} & _vue_runtime_core0.ComponentCustomProperties & {} & {
@@ -2249,13 +2249,13 @@ declare const __VLS_base$12: _vue_runtime_core0.DefineComponent<EditorProps, Ser
         inline: boolean;
         labelPosition: string;
         config: _tmagic_form_schema0.FormConfig;
+        height: string;
         initValues: Record<string, any>;
         lastValues: Record<string, any>;
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
         stepActive: string | number;
-        height: string;
       }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
         P: {};
         B: {};
@@ -2302,13 +2302,13 @@ declare const __VLS_base$12: _vue_runtime_core0.DefineComponent<EditorProps, Ser
         inline: boolean;
         labelPosition: string;
         config: _tmagic_form_schema0.FormConfig;
+        height: string;
         initValues: Record<string, any>;
         lastValues: Record<string, any>;
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
         stepActive: string | number;
-        height: string;
       }> | null>>;
       submit: (v: _tmagic_form_schema0.FormValue, eventData: ContainerChangeEventData$1) => Promise<void>;
     }, {}, {}, {}, _vue_runtime_core0.ComponentOptionsMixin, _vue_runtime_core0.ComponentOptionsMixin, {
@@ -2397,13 +2397,13 @@ declare const __VLS_base$12: _vue_runtime_core0.DefineComponent<EditorProps, Ser
       inline: boolean;
       labelPosition: string;
       config: _tmagic_form_schema0.FormConfig;
+      height: string;
       initValues: Record<string, any>;
       lastValues: Record<string, any>;
       isCompare: boolean;
       keyProp: string;
       parentValues: Record<string, any>;
       stepActive: string | number;
-      height: string;
     }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
       P: {};
       B: {};
@@ -2450,13 +2450,13 @@ declare const __VLS_base$12: _vue_runtime_core0.DefineComponent<EditorProps, Ser
       inline: boolean;
       labelPosition: string;
       config: _tmagic_form_schema0.FormConfig;
+      height: string;
       initValues: Record<string, any>;
       lastValues: Record<string, any>;
       isCompare: boolean;
       keyProp: string;
       parentValues: Record<string, any>;
       stepActive: string | number;
-      height: string;
     }> | null>>;
     submit: (v: _tmagic_form_schema0.FormValue, eventData: ContainerChangeEventData$1) => Promise<void>;
   }> & {} & _vue_runtime_core0.ComponentCustomProperties & {} & {
@@ -2539,9 +2539,9 @@ declare const __VLS_export$32: _vue_runtime_core0.DefineComponent<__VLS_Props$30
   onInitd?: ((...args: any[]) => any) | undefined;
 }>, {
   options: monaco_editor0.editor.IStandaloneEditorConstructionOptions;
-  initValues: any;
   language: string;
   parse: boolean;
+  initValues: any;
   autoSave: boolean;
   disabledFullScreen: boolean;
 }, {}, {}, {}, string, _vue_runtime_core0.ComponentProvideOptions, false, {}, any>;
@@ -2914,13 +2914,13 @@ declare const __VLS_base$7: _vue_runtime_core0.DefineComponent<__VLS_Props$13, {
         inline: boolean;
         labelPosition: string;
         config: _tmagic_form_schema0.FormConfig;
+        height: string;
         initValues: Record<string, any>;
         lastValues: Record<string, any>;
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
         stepActive: string | number;
-        height: string;
       }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
         P: {};
         B: {};
@@ -2967,13 +2967,13 @@ declare const __VLS_base$7: _vue_runtime_core0.DefineComponent<__VLS_Props$13, {
         inline: boolean;
         labelPosition: string;
         config: _tmagic_form_schema0.FormConfig;
+        height: string;
         initValues: Record<string, any>;
         lastValues: Record<string, any>;
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
         stepActive: string | number;
-        height: string;
       }> | null>>;
       submit: (v: FormValue, eventData: ContainerChangeEventData) => Promise<void>;
     }, {}, {}, {}, _vue_runtime_core0.ComponentOptionsMixin, _vue_runtime_core0.ComponentOptionsMixin, {
@@ -3062,13 +3062,13 @@ declare const __VLS_base$7: _vue_runtime_core0.DefineComponent<__VLS_Props$13, {
       inline: boolean;
       labelPosition: string;
       config: _tmagic_form_schema0.FormConfig;
+      height: string;
       initValues: Record<string, any>;
       lastValues: Record<string, any>;
       isCompare: boolean;
       keyProp: string;
       parentValues: Record<string, any>;
       stepActive: string | number;
-      height: string;
     }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
       P: {};
       B: {};
@@ -3115,13 +3115,13 @@ declare const __VLS_base$7: _vue_runtime_core0.DefineComponent<__VLS_Props$13, {
       inline: boolean;
       labelPosition: string;
       config: _tmagic_form_schema0.FormConfig;
+      height: string;
       initValues: Record<string, any>;
       lastValues: Record<string, any>;
       isCompare: boolean;
       keyProp: string;
       parentValues: Record<string, any>;
       stepActive: string | number;
-      height: string;
     }> | null>>;
     submit: (v: FormValue, eventData: ContainerChangeEventData) => Promise<void>;
   }> & {} & _vue_runtime_core0.ComponentCustomProperties & {} & {
@@ -3224,13 +3224,13 @@ declare const __VLS_base$7: _vue_runtime_core0.DefineComponent<__VLS_Props$13, {
         inline: boolean;
         labelPosition: string;
         config: _tmagic_form_schema0.FormConfig;
+        height: string;
         initValues: Record<string, any>;
         lastValues: Record<string, any>;
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
         stepActive: string | number;
-        height: string;
       }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
         P: {};
         B: {};
@@ -3277,13 +3277,13 @@ declare const __VLS_base$7: _vue_runtime_core0.DefineComponent<__VLS_Props$13, {
         inline: boolean;
         labelPosition: string;
         config: _tmagic_form_schema0.FormConfig;
+        height: string;
         initValues: Record<string, any>;
         lastValues: Record<string, any>;
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
         stepActive: string | number;
-        height: string;
       }> | null>>;
       submit: (v: FormValue, eventData: ContainerChangeEventData) => Promise<void>;
     }, {}, {}, {}, _vue_runtime_core0.ComponentOptionsMixin, _vue_runtime_core0.ComponentOptionsMixin, {
@@ -3372,13 +3372,13 @@ declare const __VLS_base$7: _vue_runtime_core0.DefineComponent<__VLS_Props$13, {
       inline: boolean;
       labelPosition: string;
       config: _tmagic_form_schema0.FormConfig;
+      height: string;
       initValues: Record<string, any>;
       lastValues: Record<string, any>;
       isCompare: boolean;
       keyProp: string;
       parentValues: Record<string, any>;
       stepActive: string | number;
-      height: string;
     }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
       P: {};
       B: {};
@@ -3425,13 +3425,13 @@ declare const __VLS_base$7: _vue_runtime_core0.DefineComponent<__VLS_Props$13, {
       inline: boolean;
       labelPosition: string;
       config: _tmagic_form_schema0.FormConfig;
+      height: string;
       initValues: Record<string, any>;
       lastValues: Record<string, any>;
       isCompare: boolean;
       keyProp: string;
       parentValues: Record<string, any>;
       stepActive: string | number;
-      height: string;
     }> | null>>;
     submit: (v: FormValue, eventData: ContainerChangeEventData) => Promise<void>;
   }> & {} & _vue_runtime_core0.ComponentCustomProperties & {} & {
@@ -3510,13 +3510,13 @@ declare const __VLS_base$6: _vue_runtime_core0.DefineComponent<__VLS_Props$12, {
     inline: boolean;
     labelPosition: string;
     config: FormConfig;
+    height: string;
     initValues: Record<string, any>;
     lastValues: Record<string, any>;
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
     stepActive: string | number;
-    height: string;
   }, false, {}, {}, _vue_runtime_core0.GlobalComponents, _vue_runtime_core0.GlobalDirectives, string, {}, any, _vue_runtime_core0.ComponentProvideOptions, {
     P: {};
     B: {};
@@ -3563,13 +3563,13 @@ declare const __VLS_base$6: _vue_runtime_core0.DefineComponent<__VLS_Props$12, {
     inline: boolean;
     labelPosition: string;
     config: FormConfig;
+    height: string;
     initValues: Record<string, any>;
     lastValues: Record<string, any>;
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
     stepActive: string | number;
-    height: string;
   }> | null>>;
   submit: (v: FormValue, eventData: ContainerChangeEventData) => Promise<void>;
 }, {}, {}, {}, _vue_runtime_core0.ComponentOptionsMixin, _vue_runtime_core0.ComponentOptionsMixin, {