fix: data-source dependency configurator package

packages/canvas/index.js

@@ -11,7 +11,6 @@
  */
 import { CanvasBreadcrumb } from './breadcrumb'
 export { createRender } from './render'
-export { CanvasDragItem } from './drag-drop'
 
 // meta app
 import CanvasContainer from './container'

packages/canvas/drag-drop/src/CanvasDragItem.vue → packages/common/component/CanvasDragItem.vue

@@ -17,6 +17,7 @@ export default {
   emits: ['click'],
   setup(props, { emit }) {
     const canvasApi = getMetaApi('engine.canvas').canvasApi
+
     const dragstart = (e) => {
       if (props.data && canvasApi.value?.dragStart) {
         const data = deepClone(props.data)

packages/configurator/src/i18n-configurator/I18nConfigurator.vue → packages/common/component/I18nInput.vue

@@ -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,

packages/configurator/src/code-configurator/CodeConfigurator.vue → packages/common/component/MetaCodeEditor.vue

@@ -66,7 +66,7 @@
 </template>
 
 <script>
-import { VueMonaco } from '@opentiny/tiny-engine-common'
+import VueMonaco from './VueMonaco'
 import { formatString } from '@opentiny/tiny-engine-common/js/ast'
 import i18n from '@opentiny/tiny-engine-common/js/i18n'
 import { Button, DialogBox } from '@opentiny/vue'

packages/common/component/index.js

@@ -27,6 +27,7 @@ export { default as MetaListItem } from './MetaListItem.vue'
 export { default as MetaModal, useModal } from './MetaModal.vue'
 export { default as MetaModalItem } from './MetaModalItem.vue'
 export { default as MetaPopover } from './MetaPopover.vue'
+export { default as MetaCodeEditor } from './MetaCodeEditor.vue'
 export { default as VideoGuide } from './VideoGuide.vue'
 export { default as MonacoEditor } from './MonacoEditor.vue'
 export { default as BlockHistoryList } from './BlockHistoryList.vue'
@@ -51,6 +52,8 @@ 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 CanvasDragItem } from './CanvasDragItem.vue'
 export { default as Modal } from './Modal.jsx'
 export { default as Notify } from './Notify.jsx'
 export { ConfigGroup, ConfigItem, SaveNewBlock }

packages/configurator/src/index.js

@@ -3,7 +3,6 @@ import ButtonGroupConfigurator from './button-group-configurator/ButtonGroupConf
 import CascaderConfigurator from './cascader-configurator/CascaderConfigurator.vue'
 import CheckBoxConfigurator from './checkbox-configurator/CheckBoxConfigurator.vue'
 import CheckboxGroupConfigurator from './checkbox-group-configurator/CheckboxGroupConfigurator.vue'
-import CodeConfigurator from './code-configurator/CodeConfigurator.vue'
 import CodeListConfigurator from './code-list-configurator/CodeListConfigurator.vue'
 import CollectionConfigurator from './collection-configurator/CollectionConfigurator.vue'
 import ColorConfigurator from './color-configurator/ColorConfigurator.vue'
@@ -12,7 +11,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'
@@ -30,13 +28,14 @@ import SwitchConfigurator from './switch-configurator/SwitchConfigurator.vue'
 import TableColumnsConfigurator from './table-columns-configurator/TableColumnsConfigurator.vue'
 import VariableConfigurator from './variable-configurator/VariableConfigurator.vue'
 
+import { I18nInput, MetaCodeEditor } from '@opentiny/tiny-engine-common'
+
 export {
   ArrayItemConfigurator,
   ButtonGroupConfigurator,
   CascaderConfigurator,
   CheckBoxConfigurator,
   CheckboxGroupConfigurator,
-  CodeConfigurator,
   CodeListConfigurator,
   CollectionConfigurator,
   ColorConfigurator,
@@ -45,7 +44,6 @@ export {
   GroupItemConfigurator,
   HtmlAttributesConfigurator,
   HtmlTextConfigurator,
-  I18nConfigurator,
   InputConfigurator,
   IpSectionConfigurator,
   JsSlotConfigurator,
@@ -62,14 +60,16 @@ export {
   SwitchConfigurator,
   TableColumnsConfigurator,
   VariableConfigurator,
+  MetaCodeEditor,
+  I18nInput as I18nConfigurator,
+  MetaCodeEditor as CodeConfigurator,
   // 暂时保留Meta开头的旧组件名
   ArrayItemConfigurator as MetaArrayItem,
-  I18nConfigurator as MetaBindI18n,
+  I18nInput as MetaBindI18n,
   VariableConfigurator as MetaBindVariable,
   ButtonGroupConfigurator as MetaButtonGroup,
   CheckBoxConfigurator as MetaCheckBox,
   CascaderConfigurator as MetaCascader,
-  CodeConfigurator as MetaCodeEditor,
   CodeListConfigurator as MetaCodeEditorList,
   ColorConfigurator as MetaColor,
   DatePickerConfigurator as MetaDatePicker,

packages/configurator/src/related-editor-configurator/RelatedEditorConfigurator.vue

@@ -3,7 +3,7 @@
     <div v-if="isBindingState" class="meta-binding-state">
       {{ `已绑定：${modelValue?.value}` }}
     </div>
-    <code-configurator
+    <meta-code-editor
       v-else
       :modelValue="modelValue"
       :language="language"
@@ -14,20 +14,20 @@
       :showFormatBtn="showFormatBtn"
       :showErrorMsg="showErrorMsg"
       @update:modelValue="saveValue"
-    ></code-configurator>
+    ></meta-code-editor>
     <variable-configurator :modelValue="bindValue" :name="name" @update:modelValue="saveValue"></variable-configurator>
   </div>
 </template>
 
 <script>
 import { onMounted, ref, watchEffect } from 'vue'
 import { useMessage, useCanvas } from '@opentiny/tiny-engine-meta-register'
-import CodeConfigurator from '../code-configurator/CodeConfigurator.vue'
+import { MetaCodeEditor } from '@opentiny/tiny-engine-common'
 import VariableConfigurator from '../variable-configurator/VariableConfigurator.vue'
 
 export default {
   components: {
-    CodeConfigurator,
+    MetaCodeEditor,
     VariableConfigurator
   },
   props: {

packages/plugins/block/package.json

@@ -24,8 +24,6 @@
   "license": "MIT",
   "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:*",

packages/plugins/block/src/BlockPropertyForm.vue

@@ -22,15 +22,15 @@
         </div>
       </tiny-form-item>
       <tiny-form-item label="属性面板组件属性">
-        <code-configurator
+        <meta-code-editor
           :modelValue="widgetProps"
           title="属性面板组件属性"
           button-text="设置"
           language="json"
           :tips="componentPropsTips"
           @save="handleSaveWidgetProps"
         >
-        </code-configurator>
+        </meta-code-editor>
       </tiny-form-item>
       <tiny-form-item v-if="showArrayItemConfig" label="配置项">
         <meta-list-items class="config-list" :optionsList="arrayConfig">
@@ -86,24 +86,24 @@
         <tiny-input v-model="label"></tiny-input>
       </tiny-form-item>
       <tiny-form-item label="获取属性值">
-        <code-configurator
+        <meta-code-editor
           :modelValue="getterValue"
           title="获取属性值"
           button-text="getter"
           language="javascript"
           single
           @save="(...args) => saveAccessor('getter', ...args)"
-        ></code-configurator>
+        ></meta-code-editor>
       </tiny-form-item>
       <tiny-form-item label="设置属性值">
-        <code-configurator
+        <meta-code-editor
           :modelValue="setterValue"
           title="设置属性值"
           button-text="setter"
           language="javascript"
           single
           @save="(...args) => saveAccessor('setter', ...args)"
-        ></code-configurator>
+        ></meta-code-editor>
       </tiny-form-item>
       <div v-if="property.linked" class="linked-info">
         链接到组件: {{ property.linked.componentName }} 属性: {{ property.linked.property }}
@@ -122,8 +122,7 @@ import {
   Tooltip as TinyTooltip
 } from '@opentiny/vue'
 import { iconChevronLeft, iconPlusCircle } from '@opentiny/vue-icon'
-import { ConfigItem, MetaListItems } from '@opentiny/tiny-engine-common'
-import { CodeConfigurator } from '@opentiny/tiny-engine-configurator'
+import { ConfigItem, MetaListItems, MetaCodeEditor } from '@opentiny/tiny-engine-common'
 import { getEditProperty, DEFAULT_ARRAY_CONFIG, META_COMPONENTS_ENUM } from './js/blockSetting'
 import {
   itemConfig,
@@ -155,7 +154,7 @@ export default {
     TinySelect,
     TinyFormItem,
     ConfigItem,
-    CodeConfigurator,
+    MetaCodeEditor,
     IconChevronLeft: iconChevronLeft(),
     IconPlusCircle: iconPlusCircle(),
     MetaListItems,

packages/plugins/bridge/package.json

@@ -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:*"

packages/plugins/data/package.json

@@ -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:*",

packages/plugins/datasource/package.json

@@ -24,8 +24,6 @@
   "license": "MIT",
   "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:*",

packages/plugins/datasource/src/DataSourceFieldForm.vue

@@ -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>
@@ -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'
 
@@ -52,7 +51,7 @@ export default {
     TinyForm: Form,
     TinyFormItem: FormItem,
     iconArrowDown: iconArrowDown(),
-    I18nConfigurator,
+    I18nInput,
     DataSourceFieldCheck
   },
   props: {

packages/plugins/materials/package.json

@@ -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:*",

packages/plugins/materials/src/meta/component/src/Main.vue

@@ -32,10 +32,9 @@
 <script>
 import { inject, onMounted, reactive, ref } from 'vue'
 import { Collapse, CollapseItem, Search } from '@opentiny/vue'
-import { SearchEmpty } from '@opentiny/tiny-engine-common'
+import { SearchEmpty, CanvasDragItem } from '@opentiny/tiny-engine-common'
 import { iconSearch } from '@opentiny/vue-icon'
 import { useMaterial, useCanvas } from '@opentiny/tiny-engine-meta-register'
-import { CanvasDragItem } from '@opentiny/tiny-engine-canvas'
 
 export default {
   components: {

packages/plugins/page/package.json

@@ -24,7 +24,6 @@
   "license": "MIT",
   "homepage": "https://opentiny.design/tiny-engine",
   "dependencies": {
-    "@opentiny/tiny-engine-configurator": "workspace:*",
     "@opentiny/tiny-engine-common": "workspace:*",
     "@opentiny/tiny-engine-meta-register": "workspace:*",
     "@opentiny/tiny-engine-http": "workspace:*",

packages/plugins/page/src/PageInputOutput.vue

@@ -8,26 +8,26 @@
     ></tiny-alert>
     <tiny-form label-position="left" class="input-output-form">
       <tiny-form-item label="输入配置" class="item-wrap">
-        <code-configurator
+        <meta-code-editor
           :modelValue="inputValue"
           title="输入配置"
           button-text="输入配置"
           language="json"
           :buttonShowContent="hasContent(inputValue)"
           single
           @save="saveInputValue"
-        ></code-configurator>
+        ></meta-code-editor>
       </tiny-form-item>
       <tiny-form-item label="输出配置" class="item-wrap">
-        <code-configurator
+        <meta-code-editor
           :modelValue="outputValue"
           title="输出配置"
           button-text="输出配置"
           language="json"
           :buttonShowContent="hasContent(outputValue)"
           single
           @save="saveOutputValue"
-        ></code-configurator>
+        ></meta-code-editor>
       </tiny-form-item>
       <tiny-form-item label="根元素设置" class="page-root-form-item">
         <tiny-switch v-model="pageSettingState.currentPageData.isBody"></tiny-switch>
@@ -40,12 +40,12 @@
 <script>
 import { ref, watchEffect, computed } from 'vue'
 import { Form, FormItem, Switch, Alert } from '@opentiny/vue'
-import { CodeConfigurator } from '@opentiny/tiny-engine-configurator'
+import { MetaCodeEditor } from '@opentiny/tiny-engine-common'
 import { usePage, useNotify } from '@opentiny/tiny-engine-meta-register'
 
 export default {
   components: {
-    CodeConfigurator,
+    MetaCodeEditor,
     TinyForm: Form,
     TinyFormItem: FormItem,
     TinySwitch: Switch,

packages/plugins/robot/package.json

@@ -24,7 +24,6 @@
   "license": "MIT",
   "homepage": "https://opentiny.design/tiny-engine",
   "dependencies": {
-    "@opentiny/tiny-engine-canvas": "workspace:*",
     "@opentiny/tiny-engine-meta-register": "workspace:*",
     "@opentiny/tiny-engine-http": "workspace:*"
   },

packages/plugins/schema/package.json

@@ -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:*",

packages/plugins/script/package.json

@@ -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-utils": "workspace:*"

packages/plugins/tree/package.json

@@ -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-utils": "workspace:*"