Skip to content

Commit 5f3f840

Browse files
Merge branch 'opentiny:develop' into feat/resources
2 parents 6df11ab + 3e61fcd commit 5f3f840

File tree

71 files changed

+228
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+228
-136
lines changed

docs/extension-capabilities-tutorial/mcpService.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,20 +430,22 @@ mcpService.setOptions(remoteConfig)
430430

431431
### 高级配置
432432

433-
```typescript
433+
<pre>
434+
<code>
434435
import { getMetaApi } from '@opentiny/tiny-engine-meta-register'
435436

436437
const mcpService = getMetaApi('engine.service.mcp')
437438

438439
const advancedConfig = {
439-
proxyUrl: process.env.MCP_PROXY_URL || 'http://localhost:3000/mcp',
440-
connectToAgentServer: process.env.NODE_ENV === 'production',
440+
proxyUrl: process<wbr>.env.MCP_PROXY_URL || 'http://localhost:3000/mcp',
441+
connectToAgentServer: process<wbr>.env.NODE_ENV === 'production',
441442
reconnectAttempts: 5,
442443
reconnectInterval: 2000
443444
}
444445

445446
mcpService.setOptions(advancedConfig)
446-
```
447+
</code>
448+
</pre>
447449

448450
## 最佳实践
449451

packages/common/component/BlockDeployDialog.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272

