@cloudbase/weda-ui 3.5.0 → 3.5.2

package/dist/configs/components/dataView.d.ts

@@ -0,0 +1,252 @@
+declare const config: {
+    $schema: string;
+    data: {
+        properties: {
+            dataSourceType: {
+                'x-index': number;
+                title: string;
+                'x-category': string;
+                type: string;
+                default: string;
+                enum: {
+                    label: string;
+                    value: string;
+                }[];
+                'x-linkages': ({
+                    type: string;
+                    target: string;
+                    condition: string;
+                    state: {
+                        display: boolean;
+                    };
+                    otherwise: {
+                        display: boolean;
+                    };
+                    schema?: undefined;
+                } | {
+                    type: string;
+                    target: string;
+                    schema: {
+                        'x-component-props': string;
+                    };
+                    condition?: undefined;
+                    state?: undefined;
+                    otherwise?: undefined;
+                })[];
+                'x-component': string;
+                'x-component-props': {
+                    defaultValue: string;
+                    options: {
+                        value: string;
+                        text: string;
+                        label: string;
+                        icon: string;
+                        isShow: boolean;
+                    }[];
+                };
+                'x-props': {
+                    'data-hidebind': boolean;
+                };
+                description: string;
+            };
+            datasource: {
+                'x-index': number;
+                title: string;
+                required: boolean;
+                type: string;
+                'x-category': string;
+                properties: {
+                    name: {
+                        title: string;
+                        type: string;
+                    };
+                    extra: {
+                        title: string;
+                        type: string;
+                        properties: {
+                            viewId: {
+                                title: string;
+                                type: string;
+                            };
+                            methodName: {
+                                title: string;
+                                type: string;
+                            };
+                        };
+                    };
+                };
+                'x-component': string;
+                'x-component-props': {
+                    dataContainerType: string;
+                };
+                'x-props': {
+                    'data-hidebind': boolean;
+                };
+                'x-linkages': ({
+                    type: string;
+                    target: string;
+                    schema: {
+                        'x-component-props': string;
+                    };
+                    condition?: undefined;
+                } | {
+                    type: string;
+                    condition: string;
+                    target: string;
+                    schema: {
+                        'x-component-props': string;
+                    };
+                })[];
+                description: string;
+            };
+            bindConnectMetadata: {
+                title: string;
+                type: string;
+                required: boolean;
+                'x-component': string;
+                'x-index': number;
+                'x-category': string;
+                'x-linkages': {
+                    type: string;
+                    target: string;
+                    schema: {
+                        'x-component-props': string;
+                    };
+                }[];
+                'x-props': {
+                    'data-hidebind': boolean;
+                };
+                description: string;
+            };
+            dataSourceData: {
+                title: string;
+                type: string;
+                required: boolean;
+                'x-category': string;
+                description: string;
+                'x-component': string;
+                'x-helper-text': string;
+                'x-index': number;
+            };
+            exprToFieldsSchema: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            connectorMethod: {
+                title: string;
+                type: string;
+                required: boolean;
+                'x-component': string;
+                'x-index': number;
+                'x-category': string;
+                'x-props': {
+                    'data-hidebind': boolean;
+                };
+                description: string;
+            };
+            connectorParams: {
+                title: string;
+                type: string;
+                'x-index': number;
+                'x-category': string;
+                description: string;
+                'x-component': string;
+                'x-component-props': {
+                    dataSourceKeyName: string;
+                    dataSourceValuePath: string;
+                    methodNameKeyName: string;
+                    methodValuePath: string;
+                    paramsKeyName: string;
+                };
+            };
+            queryCondition: {
+                'x-index': number;
+                title: string;
+                'x-category': string;
+                type: string;
+                items: {};
+                'x-component': string;
+                'x-component-props': {
+                    propertyPath: string;
+                    dataSourcePath: string;
+                    preWherePath: string;
+                };
+                'x-props': {
+                    'data-hidebind': boolean;
+                    'data-hideBindValue': boolean;
+                    'data-withBindMeta': boolean;
+                };
+                description: string;
+            };
+            isSupportApis: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
+        };
+    };
+    events: ({
+        name: string;
+        title: string;
+        description: string;
+        detail?: undefined;
+    } | {
+        name: string;
+        title: string;
+        description: string;
+        detail: import("@sinclair/typebox").TObject<{
+            error: import("@sinclair/typebox").TObject<{
+                requestid: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+                message: import("@sinclair/typebox").TString;
+                code: import("@sinclair/typebox").TString;
+            }>;
+        }>;
+    })[];
+    properties: import("@sinclair/typebox").TObject<{
+        record: import("@sinclair/typebox").TObject<{}>;
+    }>;
+    methods: ({
+        name: string;
+        label: string;
+        params?: undefined;
+    } | {
+        name: string;
+        label: string;
+        params: {
+            properties: {
+                _id: {
+                    title: string;
+                    type: string;
+                    default: string;
+                };
+            };
+        };
+    })[];
+    compConfig: {
+        isDataContainer: boolean;
+        componentType: string;
+    };
+    isContainer: boolean;
+    meta: {
+        title: string;
+        category: string;
+        description: string;
+        categoryOrder: number;
+        componentOrder: number;
+        icon: string;
+        templates: {
+            when: string;
+            body: string;
+        }[];
+        group: {
+            数据: {
+                'x-index': number;
+                expand: boolean;
+            };
+        };
+    };
+    configMeta: {
+        docsUrl: string;
+        shortcut: {
+            props: string[];
+        };
+        contextData: {
+            setField: boolean;
+            setRelated: boolean;
+        };
+    };
+};
+export default config;

