@tmagic/editor 1.4.9 → 1.4.11

package/src/hooks/use-data-source-method.ts

@@ -41,7 +41,7 @@ export const useDataSourceMethod = () => {
         return;
       }
 
-      let codeContent = method.content;
+      let codeContent = method.content || `({ params, dataSource, app }) => {\n  // place your code here\n}`;
 
       if (typeof codeContent !== 'string') {
         codeContent = codeContent.toString();

package/src/index.ts

@@ -21,13 +21,15 @@ import Code from './fields/Code.vue';
 import CodeLink from './fields/CodeLink.vue';
 import CodeSelect from './fields/CodeSelect.vue';
 import CodeSelectCol from './fields/CodeSelectCol.vue';
+import CondOpSelect from './fields/CondOpSelect.vue';
 import DataSourceFields from './fields/DataSourceFields.vue';
-import DataSourceFieldSelect from './fields/DataSourceFieldSelect.vue';
+import DataSourceFieldSelect from './fields/DataSourceFieldSelect/Index.vue';
 import DataSourceInput from './fields/DataSourceInput.vue';
 import DataSourceMethods from './fields/DataSourceMethods.vue';
 import DataSourceMethodSelect from './fields/DataSourceMethodSelect.vue';
 import DataSourceMocks from './fields/DataSourceMocks.vue';
 import DataSourceSelect from './fields/DataSourceSelect.vue';
+import DisplayConds from './fields/DisplayConds.vue';
 import EventSelect from './fields/EventSelect.vue';
 import KeyValue from './fields/KeyValue.vue';
 import PageFragmentSelect from './fields/PageFragmentSelect.vue';
@@ -68,7 +70,7 @@ export { default as DataSourceMethods } from './fields/DataSourceMethods.vue';
 export { default as DataSourceInput } from './fields/DataSourceInput.vue';
 export { default as DataSourceSelect } from './fields/DataSourceSelect.vue';
 export { default as DataSourceMethodSelect } from './fields/DataSourceMethodSelect.vue';
-export { default as DataSourceFieldSelect } from './fields/DataSourceFieldSelect.vue';
+export { default as DataSourceFieldSelect } from './fields/DataSourceFieldSelect/Index.vue';
 export { default as EventSelect } from './fields/EventSelect.vue';
 export { default as KeyValue } from './fields/KeyValue.vue';
 export { default as CodeBlockList } from './layouts/sidebar/code-block/CodeBlockList.vue';
@@ -84,6 +86,8 @@ export { default as Resizer } from './components/Resizer.vue';
 export { default as CodeBlockEditor } from './components/CodeBlockEditor.vue';
 export { default as FloatingBox } from './components/FloatingBox.vue';
 export { default as PageFragmentSelect } from './fields/PageFragmentSelect.vue';
+export { default as DisplayConds } from './fields/DisplayConds.vue';
+export { default as CondOpSelect } from './fields/CondOpSelect.vue';
 
 const defaultInstallOpt: InstallOptions = {
   // eslint-disable-next-line no-eval
@@ -114,5 +118,7 @@ export default {
     app.component('m-fields-data-source-method-select', DataSourceMethodSelect);
     app.component('m-fields-data-source-field-select', DataSourceFieldSelect);
     app.component('m-fields-page-fragment-select', PageFragmentSelect);
+    app.component('m-fields-display-conds', DisplayConds);
+    app.component('m-fields-cond-op-select', CondOpSelect);
   },
 };

package/src/layouts/Framework.vue

@@ -38,9 +38,10 @@
         </slot>
 
         <slot name="page-bar">
-          <PageBar :disabled-page-fragment="disabledPageFragment">
+          <PageBar :disabled-page-fragment="disabledPageFragment" :page-bar-sort-options="pageBarSortOptions">
             <template #page-bar-title="{ page }"><slot name="page-bar-title" :page="page"></slot></template>
             <template #page-bar-popover="{ page }"><slot name="page-bar-popover" :page="page"></slot></template>
+            <template #page-list-popover="{ list }"><slot name="page-list-popover" :list="list"></slot></template>
           </PageBar>
         </slot>
       </template>
@@ -63,7 +64,7 @@ import { computed, inject, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import { TMagicScrollbar } from '@tmagic/design';
 
 import SplitView from '@editor/components/SplitView.vue';
-import type { FrameworkSlots, GetColumnWidth, Services } from '@editor/type';
+import type { FrameworkSlots, GetColumnWidth, PageBarSortOptions, Services } from '@editor/type';
 import { getConfig } from '@editor/utils/config';
 
 import PageBar from './page-bar/PageBar.vue';
@@ -78,6 +79,7 @@ defineOptions({
 
 defineProps<{
   disabledPageFragment: boolean;
+  pageBarSortOptions?: PageBarSortOptions;
 }>();
 
 const DEFAULT_LEFT_COLUMN_WIDTH = 310;

package/src/layouts/page-bar/PageBar.vue

@@ -2,15 +2,19 @@
   <div class="m-editor-page-bar-tabs">
     <SwitchTypeButton v-if="!disabledPageFragment" v-model="active" />
 
-    <PageBarScrollContainer :type="active">
+    <PageBarScrollContainer :type="active" :page-bar-sort-options="pageBarSortOptions">
       <template #prepend>
         <AddButton :type="active"></AddButton>
+        <PageList :list="list">
+          <template #page-list-popover="{ list }"><slot name="page-list-popover" :list="list"></slot></template>
+        </PageList>
       </template>
 
       <div
         v-for="item in list"
         class="m-editor-page-bar-item"
         :key="item.id"
+        :page-id="item.id"
         :class="{ active: page?.id === item.id }"
         @click="switchPage(item.id)"
       >
@@ -61,11 +65,12 @@ import { Id, type MPage, type MPageFragment, NodeType } from '@tmagic/schema';
 import { isPage, isPageFragment } from '@tmagic/utils';
 
 import ToolButton from '@editor/components/ToolButton.vue';
-import type { Services } from '@editor/type';
+import type { PageBarSortOptions, Services } from '@editor/type';
 import { getPageFragmentList, getPageList } from '@editor/utils';
 
 import AddButton from './AddButton.vue';
 import PageBarScrollContainer from './PageBarScrollContainer.vue';
+import PageList from './PageList.vue';
 import SwitchTypeButton from './SwitchTypeButton.vue';
 
 defineOptions({
@@ -74,6 +79,7 @@ defineOptions({
 
 defineProps<{
   disabledPageFragment: boolean;
+  pageBarSortOptions?: PageBarSortOptions;
 }>();
 
 const active = ref<NodeType.PAGE | NodeType.PAGE_FRAGMENT>(NodeType.PAGE);

package/src/layouts/page-bar/PageBarScrollContainer.vue

@@ -34,11 +34,12 @@ import {
   type WatchStopHandle,
 } from 'vue';
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue';
+import Sortable, { SortableEvent } from 'sortablejs';
 
-import { NodeType } from '@tmagic/schema';
+import { Id, NodeType } from '@tmagic/schema';
 
 import Icon from '@editor/components/Icon.vue';
-import type { Services } from '@editor/type';
+import type { PageBarSortOptions, Services } from '@editor/type';
 
 defineOptions({
   name: 'MEditorPageBarScrollContainer',
@@ -46,23 +47,29 @@ defineOptions({
 
 const props = defineProps<{
   type: NodeType.PAGE | NodeType.PAGE_FRAGMENT;
+  pageBarSortOptions?: PageBarSortOptions;
 }>();
 
 const services = inject<Services>('services');
 const editorService = services?.editorService;
 const uiService = services?.uiService;
 
-const itemsContainer = ref<HTMLDivElement>();
+const itemsContainer = ref<HTMLElement>();
 const canScroll = ref(false);
 
 const showAddPageButton = computed(() => uiService?.get('showAddPageButton'));
+const showPageListButton = computed(() => uiService?.get('showPageListButton'));
 
 const itemsContainerWidth = ref(0);
 
 const setCanScroll = () => {
   // 减去新增、左移、右移三个按钮的宽度
   // 37 = icon width 16 + padding 10 * 2 + border-right 1
-  itemsContainerWidth.value = (pageBar.value?.clientWidth || 0) - 37 * 2 - (showAddPageButton.value ? 37 : 21);
+  itemsContainerWidth.value =
+    (pageBar.value?.clientWidth || 0) -
+    37 * 2 -
+    (showAddPageButton.value ? 37 : 21) -
+    (showPageListButton.value ? 37 : 0);
 
   nextTick(() => {
     if (itemsContainer.value) {
@@ -126,6 +133,35 @@ const crateWatchLength = (length: ComputedRef<number>) =>
         } else {
           scroll('end');
         }
+        if (length > 1) {
+          const el = document.querySelector('.m-editor-page-bar-items') as HTMLElement;
+          let beforeDragList: Id[] = [];
+          const options = {
+            ...{
+              dataIdAttr: 'page-id', // 获取排序后的数据
+              onStart: async (event: SortableEvent) => {
+                if (typeof props.pageBarSortOptions?.beforeStart === 'function') {
+                  await props.pageBarSortOptions.beforeStart(event, sortable);
+                }
+                beforeDragList = sortable.toArray();
+              },
+              onUpdate: async (event: SortableEvent) => {
+                await editorService?.sort(
+                  beforeDragList[event.oldIndex as number],
+                  beforeDragList[event.newIndex as number],
+                );
+                if (typeof props.pageBarSortOptions?.afterUpdate === 'function') {
+                  await props.pageBarSortOptions.afterUpdate(event, sortable);
+                }
+              },
+            },
+            ...{
+              ...(props.pageBarSortOptions ? props.pageBarSortOptions : {}),
+            },
+          };
+          if (!el) return;
+          const sortable = new Sortable(el, options);
+        }
       });
     },
     {

package/src/layouts/page-bar/PageList.vue

@@ -0,0 +1,55 @@
+<template>
+  <div
+    v-if="showPageListButton"
+    id="m-editor-page-bar-list-icon"
+    class="m-editor-page-bar-item m-editor-page-bar-item-icon"
+  >
+    <TMagicPopover popper-class="page-bar-popover" placement="top" :width="160" trigger="hover">
+      <div>
+        <slot name="page-list-popover" :list="list">
+          <ToolButton
+            v-for="(item, index) in list"
+            :data="{
+              type: 'button',
+              text: item.devconfig?.tabName || item.name || item.id,
+              handler: () => switchPage(item.id),
+            }"
+            :key="index"
+          ></ToolButton>
+        </slot>
+      </div>
+      <template #reference>
+        <TMagicIcon class="m-editor-page-list-menu-icon">
+          <Files></Files>
+        </TMagicIcon>
+      </template>
+    </TMagicPopover>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, inject } from 'vue';
+import { Files } from '@element-plus/icons-vue';
+
+import { TMagicIcon, TMagicPopover } from '@tmagic/design';
+import { Id, MPage, MPageFragment } from '@tmagic/schema';
+
+import ToolButton from '@editor/components/ToolButton.vue';
+import type { Services } from '@editor/type';
+defineOptions({
+  name: 'MEditorPageList',
+});
+
+defineProps<{
+  list: MPage[] | MPageFragment[];
+}>();
+
+const services = inject<Services>('services');
+const uiService = services?.uiService;
+const editorService = services?.editorService;
+
+const showPageListButton = computed(() => uiService?.get('showPageListButton'));
+const switchPage = (id: Id) => {
+  editorService?.select(id);
+};
+</script>

package/src/services/ui.ts

@@ -47,6 +47,7 @@ const state = reactive<UiState>({
   showRule: true,
   propsPanelSize: 'small',
   showAddPageButton: true,
+  showPageListButton: true,
   hideSlideBar: false,
   sideBarItems: [],
   navMenuRect: {

package/src/theme/data-source-field-select.scss

@@ -0,0 +1,16 @@
+.m-fields-data-source-field-select {
+  width: 100%;
+  .m-editor-data-source-field-select {
+    display: flex;
+    width: 100%;
+
+    .tmagic-design-select {
+      flex: 1;
+      margin-right: 10px;
+    }
+
+    .tmagic-design-cascader {
+      flex: 2;
+    }
+  }
+}

package/src/theme/page-bar.scss

@@ -18,6 +18,19 @@
   }
 }
 
+.m-editor-page-list-item {
+  display: flex;
+  width: 100%;
+  height: $--page-bar-height;
+  line-height: $--page-bar-height;
+  color: $--font-color;
+  z-index: 2;
+  overflow: hidden;
+  &:hover {
+    background-color: $--hover-color;
+  }
+}
+
 .m-editor-page-bar {
   display: flex;
   width: 100%;

package/src/theme/theme.scss

@@ -25,3 +25,4 @@
 @import "./floating-box.scss";
 @import "./page-fragment-select.scss";
 @import "./data-source-field.scss";
+@import "./data-source-field-select.scss";

package/src/type.ts

@@ -18,13 +18,15 @@
 
 import type { Component } from 'vue';
 import type EventEmitter from 'events';
+import Sortable, { Options, SortableEvent } from 'sortablejs';
 import type { PascalCasedProperties } from 'type-fest';
 
-import type { ChildConfig, ColumnConfig, FilterFunction, FormConfig, FormItem, Input } from '@tmagic/form';
+import type { ChildConfig, ColumnConfig, FilterFunction, FormConfig, FormItem, FormState, Input } from '@tmagic/form';
 import type {
   CodeBlockContent,
   CodeBlockDSL,
   DataSourceFieldType,
+  DataSourceSchema,
   Id,
   MApp,
   MContainer,
@@ -55,7 +57,6 @@ import type { StageOverlayService } from './services/stageOverlay';
 import type { StorageService } from './services/storage';
 import type { UiService } from './services/ui';
 import type { UndoRedo } from './utils/undo-redo';
-
 export interface FrameworkSlots {
   header(props: {}): any;
   nav(props: {}): any;
@@ -70,6 +71,7 @@ export interface FrameworkSlots {
   'page-bar'(props: {}): any;
   'page-bar-title'(props: { page: MPage | MPageFragment }): any;
   'page-bar-popover'(props: { page: MPage | MPageFragment }): any;
+  'page-list-popover'(props: { list: MPage[] | MPageFragment[] }): any;
 }
 
 export interface WorkspaceSlots {
@@ -238,6 +240,8 @@ export interface UiState {
   propsPanelSize: 'large' | 'default' | 'small';
   /** 是否显示新增页面按钮 */
   showAddPageButton: boolean;
+  /** 是否在页面工具栏显示呼起页面列表按钮 */
+  showPageListButton: boolean;
   /** 是否隐藏侧边栏 */
   hideSlideBar: boolean;
   /** 侧边栏面板配置 */
@@ -646,19 +650,38 @@ export interface DataSourceMethodSelectConfig extends FormItem {
 
 export interface DataSourceFieldSelectConfig extends FormItem {
   type: 'data-source-field-select';
-  /** 是否要编译成数据源的data。
+  /**
+   * 是否要编译成数据源的data。
    * key: 不编译，就是要数据源id和field name;
    * value: 要编译（数据源data[`${filed}`]）
    * */
   value?: 'key' | 'value';
   /** 是否严格的遵守父子节点不互相关联 */
-  checkStrictly?: boolean;
+  checkStrictly?:
+    | boolean
+    | ((
+        mForm: FormState | undefined,
+        data: {
+          model: Record<any, any>;
+          values: Record<any, any>;
+          parent?: Record<any, any>;
+          formValue: Record<any, any>;
+          prop: string;
+          config: DataSourceFieldSelectConfig;
+          dataSource?: DataSourceSchema;
+        },
+      ) => boolean);
   dataSourceFieldType?: DataSourceFieldType[];
   fieldConfig?: ChildConfig;
   /** 是否可以编辑数据源，disable表示的是是否可以选择数据源 */
   notEditable?: boolean | FilterFunction;
 }
 
+export interface CondOpSelectConfig extends FormItem {
+  type: 'cond-op';
+  parentFields?: string[];
+}
+
 /** 可新增的数据源类型选项 */
 export interface DatasourceTypeOption {
   /** 数据源类型 */
@@ -747,3 +770,11 @@ export interface EventBus extends EventEmitter {
 
 export type PropsFormConfigFunction = (data: { editorService: EditorService }) => FormConfig;
 export type PropsFormValueFunction = (data: { editorService: EditorService }) => Partial<MNode>;
+
+export type PartSortableOptions = Omit<Options, 'onStart' | 'onUpdate'>;
+export interface PageBarSortOptions extends PartSortableOptions {
+  /** 在onUpdate之后调用 */
+  afterUpdate?: (event: SortableEvent, sortable: Sortable) => void;
+  /** 在onStart之前调用 */
+  beforeStart?: (event: SortableEvent, sortable: Sortable) => void;
+}

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

@@ -1,6 +1,6 @@
 import { CascaderOption, FormConfig, FormState } from '@tmagic/form';
 import { DataSchema, DataSourceFieldType, DataSourceSchema } from '@tmagic/schema';
-import { isNumber } from '@tmagic/utils';
+import { DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, isNumber } from '@tmagic/utils';
 
 import BaseFormConfig from './formConfigs/base';
 import HttpFormConfig from './formConfigs/http';
@@ -215,10 +215,13 @@ export const getCascaderOptionsFromFields = (
       dataSourceFieldType.push('any');
     }
 
-    const children = getCascaderOptionsFromFields(field.fields, dataSourceFieldType);
+    let children: CascaderOption[] = [];
+    if (field.type && ['any', 'array', 'object'].includes(field.type)) {
+      children = getCascaderOptionsFromFields(field.fields, dataSourceFieldType);
+    }
 
     const item = {
-      label: field.title || field.name,
+      label: `${field.title || field.name}(${field.type})`,
       value: field.name,
       children,
     };
@@ -241,3 +244,6 @@ export const getCascaderOptionsFromFields = (
   });
   return child;
 };
+
+export const removeDataSourceFieldPrefix = (id?: string) =>
+  id?.replace(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, '') || '';

package/src/utils/props.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/naming-convention */
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
@@ -18,19 +19,17 @@
 
 import type { FormConfig, FormState, TabPaneConfig } from '@tmagic/form';
 
-import dataSourceService from '@editor/services/dataSource';
-
-const arrayOptions = [
+export const arrayOptions = [
   { text: '包含', value: 'include' },
   { text: '不包含', value: 'not_include' },
 ];
 
-const eqOptions = [
+export const eqOptions = [
   { text: '等于', value: '=' },
   { text: '不等于', value: '!=' },
 ];
 
-const numberOptions = [
+export const numberOptions = [
   { text: '大于', value: '>' },
   { text: '大于等于', value: '>=' },
   { text: '小于', value: '<' },
@@ -359,106 +358,10 @@ export const displayTabConfig: TabPaneConfig = {
   display: (vm: FormState, { model }: any) => model.type !== 'page',
   items: [
     {
-      type: 'groupList',
+      type: 'display-conds',
       name: 'displayConds',
       titlePrefix: '条件组',
-      expandAll: true,
-      items: [
-        {
-          type: 'table',
-          name: 'cond',
-          items: [
-            {
-              type: 'data-source-field-select',
-              name: 'field',
-              value: 'key',
-              label: '字段',
-              checkStrictly: false,
-              dataSourceFieldType: ['string', 'number', 'boolean', 'any'],
-            },
-            {
-              type: 'select',
-              options: (mForm, { model }) => {
-                const [id, ...fieldNames] = model.field;
-
-                const ds = dataSourceService.getDataSourceById(id);
-
-                let fields = ds?.fields || [];
-                let type = '';
-                (fieldNames || []).forEach((fieldName: string) => {
-                  const field = fields.find((f) => f.name === fieldName);
-                  fields = field?.fields || [];
-                  type = field?.type || '';
-                });
-
-                if (type === 'array') {
-                  return arrayOptions;
-                }
-
-                if (type === 'boolean') {
-                  return [
-                    { text: '是', value: 'is' },
-                    { text: '不是', value: 'not' },
-                  ];
-                }
-
-                if (type === 'number') {
-                  return [...eqOptions, ...numberOptions];
-                }
-
-                if (type === 'string') {
-                  return [...arrayOptions, ...eqOptions];
-                }
-
-                return [...arrayOptions, ...eqOptions, ...numberOptions];
-              },
-              label: '条件',
-              name: 'op',
-            },
-            {
-              label: '值',
-              items: [
-                {
-                  name: 'value',
-                  type: (mForm, { model }) => {
-                    const [id, ...fieldNames] = model.field;
-
-                    const ds = dataSourceService.getDataSourceById(id);
-
-                    let fields = ds?.fields || [];
-                    let type = '';
-                    (fieldNames || []).forEach((fieldName: string) => {
-                      const field = fields.find((f) => f.name === fieldName);
-                      fields = field?.fields || [];
-                      type = field?.type || '';
-                    });
-
-                    if (type === 'number') {
-                      return 'number';
-                    }
-
-                    if (type === 'boolean') {
-                      return 'select';
-                    }
-
-                    return 'text';
-                  },
-                  options: [
-                    { text: 'true', value: true },
-                    { text: 'false', value: false },
-                  ],
-                  display: (vm, { model }) => !['between', 'not_between'].includes(model.op),
-                },
-                {
-                  name: 'range',
-                  type: 'number-range',
-                  display: (vm, { model }) => ['between', 'not_between'].includes(model.op),
-                },
-              ],
-            },
-          ],
-        },
-      ],
+      defaultValue: [],
     },
   ],
 };

package/types/editorProps.d.ts

@@ -2,7 +2,7 @@ import type { EventOption } from '@tmagic/core';
 import type { FormConfig, FormState } from '@tmagic/form';
 import type { DataSourceSchema, Id, MApp, MNode } from '@tmagic/schema';
 import StageCore, { ContainerHighlightType, type CustomizeMoveableOptionsCallbackConfig, type GuidesOptions, type MoveableOptions, RenderType, type UpdateDragEl } from '@tmagic/stage';
-import type { ComponentGroup, DatasourceTypeOption, MenuBarData, MenuButton, MenuComponent, SideBarData, StageRect } from './type';
+import type { ComponentGroup, DatasourceTypeOption, MenuBarData, MenuButton, MenuComponent, PageBarSortOptions, SideBarData, StageRect } from './type';
 export interface EditorProps {
     /** 页面初始值 */
     modelValue?: MApp;
@@ -80,6 +80,8 @@ export interface EditorProps {
     /** 用于自定义组件树与画布的右键菜单 */
     customContentMenu?: (menus: (MenuButton | MenuComponent)[], type: string) => (MenuButton | MenuComponent)[];
     extendFormState?: (state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+    /** 页面顺序拖拽配置参数 */
+    pageBarSortOptions?: PageBarSortOptions;
 }
 export declare const defaultEditorProps: {
     renderType: RenderType;

package/types/fields/CondOpSelect.vue.d.ts

@@ -0,0 +1,17 @@
+import type { FieldProps } from '@tmagic/form';
+import type { CondOpSelectConfig } from '../type';
+declare const _default: import("vue").DefineComponent<__VLS_TypePropsToOption<FieldProps<CondOpSelectConfig>>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    change: (...args: any[]) => void;
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<FieldProps<CondOpSelectConfig>>>> & {
+    onChange?: ((...args: any[]) => any) | undefined;
+}, {}, {}>;
+export default _default;
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToOption<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;
+    };
+};

package/types/fields/DataSourceFieldSelect/FieldSelect.vue.d.ts

@@ -0,0 +1,36 @@
+import { type FilterFunction } from '@tmagic/form';
+import { DataSourceFieldType } from '@tmagic/schema';
+declare let __VLS_typeProps: {
+    /**
+     * 是否要编译成数据源的data。
+     * key: 不编译，就是要数据源id和field name;
+     * value: 要编译（数据源data[`${filed}`]）
+     * */
+    value?: 'key' | 'value';
+    disabled?: boolean;
+    checkStrictly?: boolean;
+    size?: 'large' | 'default' | 'small';
+    dataSourceFieldType?: DataSourceFieldType[];
+    /** 是否可以编辑数据源，disable表示的是是否可以选择数据源 */
+    notEditable?: boolean | FilterFunction;
+};
+type __VLS_PublicProps = {
+    'modelValue'?: string[] | any;
+} & typeof __VLS_typeProps;
+declare const _default: import("vue").DefineComponent<__VLS_TypePropsToOption<__VLS_PublicProps>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    "update:modelValue": (modelValue: any) => void;
+    change: (v: string[]) => void;
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<__VLS_PublicProps>>> & {
+    onChange?: ((v: string[]) => any) | undefined;
+    "onUpdate:modelValue"?: ((modelValue: any) => any) | undefined;
+}, {}, {}>;
+export default _default;
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToOption<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;
+    };
+};

package/types/fields/{DataSourceFieldSelect.vue.d.ts → DataSourceFieldSelect/Index.vue.d.ts}

@@ -1,5 +1,5 @@
 import type { FieldProps } from '@tmagic/form';
-import type { DataSourceFieldSelectConfig } from '../type';
+import type { DataSourceFieldSelectConfig } from '../../type';
 declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<FieldProps<DataSourceFieldSelectConfig>>, {
     disabled: boolean;
 }>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {