@cloudbase/weda-ui 3.5.0 → 3.5.2

package/dist/configs/components/wd-table.js

@@ -1,6 +1,89 @@
 import { defineConfig, Tuple, Type } from '../type-utils';
 import { WD_TABLE_PAGE_SIZE, WD_TABLE_SELECT_COLUMN } from '../../enum';
-const commonProperties = {
+import { genericErrorType } from '../type-utils/error';
+const expressionTemplate = `
+{{#if (helper_utils '===' $self.attributes.dataSourceType 'expression')}}
+[attributes]
+':dataSourceData'="[
+  {
+    _id: 'id1',
+    name: 'sam',
+    age: 18,
+    email: 'samzhang@qq.com',
+    role: 'student',
+    scores: [90, 89],
+    scoresDetail: [
+      {
+        '得分(score)': 90,
+        '学期(semester)': '第一学期',
+      },
+      {
+        '得分(score)': 89,
+        '学期(semester)': '第二学期',
+      },
+    ],
+  },
+  {
+    _id: 'id2',
+    name: 'tony',
+    age: 18,
+    email: 'tonyyang@qq.com',
+    role: 'student',
+    scores: [100, 90],
+    scoresDetail: [
+      {
+        '得分(score)': 100,
+        '学期(semester)': '第一学期',
+      },
+      {
+        '得分(score)': 90,
+        '学期(semester)': '第二学期',
+      },
+    ],
+  },
+]"
+
+connectorParams = {}
+
+[attributes.bindMetadata]
+datasource = {}
+enabledFieldNames = []
+selectedViewIds = []
+isNewData = false
+
+[attributes.bindConnectMetadata]
+datasource= {}
+
+[attributes.connectorMethod]
+name = ''
+outParams= []
+
+
+{{else if (helper_utils '===' $self.attributes.dataSourceType 'data-model')}}
+[attributes]
+connectorParams = {}
+[attributes.bindConnectMetadata]
+datasource= {}
+[attributes.connectorMethod]
+name = ''
+outParams= []
+
+{{else if (helper_utils '===' $self.attributes.dataSourceType 'custom-connector')}}
+[attributes.bindMetadata]
+datasource = {}
+enabledFieldNames = []
+selectedViewIds = []
+isNewData = false
+
+{{/if}}
+`;
+const template = `
+[attributes]
+supportManyRelated = true
+isSupportApis = false
+`;
+// 属性类型定义
+const data = Type.Object({
     dataSourceType: Type.StringEnum({
         title: '数据源',
         type: 'string',
@@ -11,6 +94,10 @@ const commonProperties = {
                 label: '数据模型',
                 value: 'data-model',
             },
+            {
+                label: '表达式',
+                value: 'expression',
+            },
             {
                 label: 'APIs',
                 value: 'custom-connector',
@@ -20,8 +107,8 @@ const commonProperties = {
         'x-linkages': [
             {
                 type: 'value:state',
-                target: '*( filterFields,bindMetadata,queryCondition,orderBy,orderType,defaultPageSize,defaultPageIndex)',
-                condition: "{{$self.value !='custom-connector'}}",
+                target: '*( filterFields,bindMetadata,queryCondition,orderBy,orderType)',
+                condition: "{{$self.value ==='data-model'}}",
                 state: {
                     display: true,
                 },
@@ -32,7 +119,29 @@ const commonProperties = {
             {
                 type: 'value:state',
                 target: '*(connectorParams,bindConnectMetadata,connectorMethod)',
-                condition: "{{$self.value=='custom-connector'}}",
+                condition: "{{$self.value==='custom-connector'}}",
+                state: {
+                    display: true,
+                },
+                otherwise: {
+                    display: false,
+                },
+            },
+            {
+                type: 'value:state',
+                target: '*(dataSourceData,recordKey,enableTotal,total)',
+                condition: "{{$self.value ==='expression'}}",
+                state: {
+                    display: true,
+                },
+                otherwise: {
+                    display: false,
+                },
+            },
+            {
+                type: 'value:state',
+                target: '*(defaultPageSize,defaultPageIndex)',
+                condition: "{{$self.value ==='expression'||$self.value ==='data-model'}}",
                 state: {
                     display: true,
                 },
@@ -40,6 +149,30 @@ const commonProperties = {
                     display: false,
                 },
             },
+            {
+                type: 'value:state',
+                target: '*(enableCellCustomOption,enableGlobalButton,enablePagination,enableRefreshBtn,enableTableHeightSizeBtn)',
+                condition: "{{$self.value ==='expression'&&$self.inputed}}",
+                state: {
+                    value: false,
+                },
+            },
+            {
+                type: 'value:state',
+                target: '*(enableCellCustomOption,enableGlobalButton,enablePagination,enableRefreshBtn,enableTableHeightSizeBtn)',
+                condition: "{{$self.value ==='data-model'&&$self.inputed}}",
+                state: {
+                    value: true,
+                },
+            },
+            {
+                type: 'value:state',
+                target: '*(enableCellCustomOption,enableGlobalButton,enablePagination,enableRefreshBtn,enableTableHeightSizeBtn)',
+                condition: "{{$self.value ==='custom-connector'&&$self.inputed}}",
+                state: {
+                    value: true,
+                },
+            },
             {
                 type: 'value:schema',
                 target: 'bindConnectMetadata',
@@ -89,6 +222,13 @@ const commonProperties = {
                     icon: 'database',
                     isShow: true,
                 },
+                {
+                    value: 'expression',
+                    text: '表达式',
+                    label: '表达式',
+                    icon: 'expression',
+                    isShow: true,
+                },
                 {
                     value: 'custom-connector',
                     text: 'APIs',
@@ -103,9 +243,29 @@ const commonProperties = {
         },
         description: '选择数据源类型',
     }),
-    bindMetadata: Type.BasicTypeUnion({
+    bindMetadata: Type.Object({
+        datasource: Type.Object({
+            title: Type.String({
+                title: '数据源名称',
+            }),
+            id: Type.String({
+                title: 'ID',
+            }),
+            name: Type.String({
+                title: '数据源标识',
+            }),
+        }, {
+            title: '数据源',
+        }),
+        enabledFieldNames: Type.Array(Type.String({ title: '自定义字段' })),
+        disabledFieldNames: Type.Array(Type.String({ title: '不展示字段' })),
+        isNewData: Type.Boolean({
+            title: '是否为历史数据，新数据用columns管理列',
+            default: 'false',
+        }),
+        selectedViewIds: Type.Optional(Type.Array(Type.String({ title: '选中视图id' }))),
+    }, {
         title: '数据模型',
-        type: 'object',
         'x-component': 'schema-selector',
         required: true,
         'x-component-props': {
@@ -117,34 +277,6 @@ const commonProperties = {
             'data-hidebind': true,
             itemClassName: 'ds-bind-form-item',
         },
-        properties: {
-            datasource: {
-                title: '数据源',
-                type: 'object',
-                properties: {},
-            },
-            enabledFieldNames: {
-                title: '自定义字段',
-                type: 'array',
-                items: {
-                    type: 'object',
-                    properties: {},
-                },
-            },
-            disabledFieldNames: {
-                title: '不展示字段',
-                type: 'array',
-                items: {
-                    type: 'object',
-                    properties: {},
-                },
-            },
-            isNewData: {
-                title: '是否为历史数据，新数据用columns管理列',
-                type: 'boolean',
-                default: 'false',
-            },
-        },
         'x-group': '数据',
         'x-index': 20,
         'x-linkages': [
@@ -189,12 +321,12 @@ const commonProperties = {
                 condition: '{{ Boolean($value && $value.datasource) }}',
                 target: 'orderBy',
                 schema: {
-                    enum: '{{getDataSourceValueOptions($value.datasource.name)}}',
+                    enum: '{{getDataSourceValueOptions($value.datasource.name, undefined, true)}}',
                 },
             },
             {
                 type: 'value:state',
-                condition: '{{!!$value && !!$value.datasource && !!$value.datasource.name && !!$form.values.orderBy && getDataSourceValueOptions($value.datasource.name).every(o => o.value !== $form.values.orderBy)}}',
+                condition: '{{!!$value && !!$value.datasource && !!$value.datasource.name && !!$form.values.orderBy && getDataSourceValueOptions($value.datasource.name, undefined, true).every(o => o.value !== $form.values.orderBy)}}',
                 target: 'orderBy',
                 state: {
                     value: '',
@@ -211,174 +343,220 @@ const commonProperties = {
         ],
         description: '展示数据的数据来源，包括数据模型/视图',
     }),
-    columnSets: Type.BasicTypeUnion({
+    dataSourceData: Type.Optional(Type.Array(Type.Object({}), {
+        title: '表达式',
         type: 'array',
-        title: '列管理',
-        items: {
-            type: 'object',
-            display: 'header',
-            'x-image': " this.genre === 'slot' ? 'https://qcloudimg.tencent-cloud.cn/raw/898556b063f82bdda5837ab0bfdf608b.svg' : 'https://qcloudimg.tencent-cloud.cn/raw/3ce8ddbaaae6b9e085fa40e5a64e4909.svg' ",
-            properties: {
-                key: {
-                    title: '绑定字段',
-                    default: '',
-                    type: 'string',
+        required: true,
+        description: '表格展示的数据，可选择变量。',
+        'x-component': 'jsontext',
+        'x-helper-text': '新特性：表格追加绑定表达式数据，原APIs路径优化为表达式。表格展示的数据，格式为数组。[查看示例](https://docs.cloudbase.net/lowcode/components/wedaUI/src/docs/compsdocs/database/WdTable#2-%E7%BB%91%E5%AE%9A%E8%A1%A8%E8%BE%BE%E5%BC%8F)',
+        'x-group': '数据',
+        'x-index': 25,
+        'x-linkages': [
+            {
+                type: 'value:schema',
+                target: 'columnSets',
+                schema: {
+                    'x-component-props': {
+                        dataSourceType: '{{$form.values.dataSourceType}}',
+                        expressionField: 'dataSourceData',
+                    },
+                },
+            },
+            {
+                type: 'value:schema',
+                target: '*(fixedFront,fixedEnd)',
+                schema: {
                     enum: [],
-                    'x-has-init': false,
-                    'x-init-key': '',
-                    'x-props': {
-                        clearable: true,
+                },
+            },
+        ],
+    })),
+    recordKey: Type.Optional(Type.String({
+        title: '数据主键',
+        type: 'string',
+        required: true,
+        default: '_id',
+        'x-index': 26,
+        'x-group': '数据',
+        'x-helper-text': '用于区分不同的数据，影响行选择、行编辑等功能。一般采用数据库中唯一自增ID。',
+        description: '用于区分不同的数据，影响行选择、行编辑等功能。一般采用数据库中唯一自增ID。',
+        'x-component': 'for-key',
+        'x-component-props': {
+            expressionField: 'dataSourceData',
+        },
+    })),
+    columnSets: Type.Array(Type.Object({
+        key: Type.StringEnum({
+            title: '绑定字段',
+            default: '',
+            enum: [
+                {
+                    label: '字段值',
+                    value: 'default',
+                },
+            ],
+            'x-has-init': false,
+            'x-init-key': '',
+            'x-props': {
+                clearable: true,
+            },
+            'x-linkages': [
+                {
+                    type: 'value:state',
+                    target: 'dataForm.header',
+                    condition: '{{ Boolean($self.value)}}',
+                    state: {
+                        value: "{{ $self.props['x-has-init'] ? ($self.props.enum.find(item => { return item.value === $self.value }) && $self.props.enum.find(item => { return item.value === $self.value }).header) : $form.values.dataForm.header}}",
                     },
-                    'x-linkages': [
-                        {
-                            type: 'value:state',
-                            target: 'dataForm.header',
-                            condition: '{{ Boolean($self.value)}}',
-                            state: {
-                                value: "{{ $self.props['x-has-init'] ? ($self.props.enum.find(item => { return item.value === $self.value }) && $self.props.enum.find(item => { return item.value === $self.value }).header) : $form.values.dataForm.header}}",
-                            },
-                        },
-                        {
-                            type: 'value:state',
-                            target: 'dataForm.slotKey',
-                            condition: '{{ Boolean($self.value)}}',
-                            state: {
-                                value: "{{$self.props['x-has-init'] ? Date.now().toString(36) + Math.ceil(Math.random() * 1000).toString(36) :$form.values.dataForm.slotKey}}",
-                            },
-                        },
-                        {
-                            type: 'value:schema',
-                            target: 'dataForm.key',
-                            schema: {
-                                'x-has-init': true,
-                                'x-init-key': "{{$self.props['x-has-init'] ? $self.props['x-init-key'] : $self.value}}",
-                            },
-                        },
-                        {
-                            type: 'value:visible',
-                            target: 'dataForm.isSort',
-                            condition: '{{ Boolean($self.value)}}',
-                        },
-                        {
-                            type: 'value:visible',
-                            target: 'dataForm.isExport',
-                            condition: '{{ Boolean($self.value)}}',
-                        },
-                    ],
                 },
-                header: {
-                    title: '标题',
-                    type: 'string',
-                    default: '添加列',
+                {
+                    type: 'value:state',
+                    target: 'dataForm.slotKey',
+                    condition: '{{ Boolean($self.value)}}',
+                    state: {
+                        value: "{{$self.props['x-has-init'] ? Date.now().toString(36) + Math.ceil(Math.random() * 1000).toString(36) :$form.values.dataForm.slotKey}}",
+                    },
                 },
-                genre: {
-                    title: '展示内容',
-                    type: 'string',
-                    default: 'default',
-                    'x-component': 'radio',
-                    enum: [
-                        {
-                            label: '字段值',
-                            value: 'default',
-                        },
-                        {
-                            label: '自定义内容',
-                            value: 'slot',
-                        },
-                    ],
-                    'x-linkages': [
-                        {
-                            type: 'value:visible',
-                            target: '*(dataForm.align)',
-                            condition: "{{$self.value=='default'}}",
-                        },
-                    ],
+                {
+                    type: 'value:schema',
+                    target: 'dataForm.key',
+                    schema: {
+                        'x-has-init': true,
+                        'x-init-key': "{{$self.props['x-has-init'] ? $self.props['x-init-key'] : $self.value}}",
+                    },
                 },
-                widthType: {
-                    title: '列宽',
-                    type: 'string',
-                    default: 'auto',
-                    enum: [
-                        {
-                            label: '自适应',
-                            value: 'auto',
-                        },
-                        {
-                            label: '自定义',
-                            value: 'custom',
-                        },
-                    ],
-                    'x-linkages': [
-                        {
-                            type: 'value:visible',
-                            target: '*(dataForm.width)',
-                            condition: "{{$self.value=='custom'}}",
-                        },
-                    ],
+                {
+                    type: 'value:visible',
+                    target: 'dataForm.isSort',
+                    condition: '{{ Boolean($self.value) && !Boolean($form.values.dataForm.isRelated) && Boolean($form.values.dataForm.format!=="one-many") && Boolean($form.values.dataForm.format!=="many-many") && Boolean($form.values.dataForm.format!=="one-one") && Boolean($form.values.dataForm.format!=="many-one") }}',
                 },
-                width: {
-                    title: '自定义列宽(px)',
-                    type: 'number',
-                    default: 120,
+                {
+                    type: 'value:visible',
+                    target: 'dataForm.isExport',
+                    condition: '{{ Boolean($self.value) && Boolean($form.values.dataForm.format!=="one-many") && Boolean($form.values.dataForm.format!=="many-many") && Boolean($form.values.dataForm.format!=="one-one") && Boolean($form.values.dataForm.format!=="many-one") }}',
                 },
-                align: {
-                    title: '对齐方式',
-                    type: 'string',
-                    default: 'left',
-                    enum: [
-                        {
-                            label: '左对齐',
-                            value: 'left',
-                        },
-                        {
-                            label: '右对齐',
-                            value: 'right',
-                        },
-                        {
-                            label: '居中对齐',
-                            value: 'center',
-                        },
-                    ],
+            ],
+        }),
+        header: Type.String({
+            title: '标题',
+            default: '添加列',
+        }),
+        genre: Type.StringEnum({
+            title: '展示内容',
+            type: 'string',
+            default: 'default',
+            'x-component': 'radio',
+            'x-props': {
+                'data-hidebind': true,
+            },
+            enum: [
+                {
+                    label: '字段值',
+                    value: 'default',
                 },
-                isSort: {
-                    title: '允许排序',
-                    type: 'boolean',
-                    default: 'true',
+                {
+                    label: '自定义内容',
+                    value: 'slot',
                 },
-                isExport: {
-                    title: '允许导出',
-                    type: 'boolean',
-                    default: 'true',
+            ],
+            'x-linkages': [
+                {
+                    type: 'value:visible',
+                    target: '*(dataForm.align)',
+                    condition: "{{$self.value=='default'}}",
                 },
-                slotKey: {
-                    title: '插槽名称后缀',
-                    default: '',
-                    type: 'string',
-                    display: false,
+            ],
+        }),
+        widthType: Type.String({
+            title: '列宽',
+            default: 'auto',
+            enum: [
+                {
+                    label: '自适应',
+                    value: 'auto',
                 },
-            },
-            default: {
-                key: '',
-                slotKey: 'isNew',
-                header: '请选择字段',
-                genre: 'default',
-                align: 'left',
-                isSort: true,
-                isExport: true,
-                width: 120,
-            },
+                {
+                    label: '自定义',
+                    value: 'custom',
+                },
+            ],
+            'x-linkages': [
+                {
+                    type: 'value:visible',
+                    target: '*(dataForm.width)',
+                    condition: "{{$self.value=='custom'}}",
+                },
+            ],
+        }),
+        width: Type.Number({
+            title: '自定义列宽(px)',
+            type: 'number',
+            default: 120,
+        }),
+        align: Type.StringEnum({
+            title: '对齐方式',
+            default: 'left',
+            enum: [
+                {
+                    label: '左对齐',
+                    value: 'left',
+                },
+                {
+                    label: '右对齐',
+                    value: 'right',
+                },
+                {
+                    label: '居中对齐',
+                    value: 'center',
+                },
+            ],
+        }),
+        isSort: Type.Boolean({
+            title: '允许排序',
+            type: 'boolean',
+            default: 'false',
+        }),
+        isExport: Type.Boolean({
+            title: '允许导出',
+            type: 'boolean',
+            default: 'true',
+        }),
+        slotKey: Type.Boolean({
+            title: '插槽名称后缀',
+            default: '',
+            type: 'string',
+            display: false,
+        }),
+        schema: Type.Optional(Type.Object({
+            name: Type.String(),
+            type: Type.String(),
+        }, {
+            title: '数据类型描述',
+            display: false,
+        })),
+    }, {
+        display: 'header',
+        'x-image': " this.genre === 'slot' ? 'https://qcloudimg.tencent-cloud.cn/raw/898556b063f82bdda5837ab0bfdf608b.svg' : 'https://qcloudimg.tencent-cloud.cn/raw/3ce8ddbaaae6b9e085fa40e5a64e4909.svg' ",
+        default: {
+            key: '',
+            slotKey: 'isNew',
+            header: '请选择字段',
+            genre: 'default',
+            align: 'left',
+            isSort: false,
+            isExport: true,
+            width: 120,
         },
+    }), {
+        title: '列管理',
         default: [],
         'x-component': 'column-list',
         'x-component-props': {
-            changeOnClose: true,
             label_add: '添加列',
             addDisabledTip: '已添加所有字段',
             isWdTable: true,
         },
-        'x-props': {
-            'data-hidebind': true,
-        },
         'x-linkages': [
             {
                 type: 'value:state',
@@ -416,32 +594,130 @@ const commonProperties = {
         'x-group': '表格列',
         description: '配置表格列，支持拖拽调整列排序',
     }),
-    defaultPageSize: Type.Optional(Type.StringEnum({
+    defaultPageSize: Type.Optional(Type.NumberEnum({
         title: '每页行数',
-        type: 'string',
-        default: '10',
+        type: 'number',
+        'x-runtime-default': 10,
         enum: Tuple(WD_TABLE_PAGE_SIZE),
         description: '配置PC端表格默认的每页行数',
-        'x-group': '表格行',
-        'x-index': 160,
+        'x-group': '分页器',
+        'x-index': 180,
     })),
     defaultPageIndex: Type.Optional(Type.Number({
         title: 'PC端默认页码',
         type: 'number',
-        default: 1,
+        'x-runtime-default': 1,
         description: '配置PC端表格默认的初始页码',
-        'x-group': '表格行',
-        'x-index': 170,
+        'x-group': '分页器',
+        'x-index': 185,
     })),
-};
-// 属性类型定义
-const data = Type.Object({
-    ...commonProperties,
-    queryCondition: Type.Optional(Type.BasicTypeUnion({
+    enableTotal: Type.Optional(Type.Boolean({
+        title: '启用动态分页',
+        type: 'boolean',
+        description: '开启后，可支持动态分页',
+        'x-helper-text': '默认为前端分页，启用后可实现动态加载数据   ',
+        'x-group': '分页器',
+        'x-index': 186,
+        default: false,
+        'x-linkages': [
+            {
+                type: 'value:visible',
+                target: '*(total)',
+                condition: '{{!!$self.value}}',
+            },
+        ],
+    })),
+    total: Type.Optional(Type.Number({
+        title: '数据总数',
+        type: 'number',
+        description: '默认为表达式输入的数组长度，请输入数据表实际数据总数。',
+        'x-helper-text': '默认为表达式输入的数组长度，请输入数据表实际数据总数。[详见后端分页指引](https://docs.cloudbase.net/lowcode/components/wedaUI/src/docs/compsdocs/database/WdTable#pagination)',
+        'x-group': '分页器',
+        'x-index': 187,
+    })),
+    supportManyRelated: Type.Optional(Type.Boolean({
+        title: '新添加',
+        description: '标记是否是新添加的表格组件',
+        'x-group': '数据',
+        default: false,
+        'x-platforms': [''],
+        'x-linkages': [
+            {
+                type: 'value:schema',
+                schema: {
+                    'x-component': 'datasource-condition-where-query-editor',
+                    'x-component-props': {
+                        propertyPath: 'queryCondition',
+                        dataSourcePath: 'bindMetadata.datasource.name',
+                        preWherePath: 'where',
+                        enableKeyIsRelation: true,
+                    },
+                },
+                condition: '{{ Boolean($self.value) }}',
+                target: '*(queryCondition)',
+            },
+            {
+                type: 'value:schema',
+                schema: {
+                    'x-component-props': {
+                        showSystemField: true,
+                        showView: false,
+                        showFieldSelect: false,
+                    },
+                },
+                condition: '{{ Boolean($self.value) }}',
+                target: '*(bindMetadata)',
+            },
+        ],
+    })),
+    isSupportApis: Type.Optional(Type.Boolean({
+        title: '是否支持apis',
+        'x-group': '数据',
+        display: false,
+        default: true,
+        'x-linkages': [
+            {
+                type: 'value:schema',
+                target: 'dataSourceType',
+                condition: '{{!$self.value}}',
+                schema: {
+                    enum: [
+                        {
+                            label: '数据模型',
+                            value: 'data-model',
+                        },
+                        {
+                            label: '表达式',
+                            value: 'expression',
+                        },
+                    ],
+                    'x-component-props': {
+                        defaultValue: 'data-model',
+                        options: [
+                            {
+                                value: 'data-model',
+                                text: '数据模型',
+                                label: '数据模型',
+                                icon: 'database',
+                                isShow: true,
+                            },
+                            {
+                                value: 'expression',
+                                text: '表达式',
+                                label: '表达式',
+                                icon: 'expression',
+                                isShow: true,
+                            },
+                        ],
+                    },
+                },
+            },
+        ],
+    })),
+    queryCondition: Type.Optional(Type.Array(Type.Object({}), {
         'x-index': 30,
         title: '数据筛选',
         'x-group': '数据',
-        type: 'array',
         items: {},
         'x-component': 'data-source-condition-selector',
         'x-component-props': {
@@ -462,7 +738,7 @@ const data = Type.Object({
         title: '排序字段',
         'x-group': '数据',
         type: 'string',
-        default: 'updatedAt',
+        'x-runtime-default': 'updatedAt',
         'x-props': {
             clearable: true,
         },
@@ -473,7 +749,7 @@ const data = Type.Object({
         title: '排序方式',
         'x-group': '数据',
         type: 'string',
-        default: 'desc',
+        'x-runtime-default': 'desc',
         enum: [
             {
                 label: '升序',
@@ -503,7 +779,7 @@ const data = Type.Object({
             },
         ],
         type: 'string',
-        default: 'filter',
+        'x-runtime-default': 'filter',
         'x-component': 'segment-radio',
         'x-component-props': {
             padding: 10,
@@ -522,7 +798,7 @@ const data = Type.Object({
         'x-component': 'mutilp-data-source-field-select',
         'x-component-props': {
             isWdTable: true,
-            'x-filter': " !(this.type === 'array' && this.format === '') && !(this.format === 'father-son' && this.default === '') && this.type !== 'object' && this.format !== 'x-file' && this.format !== 'x-image' && this.format !== 'x-rtf' ",
+            'x-filter': " !(this.type === 'array' && this.format === '') && !(this.format === 'father-son' && this.default === '') && this.type !== 'object' && this.format !== 'x-file' && this.format !== 'x-image' && this.format !== 'x-rtf' && this.format !== 'many-many' && this.format !== 'one-many'",
         },
         'x-props': {
             'data-hidebind': true,
@@ -531,9 +807,20 @@ const data = Type.Object({
         'x-group': '数据',
         description: '配置表格运行态的筛选器',
     })),
-    bindConnectMetadata: Type.Optional(Type.BasicTypeUnion({
+    bindConnectMetadata: Type.Optional(Type.Object({
+        datasource: Type.Optional(Type.Object({
+            title: Type.String({
+                title: 'API名',
+            }),
+            id: Type.String({
+                title: 'ID',
+            }),
+            name: Type.String({
+                title: '数据源标识',
+            }),
+        })),
+    }, {
         title: 'APIs',
-        type: 'object',
         'x-component': 'connector-select',
         'x-index': 80,
         'x-group': '数据',
@@ -552,7 +839,11 @@ const data = Type.Object({
         ],
         description: '展示数据的 APIs 来源选择',
     })),
-    connectorMethod: Type.Optional(Type.BasicTypeUnion({
+    connectorMethod: Type.Optional(Type.Object({
+        name: Type.Optional(Type.String({ title: '方法标识' })),
+        title: Type.Optional(Type.String({ title: '方法名' })),
+        outParams: Type.Object({}),
+    }, {
         title: '调用方法',
         type: 'object',
         'x-component': 'connector-method-select',
@@ -651,12 +942,20 @@ const data = Type.Object({
         'x-group': '数据',
         description: '对自定义 APIs 调用方法填充的表格列头排序图标进行显隐控制 ',
     })),
+    enableCellCustomOption: Type.Optional(Type.Boolean({
+        title: '操作列(最后一列)',
+        type: 'boolean',
+        'x-index': 130,
+        default: true,
+        'x-group': '表格列',
+        description: '开启后，可拖拽按钮等组件，放入大纲树的操作列节点或表格的操作列区域',
+    })),
     columnSelectType: Type.Optional(Type.StringEnum({
-        title: '数据选择列',
+        title: '数据选择列(首列)',
         type: 'string',
-        'x-index': 130,
+        'x-index': 135,
         enum: Tuple(WD_TABLE_SELECT_COLUMN),
-        default: 'select',
+        'x-runtime-default': 'select',
         'x-group': '表格列',
         description: '控制表格数据选择列的样式',
     })),
@@ -686,28 +985,34 @@ const data = Type.Object({
     })),
     emptyText: Type.Optional(Type.String({
         'x-group': '表格行',
-        'x-index': 175,
+        'x-index': 160,
         type: 'string',
         title: '空状态提示',
-        default: '暂无数据',
+        'x-runtime-default': '暂无数据',
         description: '无数据时的提示说明，内容为空时则不显示该提示',
-        remarks: '无数据时的提示说明，内容为空时则不显示该提示',
     })),
     rowColor: Type.Optional(Type.String({
         title: '行背景颜色',
         type: 'string',
         'x-component': 'color-string',
-        'x-index': 180,
+        'x-index': 170,
         'x-group': '表格行',
         description: '设置固定值或绑定低码方法，实现行背景颜色的改变',
     })),
-    enableCellCustomOption: Type.Optional(Type.Boolean({
-        title: '操作列',
+    enablePagination: Type.Optional(Type.Boolean({
+        title: '显示分页器',
         type: 'boolean',
-        'x-index': 190,
-        default: true,
-        'x-group': '操作配置',
-        description: '开启后，可拖拽按钮等组件，放入大纲树的操作列节点或表格的操作列区域',
+        'x-index': 175,
+        'x-runtime-default': true,
+        'x-group': '分页器',
+        description: '开启后，可支持表格分页',
+        'x-linkages': [
+            {
+                type: 'value:visible',
+                target: '*(defaultPageSize,defaultPageIndex,enableTotal)',
+                condition: '{{!!$self.value}}',
+            },
+        ],
     })),
     enableGlobalButton: Type.Optional(Type.Boolean({
         title: '全局按钮',
@@ -717,19 +1022,11 @@ const data = Type.Object({
         'x-group': '操作配置',
         description: '开启后，可拖拽按钮等组件，放入大纲树的全局按钮节点或表格的全局按钮区域',
     })),
-    enablePagination: Type.Optional(Type.Boolean({
-        title: '分页控件',
-        type: 'boolean',
-        'x-index': 210,
-        default: true,
-        'x-group': '操作配置',
-        description: '开启后，可支持表格分页',
-    })),
     enableRefreshBtn: Type.Optional(Type.Boolean({
         title: '刷新按钮',
         type: 'boolean',
         'x-index': 220,
-        default: true,
+        'x-runtime-default': true,
         'x-group': '操作配置',
         description: '开启后，可展示刷新按钮',
     })),
@@ -737,7 +1034,7 @@ const data = Type.Object({
         title: '行高调节按钮',
         type: 'boolean',
         'x-index': 230,
-        default: true,
+        'x-runtime-default': true,
         'x-group': '操作配置',
         description: '开启后，可支持调节行高',
     })),
@@ -805,34 +1102,60 @@ const data = Type.Object({
         },
     })),
 });
-const properties = Type.Object({
-    ...commonProperties,
-    records: Type.BasicTypeUnion({
-        title: '表格数据',
-        type: 'array',
-        description: '表格数据',
-    }),
-    total: Type.Number({
-        title: '表格数据总数',
-        type: 'number',
-        description: '表格数据总数',
-    }),
-    pageNo: Type.Number({
-        title: '页码',
-        type: 'number',
-        description: '表格当前页码',
-    }),
-    pageSize: Type.Number({
-        title: '页长',
-        type: 'number',
-        description: '每页显示行数',
-    }),
-    selectedRecords: Type.BasicTypeUnion({
-        title: '表格选中数据',
-        type: 'array',
-        description: '表格选中的数据',
+const properties = Type.Composite([
+    Type.Pick(data, [
+        'dataSourceType',
+        'bindMetadata',
+        'dataSourceData',
+        'columnSets',
+        'recordKey',
+        'defaultPageSize',
+        'defaultPageIndex',
+    ]),
+    Type.Object({
+        records: Type.Array(Type.Object({}), {
+            title: '表格数据',
+            description: '表格数据',
+        }),
+        total: Type.Number({
+            title: '表格数据总数',
+            type: 'number',
+            description: '表格数据总数',
+        }),
+        pageNo: Type.Number({
+            title: '页码',
+            type: 'number',
+            description: '表格当前页码',
+        }),
+        pageSize: Type.Number({
+            title: '页长',
+            type: 'number',
+            description: '每页显示行数',
+        }),
+        selectedRecords: Type.Array(Type.Object({}), {
+            title: '表格选中数据',
+            description: '表格选中的数据',
+        }),
+        error: genericErrorType,
+        sort: Type.Array(Type.Object({}), {
+            title: '表格排序的数据',
+            type: 'array',
+            description: '表格排序的数据，用于表格请求查询，格式与当前数据源协议一致。[详见查询协议示例](https://docs.cloudbase.net/lowcode/components/wedaUI/src/docs/compsdocs/database/WdTable#%E6%9F%A5%E8%AF%A2%E5%8D%8F%E8%AE%AE%E7%A4%BA%E4%BE%8B)',
+            // description:
+            //   '表格排序的数据，用于表格请求查询，格式与当前数据源协议一致。组件升级到2.30.0后，新添加的表格组件，数据模型查询协议升级为v2版本，已有表格组件仍沿用v1版本协议。v1版本协议的参数结构示例:[{"orderBy":"updateAt","orderType":"desc"}]，v2版本协议的参数结构示例:[{"updateAt":"desc"}]。',
+        }),
+        filter: Type.Any({
+            title: '表格筛选的数据',
+            description: '表格排序的数据，用于表格请求查询，格式与当前数据源协议一致。[详见查询协议示例](https://docs.cloudbase.net/lowcode/components/wedaUI/src/docs/compsdocs/database/WdTable#%E6%9F%A5%E8%AF%A2%E5%8D%8F%E8%AE%AE%E7%A4%BA%E4%BE%8B)',
+            // description:
+            //   '表格筛选的数据，用于表格请求查询，格式与当前数据源协议一致。组件升级到2.30.0后，新添加的表格组件，数据模型查询协议升级为v2版本，已有表格组件仍沿用v1版本协议。v1版本协议的参数结构示例:[{"key":"test","val":"1","rel":"search"}]，v2版本协议的参数结构示例:{"where":{"$and":[{"test":{"$search":"1"}}]}}。',
+        }),
+        dataSourceVersion: Type.String({
+            title: '数据源协议版本',
+            description: '数据源类型为数据模型时，当前表格支持的数据源协议版本',
+        }),
     }),
-});
+]);
 // export default
 const config = defineConfig({
     $schema: 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/schema/lcds_component.json',
@@ -973,8 +1296,8 @@ const config = defineConfig({
         {
             title: '点击表格行',
             name: 'tabTableRow',
-            detail: {
-                record: Type.BasicTypeUnion({
+            detail: Type.Object({
+                record: Type.Array(Type.Object({}), {
                     title: '选中行记录',
                     type: 'array',
                     description: '选中行记录',
@@ -989,35 +1312,123 @@ const config = defineConfig({
                     type: 'number',
                     description: '选中行index',
                 }),
-            },
+            }),
             description: '点击表格某一行时触发',
             'x-platforms': ['MOBILEWEB', 'PCWEB'],
         },
         {
             title: '选中行改变',
-            name: 'rowsSelect',
-            detail: {
-                data: Type.BasicTypeUnion({
+            name: 'rowsSelected',
+            detail: Type.Object({
+                data: Type.Array(Type.Object({}), {
                     title: '选中行记录',
                     type: 'array',
                     description: '选中行记录',
                 }),
-            },
+            }),
             description: '点击数据选择列（多选/单选列），改变已选中的行时触发',
             'x-platforms': ['MOBILEWEB', 'PCWEB'],
         },
         {
-            title: '数据查询成功',
+            title: '查询成功',
             name: 'querySuccess',
             description: '每次数据查询成功时均会触发，包括切换分页、修改筛选条件时',
             'x-platforms': ['MOBILEWEB', 'PCWEB'],
-            detail: {
-                data: Type.BasicTypeUnion({
+            detail: Type.Object({
+                data: Type.Object({
+                    data: Type.Unknown(),
+                    query: Type.Unknown(),
+                }, {
                     title: '查询结果,查询条件',
                     type: 'object',
                     description: '查询结果,查询条件',
                 }),
-            },
+            }),
+        },
+        {
+            title: '查询为空',
+            name: 'queryEmpty',
+            description: '每次数据查询成功时均会触发，包括切换分页、修改筛选条件时',
+            'x-platforms': ['MOBILEWEB', 'PCWEB'],
+            detail: Type.Object({
+                data: Type.Object({
+                    data: Type.Unknown(),
+                    query: Type.Unknown(),
+                }, {
+                    type: 'object',
+                    description: '查询结果,查询条件',
+                }),
+            }),
+        },
+        {
+            title: '查询失败',
+            name: 'queryFail',
+            description: '每次数据查询失败时均会触发，包括切换分页、修改筛选条件时',
+            'x-platforms': ['MOBILEWEB', 'PCWEB'],
+            detail: Type.Object({
+                error: genericErrorType,
+            }),
+        },
+        {
+            name: 'sort',
+            title: '点击排序',
+            detail: Type.Object({
+                sort: Type.Array(Type.Object({
+                    orderType: Type.String(),
+                    orderBy: Type.String(),
+                }), {
+                    title: '当前引起变更的排序信息',
+                    type: 'array',
+                    description: '当前引起变更的排序信息',
+                }),
+            }),
+            'x-platforms': ['MOBILEWEB', 'PCWEB'],
+            description: '点击排序',
+        },
+        {
+            name: 'onRefreshBtnClick',
+            title: '点击刷新按钮',
+            'x-platforms': ['MOBILEWEB', 'PCWEB'],
+            description: '点击刷新按钮',
+        },
+        {
+            name: 'onPagingChange',
+            title: '分页变化',
+            'x-platforms': ['MOBILEWEB', 'PCWEB'],
+            description: '分页变化',
+            detail: Type.Object({
+                query: Type.Object({
+                    pageIndex: Type.Number(),
+                    pageSize: Type.Number(),
+                }, {
+                    title: '分页信息',
+                    type: 'object',
+                    description: '分页信息',
+                }),
+            }),
+        },
+        {
+            name: 'onFilterChange',
+            title: '筛选器值变化',
+            'x-platforms': ['MOBILEWEB', 'PCWEB'],
+            description: '筛选面板搜索值变化/搜索触发回调',
+            detail: Type.Object({
+                searchValues: Type.Object({
+                    key: Type.String(),
+                    val: Type.String(),
+                    rel: Type.String(),
+                }, {
+                    title: '变更的目标值',
+                    type: 'object',
+                    description: '变更的目标值',
+                }),
+            }),
+        },
+        {
+            title: '选中行(已废弃)',
+            name: 'rowsSelect',
+            description: '点击数据选择列（多选/单选列），改变已选中的行时触发。可通过$w.组件id.selectedRecords获取选中行的详细数据。',
+            'x-platforms': ['MOBILEWEB', 'PCWEB'],
         },
     ],
     // 组件元信息
@@ -1041,6 +1452,18 @@ const config = defineConfig({
                 'connectorParams',
             ],
         },
+        templates: [
+            {
+                when: 'dataSourceType',
+                to: '$children',
+                body: expressionTemplate,
+            },
+            {
+                when: '$attached',
+                to: '$children',
+                body: template,
+            },
+        ],
     },
     configMeta: {
         docsUrl: 'https://docs.cloudbase.net/lowcode/components/wedaUI/src/docs/compsdocs/database/WdTable',
@@ -1084,10 +1507,14 @@ const config = defineConfig({
                 'x-index': 3,
                 expand: true,
             },
-            操作配置: {
+            分页器: {
                 'x-index': 4,
                 expand: true,
             },
+            操作配置: {
+                'x-index': 5,
+                expand: true,
+            },
         },
     },
     compConfig: {
@@ -1095,3 +1522,4 @@ const config = defineConfig({
     },
 });
 export default config;
+export const methods = config.methods;