package/dist/configs/components/dataView.js

@@ -1,6 +1,6 @@
 import { Type } from '../type-utils';
+import { genericErrorType } from '../type-utils/error';
 const rawTemplate = `
-{{#with (helper_getFields _datasourceName _methodName (helper_utils '?:' (helper_utils '===' _datasourceName 'sys_user') true false) false) as |_fields|}}
 {{#with (helper_utils 'concat' 'string' 'number' 'boolean') as |_rangeTypes|}}
 
 [[template]]
@@ -93,7 +93,7 @@ component='WdText'
 {{else if (helper_utils 'isEqual' _format 'x-enum')}}
 ':text'='app.utils.formatEnum($w.item_{{repeater_suffix}}, \`{{helper_utils 'get' _field 'x-option-name'}}\`, app)'
 {{else}}
-':text'='$w.item_{{repeater_suffix}} || \`-\`'
+':text'='$w.item_{{repeater_suffix}}'
 {{/if}}
 {{/if}}
 [template.items.items.items.items.extra.commonStyle]
@@ -123,9 +123,9 @@ component='WdText'
 {{else if (helper_utils 'isEqual' _format 'x-enum')}}
 ':text'='app.utils.formatEnum($w.{{$self.id}}.record.{{_name}}, \`{{helper_utils 'get' _field 'x-option-name'}}\`, app)'
 {{else if (helper_utils 'includes' (helper_utils 'concat' 'father-son' 'related') _format)}}
-':text'='$w.{{$self.id}}.record?.[\`@{{_name}}\`]?.v1?.record?.[$w.{{$self.id}}.record?.[\`@{{_name}}\`]?.v1?.primaryColumn] || $w.{{$self.id}}.record.{{_name}} || \`-\`'
+':text'='$w.{{$self.id}}.record?.[\`@{{_name}}\`]?.v1?.record?.[$w.{{$self.id}}.record?.[\`@{{_name}}\`]?.v1?.primaryColumn] || $w.{{$self.id}}.record.{{_name}}'
 {{else}}
-':text'='$w.{{$self.id}}.record.{{_name}} || \`-\`'
+':text'='$w.{{$self.id}}.record.{{_name}}'
 {{/if}}
 {{/if}}
 [template.items.items.items.items.extra.commonStyle]
@@ -143,38 +143,99 @@ whiteSpace = 'pre-line'
 {{/with}}
 {{/each}}
 
-{{/with}}
 {{/with}}
 `;
 const $attached_template = `
 {{#with $self as |$self|}}
 {{#with 'sys_user' as |_datasourceName| }}
 {{#with 'wedaGetRecords' as |_methodName| }}
+{{#with (helper_getFields _datasourceName _methodName (helper_utils '?:' (helper_utils '===' _datasourceName 'sys_user') true false) false) as |_fields|}}
 ${rawTemplate}
 {{/with}}
 {{/with}}
 {{/with}}
+{{/with}}
 
 
 [attributes]
+isSupportApis = false
 ':queryCondition'='[{"$and":[{"$and":[{"type":{"$eq":0}}]}]}]'
 [attributes.datasource]
 type='datamodal'
 name='sys_user'
 `;