7373
<script lang="ts">
7474
import { reactive, ref, watch } from 'vue'
75+
import type { Component } from 'vue'
7576
import {
7677
Checkbox as TinyCheckbox,
7778
Input as TinyInput,
@@ -87,13 +88,13 @@ import VueMonaco from './VueMonaco.vue'
8788
8889
export default {
8990
components: {
90-
TinyCheckbox,
91-
TinyButton,
91+
TinyCheckbox: TinyCheckbox as Component,
92+
TinyButton: TinyButton as Component,
9293
TinyDialogBox,
9394
TinyForm,
9495
TinyInput,
9596
TinyFormItem,
96-
TinyPopover,
97+
TinyPopover: TinyPopover as Component,
9798
VueMonaco
9899
},
99100
props: {

packages/common/component/BlockLinkEvent.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@
1717
</tiny-popover>
1818
</template>
1919

20-
<script lang="jsx">
20+
<script lang="tsx">
2121
import { reactive, computed } from 'vue'
22+
import type { Component } from 'vue'
2223
import { capitalize } from '@vue/shared'
2324
import { extend } from '@opentiny/vue-renderless/common/object'
2425
import { Input as TinyInput, Form as TinyForm, FormItem as TinyFormItem, Popover as TinyPopover } from '@opentiny/vue'
2526
import { useLayout, useModal, useCanvas, useBlock } from '@opentiny/tiny-engine-meta-register'
2627
2728
export default {
2829
components: {
29-
TinyPopover
30+
TinyPopover: TinyPopover as Component
3031
},
3132
props: {
3233
data: {

packages/common/component/BlockLinkField.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,16 @@
3030
</tiny-popover>
3131
</template>
3232

33-
<script lang="jsx">
33+
<script lang="tsx">
3434
import { reactive, computed } from 'vue'
35+
import type { Component } from 'vue'
3536
import { extend } from '@opentiny/vue-renderless/common/object'
3637
import { Input as TinyInput, Popover as TinyPopover } from '@opentiny/vue'
3738
import { useLayout, useModal, useCanvas, useBlock, useHistory } from '@opentiny/tiny-engine-meta-register'
3839
3940
export default {
4041
components: {
41-
TinyPopover
42+
TinyPopover: TinyPopover as Component
4243
},
4344
props: {
4445
data: {

packages/common/component/ConfigItem.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102

103103
<script lang="ts">
104104
import { inject, computed, watch, ref, reactive, provide } from 'vue'
105+
import type { Component } from 'vue'
105106
import { Popover, Tooltip } from '@opentiny/vue'
106107
import { IconWriting, IconHelpCircle, IconPlusCircle } from '@opentiny/vue-icon'
107108
import { typeOf } from '@opentiny/vue-renderless/common/type'
@@ -130,8 +131,8 @@ const hasRule = (required: any, rules: string | any[]) => {
130131
export default {
131132
components: {
132133
MultiTypeSelector,
133-
TinyPopover: Popover,
134-
TinyTooltip: Tooltip,
134+
TinyPopover: Popover as Component,
135+
TinyTooltip: Tooltip as Component,
135136
IconWriting: IconWriting(),
136137
IconPlusCircle: IconPlusCircle(),
137138
IconHelpCircle: IconHelpCircle()

packages/common/component/I18nInput.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
<script lang="ts">
3838
import { computed, ref, watchEffect } from 'vue'
39+
import type { Component } from 'vue'
3940
import { useTranslate } from '@opentiny/tiny-engine-meta-register'
4041
import { Input, Popover } from '@opentiny/vue'
4142
import { IconClose } from '@opentiny/vue-icon'
@@ -46,7 +47,7 @@ export default {
4647
components: {
4748
TinyInput: Input,
4849
BindI18n,
49-
TinyPopover: Popover,
50+
TinyPopover: Popover as Component,
5051
IconClose: IconClose()
5152
},
5253
inheritAttrs: false,

packages/common/component/LifeCycles.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,9 @@
8484
</tiny-dialog-box>
8585
</template>
8686

87-
<script lang="jsx">
87+
<script lang="tsx">
8888
import { reactive, ref, watchEffect, onBeforeUnmount } from 'vue'
89+
import type { Component } from 'vue'
8990
import { Button, DialogBox, Popover, Search } from '@opentiny/vue'
9091
import { useModal, usePage, useNotify, useCanvas } from '@opentiny/tiny-engine-meta-register'
9192
import { getMergeMeta } from '@opentiny/tiny-engine-meta-register'
@@ -100,7 +101,7 @@ const { OPEN_DELAY } = constants
100101
101102
export default {
102103
components: {
103-
TinyPopover: Popover,
104+
TinyPopover: Popover as Component,
104105
TinyDialogBox: DialogBox,
105106
TinySearch: Search,
106107
TinyButton: Button,

packages/common/component/LinkButton.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717

1818
<script lang="ts">
1919
import { TinyTooltip } from '@opentiny/vue'
20+
import type { Component } from 'vue'
2021
export default {
2122
components: {
22-
TinyTooltip
23+
TinyTooltip: TinyTooltip as Component
2324
},
2425
props: {
2526
href: {

packages/common/component/MetaListActions.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88

99
<script lang="ts">
1010
import { Tooltip } from '@opentiny/vue'
11+
import type { Component } from 'vue'
1112
1213
export default {
1314
components: {
14-
TinyTooltip: Tooltip
15+
TinyTooltip: Tooltip as Component
1516
},
1617
props: {
1718
actions: {

packages/common/component/MetaListItem.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,21 @@
7474

7575
<script lang="ts">
7676
import { reactive, watchEffect, ref, onMounted } from 'vue'
77+
import type { Component } from 'vue'
7778
import { Tooltip, Input, FormItem, Form, Popover, DialogBox, Button } from '@opentiny/vue'
7879
import { iconDel, iconEdit, iconMore, iconClose } from '@opentiny/vue-icon'
7980
import MaskModal from './MaskModal.vue'
8081
import MetaForm from './MetaForm.vue'
8182
8283
export default {
8384
components: {
84-
TinyTooltip: Tooltip,
85+
TinyTooltip: Tooltip as Component,
8586
TinyInput: Input,
8687
TinyFormItem: FormItem,
8788
TinyForm: Form,
88-
TinyPopover: Popover,
89+
TinyPopover: Popover as Component,
8990
TinyDialogBox: DialogBox,
90-
TinyButton: Button,
91+
TinyButton: Button as Component,
9192
MetaForm,
9293
MaskModal,
9394
IconDel: iconDel(),

0 commit comments

Comments
 (0)