Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: data-source dependency configurator package #622

Merged
merged 4 commits into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import { IconClose, IconLanguage } from '@opentiny/vue-icon'
import { computed, ref, watchEffect } from 'vue'

export default {
name: 'I18nInput',
components: {
TinyInput: Input,
BindI18n,
Expand Down
1 change: 1 addition & 0 deletions packages/common/component/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export { default as MetaList } from './MetaList.vue'
export { default as MetaChildItem } from './MetaChildItem.vue'
export { default as SplitPanes } from './SplitPanes.vue'
export { default as Pane } from './Pane.vue'
export { default as I18nInput } from './I18nInput.vue'
export { default as Modal } from './Modal.jsx'
export { default as Notify } from './Notify.jsx'
export { ConfigGroup, ConfigItem, SaveNewBlock }
Expand Down
7 changes: 4 additions & 3 deletions packages/configurator/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import DatePickerConfigurator from './date-picker-configurator/DatePickerConfigu
import GroupItemConfigurator from './group-item-configurator/GroupItemConfigurator.vue'
import HtmlAttributesConfigurator from './html-attributes-configurator/HtmlAttributesConfigurator.vue'
import HtmlTextConfigurator from './html-text-configurator/HtmlTextConfigurator.vue'
import I18nConfigurator from './i18n-configurator/I18nConfigurator.vue'
import InputConfigurator from './input-configurator/InputConfigurator.vue'
import IpSectionConfigurator from './ip-section-configurator/IpSectionConfigurator.vue'
import JsSlotConfigurator from './js-slot-configurator/JsSlotConfigurator.vue'
Expand All @@ -30,6 +29,8 @@ import SwitchConfigurator from './switch-configurator/SwitchConfigurator.vue'
import TableColumnsConfigurator from './table-columns-configurator/TableColumnsConfigurator.vue'
import VariableConfigurator from './variable-configurator/VariableConfigurator.vue'

import { I18nInput } from '@opentiny/tiny-engine-common'

export {
ArrayItemConfigurator,
ButtonGroupConfigurator,
Expand All @@ -45,7 +46,6 @@ export {
GroupItemConfigurator,
HtmlAttributesConfigurator,
HtmlTextConfigurator,
I18nConfigurator,
InputConfigurator,
IpSectionConfigurator,
JsSlotConfigurator,
Expand All @@ -62,9 +62,10 @@ export {
SwitchConfigurator,
TableColumnsConfigurator,
VariableConfigurator,
I18nInput as I18nConfigurator,
lichunn marked this conversation as resolved.
Show resolved Hide resolved
// 暂时保留Meta开头的旧组件名
ArrayItemConfigurator as MetaArrayItem,
I18nConfigurator as MetaBindI18n,
I18nInput as MetaBindI18n,
VariableConfigurator as MetaBindVariable,
ButtonGroupConfigurator as MetaButtonGroup,
CheckBoxConfigurator as MetaCheckBox,
Expand Down
1 change: 0 additions & 1 deletion packages/plugins/bridge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"license": "MIT",
"homepage": "https://opentiny.design/tiny-engine",
"dependencies": {
"@opentiny/tiny-engine-canvas": "workspace:*",
"@opentiny/tiny-engine-common": "workspace:*",
"@opentiny/tiny-engine-meta-register": "workspace:*",
"@opentiny/tiny-engine-http": "workspace:*"
Expand Down
1 change: 0 additions & 1 deletion packages/plugins/datasource/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"homepage": "https://opentiny.design/tiny-engine",
"dependencies": {
"@opentiny/tiny-engine-configurator": "workspace:*",
"@opentiny/tiny-engine-canvas": "workspace:*",
"@opentiny/tiny-engine-common": "workspace:*",
"@opentiny/tiny-engine-meta-register": "workspace:*",
"@opentiny/tiny-engine-http": "workspace:*",
Expand Down
7 changes: 3 additions & 4 deletions packages/plugins/datasource/src/DataSourceFieldForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div v-if="editable" class="field-content">
<tiny-form ref="form" label-position="left" :rules="rules" :model="state.field" validate-type="text">
<tiny-form-item class="title-content" prop="title" label="字段名称" label-width="150px">
<i18n-configurator v-model="state.field.title"></i18n-configurator>
<i18n-input v-model="state.field.title"></i18n-input>
</tiny-form-item>
<tiny-form-item class="name-content" prop="name" label="字段唯一标识" label-width="150px">
<tiny-input class="filedName" v-model="state.field.name"></tiny-input>
Expand All @@ -36,8 +36,7 @@
<script>
import { reactive, watchEffect, ref, provide } from 'vue'
import { Button, Input, FormItem, Form } from '@opentiny/vue'
import { ButtonGroup, SvgButton } from '@opentiny/tiny-engine-common'
import { I18nConfigurator } from '@opentiny/tiny-engine-configurator'
import { ButtonGroup, SvgButton, I18nInput } from '@opentiny/tiny-engine-common'
import { iconArrowDown } from '@opentiny/vue-icon'
import DataSourceFieldCheck from './DataSourceFieldCheck.vue'

Expand All @@ -52,7 +51,7 @@ export default {
TinyForm: Form,
TinyFormItem: FormItem,
iconArrowDown: iconArrowDown(),
I18nConfigurator,
I18nInput,
DataSourceFieldCheck
},
props: {
Expand Down