Merge branch 'develop' of https://github.com/betterdancing/tiny-engine into feat/ai-completions

Author: betterdancing

designer-demo/public/mock/bundle.json

@@ -4433,18 +4433,19 @@
                     "bindState": true,
                     "label": {
                       "text": {
-                        "zh_CN": "资源"
+                        "zh_CN": "资源选择"
                       }
                     },
                     "cols": 12,
                     "rules": [],
                     "widget": {
-                      "component": "InputConfigurator",
+                      "component": "SourceSelectConfigurator",
                       "props": {}
                     },
                     "description": {
                       "zh_CN": "src路径"
-                    }
+                    },
+                    "labelPosition": "top"
                   },
                   {
                     "property": "attributes3",

packages/build/vite-config/src/vite-plugins/devAliasPlugin.js

@@ -29,6 +29,7 @@ const getDevAlias = (useSourceAlias) => {
     '@opentiny/tiny-engine-plugin-bridge': path.resolve(basePath, 'packages/plugins/bridge/index.ts'),
     '@opentiny/tiny-engine-plugin-tutorial': path.resolve(basePath, 'packages/plugins/tutorial/index.ts'),
     '@opentiny/tiny-engine-plugin-robot': path.resolve(basePath, 'packages/plugins/robot/index.ts'),
+    '@opentiny/tiny-engine-plugin-resource': path.resolve(basePath, 'packages/plugins/resource/index.ts'),
     '@opentiny/tiny-engine-plugin-model-manager': path.resolve(basePath, 'packages/plugins/model-manager/index.ts'),
     '@opentiny/tiny-engine-settings-panel': path.resolve(basePath, 'packages/settings/panel/index.ts'),
     '@opentiny/tiny-engine-setting-events': path.resolve(basePath, 'packages/settings/events/index.ts'),

packages/canvas/render/src/builtin/CanvasCollection.ts

@@ -183,7 +183,7 @@ return new Promise((resolve, reject) => {
 this.dataSourceMap.${sourceName}.load().then((res) => {
   // 如果按照数据源面板的建议格式编写dataHandler
   // 那么dataSourceMap的res格式应该是：{ code: string, msg: string, data: {items: any[], total: number} }
-  resolve({ result: res.data.items, page: { total: res.data.total } });
+  resolve({ result: res?.data?.items || res?.data?.data || res?.data, page: { total: res?.data?.total || res?.data?.data?.length || res?.data?.length } });
 });
 });
 }`

packages/canvas/render/src/builtin/builtin.json

@@ -479,15 +479,16 @@
                     "bindState": true,
                     "label": {
                       "text": {
-                        "zh_CN": "src路径"
+                        "zh_CN": "资源选择"
                       }
                     },
                     "cols": 12,
                     "rules": [],
                     "widget": {
-                      "component": "InputConfigurator",
+                      "component": "SourceSelectConfigurator",
                       "props": {}
-                    }
+                    },
+                    "labelPosition": "top"
                   }
                 ]
               }

packages/configurator/src/index.ts

@@ -35,6 +35,7 @@ import ModelApiConfigurator from './model-api-configurator/ModelApiConfigurator.
 import OperatorGroupConfigurator from './operator-group-configurator/OperatorGroupConfigurator.vue'
 import BasicTagConfigurator from './basic-tag-configurator/BasicTagConfigurator.vue'
 import ClassConfigurator from './class-configurator/ClassConfigurator.vue'
+import SourceSelectConfigurator from './source-select-configurator/SourceSelectConfigurator.vue'
 
 import { I18nInput, MetaCodeEditor } from '@opentiny/tiny-engine-common'
 import './styles/vars.less'
@@ -77,6 +78,7 @@ export {
   OperatorGroupConfigurator,
   BasicTagConfigurator,
   ClassConfigurator,
+  SourceSelectConfigurator,
   MetaCodeEditor,
   I18nInput as I18nConfigurator,
   MetaCodeEditor as CodeConfigurator,

packages/configurator/src/model-common/constants.js

@@ -6,18 +6,18 @@ export const typeComponentsMap = {
       options: [
         {
           label: '是',
-          value: true,
+          value: true
         },
         {
           label: '否',
-          value: false,
-        },
+          value: false
+        }
       ]
-    },
+    }
   },
-  Date: { component: 'TinyDatePicker', props: { format: 'yyyy-MM-dd', valueFormat: 'yyyy-MM-dd' }},
+  Date: { component: 'TinyDatePicker', props: { format: 'yyyy-MM-dd', valueFormat: 'yyyy-MM-dd' } },
   Number: { component: 'TinyNumeric' },
   Enum: {
     component: 'TinySelect'
-  },
-};
+  }
+}