-const attributes_tempate = `
+const attributes_template = `
 {{#with $self as |$self|}}
+{{#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)': '第二学期',
+      },
+    ],
+  }"
+{{else}}
 {{#with (helper_utils '?:' (helper_utils 'isEqual' $self.attributes.dataSourceType 'data-model') $self.attributes.datasource.name $self.attributes.bindConnectMetadata.datasource.name) as |_datasourceName| }}
 {{#with (helper_utils '?:' (helper_utils 'isEqual' $self.attributes.dataSourceType 'data-model') 'wedaGetRecords' $self.attributes.connectorMethod.name) as |_methodName| }}
+{{#with (helper_getFields _datasourceName _methodName (helper_utils '?:' (helper_utils '===' _datasourceName 'sys_user') true false) false) as |_fields|}}
 ${rawTemplate}
 {{/with}}
 {{/with}}
+{{/with}}
+
+{{/if}}
+
 {{/with}}
 `;
+const expression_template = `
+{{#with $self as |$self|}}
+{{#if (helper_utils '===' $self.attributes.dataSourceType 'expression')}}
+{{#with  $self.editStateData.exprToFieldsSchema  as |_fields|}}
+${rawTemplate}
+{{/with}}
+
+{{else}}
+{{#with (helper_utils '?:' (helper_utils 'isEqual' $self.attributes.dataSourceType 'data-model') $self.attributes.datasource.name $self.attributes.bindConnectMetadata.datasource.name) as |_datasourceName| }}
+{{#with (helper_utils '?:' (helper_utils 'isEqual' $self.attributes.dataSourceType 'data-model') 'wedaGetRecords' $self.attributes.connectorMethod.name) as |_methodName| }}
+{{#with (helper_getFields _datasourceName _methodName (helper_utils '?:' (helper_utils '===' _datasourceName 'sys_user') true false) false) as |_fields|}}
+${rawTemplate}
+{{/with}}
+{{/with}}
+{{/with}}
+
+{{/if}}
+{{/with}}
+`;
+const query_condition_template = `
+{{#with $self as |$self|}}
+{{#with (helper_utils '?:' (helper_utils 'isEqual' $self.attributes.dataSourceType 'data-model') $self.attributes.datasource.name $self.attributes.bindConnectMetadata.datasource.name) as |_datasourceName| }}
+{{#with (helper_utils '?:' (helper_utils 'isEqual' $self.attributes.dataSourceType 'data-model') 'wedaGetRecords' $self.attributes.connectorMethod.name) as |_methodName| }}
+{{#with (helper_getFields _datasourceName _methodName (helper_utils '?:' (helper_utils '===' _datasourceName 'sys_user') true false) false) as |_fields|}}
+${rawTemplate}
+{{/with}}
+{{/with}}
+{{/with}}
+{{/with}}
+
+[attributes]
+':queryCondition'='[]'
+`;
 const properties = Type.Object({
-    record: Type.BasicTypeUnion({
+    record: Type.Object({}, {
         title: '数据记录',
-        type: 'object',
         description: '数据记录',
     }),
 });
@@ -185,7 +246,7 @@ const config = {
             dataSourceType: {
                 'x-index': 5,
                 title: '数据源',
-                'x-category': '基础属性',
+                'x-category': '数据',
                 type: 'string',
                 default: 'data-model',
                 enum: [
@@ -193,6 +254,10 @@ const config = {
                         label: '数据模型',
                         value: 'data-model',
                     },
+                    {
+                        label: '表达式',
+                        value: 'expression',
+                    },
                     {
                         label: 'APIs',
                         value: 'custom-connector',
@@ -202,7 +267,7 @@ const config = {
                     {
                         type: 'value:state',
                         target: '*(orderType,queryCondition,orderBy,datasource)',
-                        condition: "{{$self.value !='custom-connector'}}",
+                        condition: "{{$self.value ==='data-model'}}",
                         state: {
                             display: true,
                         },
@@ -221,6 +286,17 @@ const config = {
                             display: false,
                         },
                     },
+                    {
+                        type: 'value:state',
+                        target: '*(dataSourceData,exprToFieldsSchema)',
+                        condition: "{{$self.value=='expression'}}",
+                        state: {
+                            display: true,
+                        },
+                        otherwise: {
+                            display: false,
+                        },
+                    },
                     {
                         type: 'value:schema',
                         target: 'bindConnectMetadata',
@@ -247,6 +323,13 @@ const config = {
                             icon: 'database',
                             isShow: true,
                         },
+                        {
+                            value: 'expression',
+                            text: '表达式',
+                            label: '表达式',
+                            icon: 'expression',
+                            isShow: true,
+                        },
                         {
                             value: 'custom-connector',
                             text: 'APIs',
@@ -259,14 +342,14 @@ const config = {
                 'x-props': {
                     'data-hidebind': true,
                 },
-                remarks: '数据源类型选择',
+                description: '数据源类型选择',
             },
             datasource: {
                 'x-index': 10,
                 title: '数据模型',
                 required: true,
                 type: 'object',
-                'x-category': '基础属性',
+                'x-category': '数据',
                 properties: {
                     name: {
                         title: '数据模型名',
@@ -311,7 +394,7 @@ const config = {
                         },
                     },
                 ],
-                remarks: '展示模型数据的数据来源',
+                description: '展示模型数据的数据来源',
             },
             bindConnectMetadata: {
                 title: 'APIs',
@@ -319,7 +402,7 @@ const config = {
                 required: true,
                 'x-component': 'connector-select',
                 'x-index': 12,
-                'x-category': '基础属性',
+                'x-category': '数据',
                 'x-linkages': [
                     {
                         type: 'value:schema',
@@ -332,26 +415,49 @@ const config = {
                 'x-props': {
                     'data-hidebind': true,
                 },
-                remarks: '展示数据的APIs来源选择',
+                description: '展示数据的APIs来源选择',
             },
+            dataSourceData: {
+                title: '表达式',
+                type: 'object',
+                required: true,
+                'x-category': '数据',
+                description: '数据详情展示的数据，可选择变量。',
+                'x-component': 'jsontext',
+                'x-helper-text': '新特性：数据详情追加绑定表达式数据，原APIs路径优化为表达式。注意：当输入的表达式变化时，会触发自动生成详情字段。因此建议先输入表达式再调整样式。[查看示例](https://docs.cloudbase.net/lowcode/components/wedaUI/src/docs/compsdocs/database/DataView#2-%E7%BB%91%E5%AE%9A%E8%A1%A8%E8%BE%BE%E5%BC%8F)',
+                'x-index': 14,
+            },
+            exprToFieldsSchema: Type.Optional(Type.String({
+                title: '',
+                type: 'string',
+                'x-props': {
+                    'data-hidebind': true,
+                },
+                'x-category': '数据',
+                'x-index': 15,
+                'x-component': 'expr-to-fields-schema',
+                'x-component-props': {
+                    expressionField: 'dataSourceData',
+                },
+            })),
             connectorMethod: {
                 title: '调用方法',
                 type: 'object',
                 required: true,
                 'x-component': 'connector-method-select',
                 'x-index': 16,
-                'x-category': '基础属性',
+                'x-category': '数据',
                 'x-props': {
                     'data-hidebind': true,
                 },
-                remarks: '展示数据的APIs调用方法选择',
+                description: '展示数据的APIs调用方法选择',
             },
             connectorParams: {
                 title: '查询入参',
                 type: 'string',
                 'x-index': 18,
-                'x-category': '基础属性',
-                remarks: "对APIs调用方法获取的数据进行筛选过滤。支持对象类型，例如 {name:'',value:''}",
+                'x-category': '数据',
+                description: "对APIs调用方法获取的数据进行筛选过滤。支持对象类型，例如 {name:'',value:''}",
                 'x-component': 'property-object-params-field',
                 'x-component-props': {
                     dataSourceKeyName: 'bindConnectMetadata',
@@ -364,7 +470,7 @@ const config = {
             queryCondition: {
                 'x-index': 20,
                 title: '数据筛选',
-                'x-category': '基础属性',
+                'x-category': '数据',
                 type: 'array',
                 items: {},
                 'x-component': 'data-source-condition-selector',
@@ -378,25 +484,73 @@ const config = {
                     'data-hideBindValue': true,
                     'data-withBindMeta': true,
                 },
-                remarks: '对数据进行筛选过滤',
+                description: '对数据进行筛选过滤',
             },
+            isSupportApis: Type.Optional(Type.Boolean({
+                title: '是否支持apis',
+                'x-category': '数据',
+                'x-index': 30,
+                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,
+                                    },
+                                ],
+                            },
+                        },
+                    },
+                ],
+            })),
         },
     },
     events: [
         {
             name: 'queryEmpty',
             title: '查询为空',
-            remarks: '数据查询为空时触发',
+            description: '数据查询为空时触发',
         },
         {
             name: 'querySuccess',
             title: '查询成功',
-            remarks: '数据查询成功时触发',
+            description: '数据查询成功时触发',
         },
         {
             name: 'queryFail',
             title: '查询失败',
-            remarks: '数据查询失败时触发',
+            description: '数据查询失败时触发',
+            detail: Type.Object({
+                error: genericErrorType,
+            }),
         },
     ],
     // 组件实例属性
@@ -438,10 +592,24 @@ const config = {
                 body: $attached_template,
             },
             {
-                when: 'datasource,connectorMethod,dataSourceType',
-                body: attributes_tempate,
+                when: 'connectorMethod,dataSourceType',
+                body: attributes_template,
+            },
+            {
+                when: 'exprToFieldsSchema',
+                body: expression_template,
+            },
+            {
+                when: 'datasource',
+                body: query_condition_template,
             },
         ],
+        group: {
+            ['数据']: {
+                'x-index': 1,
+                expand: true,
+            },
+        },
     },
     configMeta: {
         docsUrl: 'https://docs.cloudbase.net/lowcode/components/wedaUI/src/docs/compsdocs/database/DataView',