添加参数可拖拽

components.d.ts

@@ -98,7 +98,8 @@ declare module 'vue' {
     YvanRect: typeof import('./src/components/PageComponents/YvanRect.vue')['default']
     YvanRectProps: typeof import('./src/components/PageComponents/YvanRectProps.vue')['default']
     YvanRichText: typeof import('./src/components/PageComponents/YvanRichText.vue')['default']
-    YvanRichTextEditor: typeof import('./src/components/PageComponents/YvanRichTextEditor.vue')['default']
+    YvanRichTextEditor: typeof import('./src/components/yvan-ui/YvanRichTextEditor.vue')['default']
+    YvanRichTextInTable: typeof import('./src/components/PageComponents/yvan-table/YvanRichTextInTable.vue')['default']
     YvanRichTextProps: typeof import('./src/components/PageComponents/YvanRichTextProps.vue')['default']
     YvanSimpleTable: typeof import('./src/components/PageComponents/yvan-table/YvanSimpleTable.vue')['default']
     YvanSimpleTableProps: typeof import('./src/components/PageComponents/yvan-table/YvanSimpleTableProps.vue')['default']

src/components/PageComponents/YvanRichText.vue

@@ -13,7 +13,7 @@ import commonMixin from '@/mixin/commonMixin';
 import {StyledText} from '@/components/PageComponents/style';
 import {toolBarConfig, editorConfig, mode} from '@/components/config/editorConfig';
 import YvanRichTextProps from "@/components/PageComponents/YvanRichTextProps.vue";
-import YvanPrintTextEditor from "@/components/yvan-ui/YvanPrintTextEditor.vue";
+import YvanRichTextEditor from "@/components/yvan-ui/YvanRichTextEditor.vue";
 
 export default {
   name: 'YvanRichText',
@@ -32,7 +32,7 @@ export default {
   components: {
     StyledText,
     YvanRichTextProps,
-    YvanPrintTextEditor
+    YvanRichTextEditor
   },
   computed: {
     ...mapState(globalStore, {
@@ -58,7 +58,7 @@ export default {
       })
     },
     onDblClick() {
-      System.showDialog(YvanPrintTextEditor, {valueHtml: this.html, width: 65}).then(res => {
+      System.showDialog(YvanRichTextEditor, {valueHtml: this.html, width: 65}).then(res => {
 
       }).finally(() => {
 

src/components/PageComponents/YvanSimpleText.vue

@@ -109,7 +109,14 @@ export default {
 
       const index = e.dataTransfer.getData('datasource-index')
       if (index) {
-        let bindingDataSource = this.dataSource[index]
+        console.log(' >>> ', index, this.dataSource)
+        // let bindingDataSource = this.dataSource[index]
+        let bindingDataSource = {
+          title: '当前页',
+          code: 'pageNumber',
+          fieldName: 'page_number',
+          typeName: 'String'
+        }
         if (bindingDataSource) {
           globalStore().setBindValue({
             id: this.element.id,

src/components/PageComponents/yvan-table/YvanComplexTable.vue

@@ -109,8 +109,8 @@ import commonMixin from '@/mixin/commonMixin'
 import { StyledComplexTable } from '@/components/PageComponents/style'
 import ResizeObserver from '@/components/PageComponents/yvan-table/ResizeObserver'
 import TableDataSetting from '@/components/PageComponents/yvan-table/TableDataSetting.vue'
-import YvanTextIn from '@/components/PageComponents/yvan-table/YvanTextInTable.vue'
 import YvanSimpleTable from '@/components/PageComponents/yvan-table/YvanSimpleTable.vue';
+import YvanRichTextInTable from '@/components/PageComponents/yvan-table/YvanRichTextInTable.vue'
 import YvanComplexTableProps from '@/components/PageComponents/yvan-table/YvanComplexTableProps.vue'
 
 const defaultTextProp = {
@@ -183,8 +183,8 @@ export default {
   name: 'YvanComplexTable',
   mixins: [commonMixin],
   components: {
-    YvanTextIn,
     YvanSimpleTable,
+    YvanRichTextInTable,
     StyledComplexTable,
     TableDataSetting
   },

src/components/PageComponents/yvan-table/YvanTextInTable.vue

@@ -12,10 +12,10 @@ import {globalStore} from "@/store";
 import commonMixin from '@/mixin/commonMixin';
 import {StyledText} from '@/components/PageComponents/style';
 import {toolBarConfig, editorConfig, mode} from '@/components/config/editorConfig';
-import YvanPrintTextEditor from "@/components/yvan-ui/YvanPrintTextEditor.vue";
+import YvanRichTextEditor from "@/components/yvan-ui/YvanRichTextEditor.vue";
 
 export default {
-  name: 'YvanTextInTable',
+  name: 'YvanRichTextInTable',
   mixins: [commonMixin],
   props: {
     element: {
@@ -30,6 +30,7 @@ export default {
   },
   components: {
     StyledText,
+    YvanRichTextEditor
   },
   computed: {
     ...mapState(globalStore, {

src/components/PageComponents/yvan-table/YvanSimpleTable.vue

@@ -74,7 +74,7 @@ import toast from '@/utils/toast'
 import commonMixin from '@/mixin/commonMixin'
 import {StyledSimpleTable} from '@/components/PageComponents/style'
 import {Context, ContextItem, directive} from '@/components/yvan-context'
-import YvanTextIn from '@/components/PageComponents/yvan-table/YvanTextInTable.vue'
+import YvanRichTextIn from '@/components/PageComponents/yvan-table/YvanRichTextInTable.vue'
 import YvanSimpleTextIn from '@/components/PageComponents/yvan-table/YvanSimpleTextInTable.vue'
 import YvanSimpleTableProps from '@/components/PageComponents/yvan-table/YvanSimpleTableProps.vue'
 
@@ -130,7 +130,7 @@ export default {
   components: {
     Context,
     ContextItem,
-    YvanTextIn,
+    YvanRichTextIn,
     YvanSimpleTextIn,
     StyledSimpleTable
   },

src/components/PageComponents/yvan-table/YvanSimpleTextInTable.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-      class="RoySimpleText"
+      class="yvan-simple-text"
       style="width: 100%; height: 100%"
       @click="activeCell"
       @contextmenu="setEdit"
@@ -32,7 +32,6 @@
 <script>
 import {mapState} from 'pinia'
 import {globalStore} from "@/store"
-import toast from '@/utils/toast'
 import commonMixin from '@/mixin/commonMixin'
 import {StyledSimpleText} from '@/components/PageComponents/style'
 
@@ -142,8 +141,7 @@ export default {
         let bindingDataSource = this.dataSource[index]
         if (bindingDataSource) {
           this.$emit('update:bindValue', bindingDataSource)
-          // this.$emit('update:propValue', `[绑定:${bindingDataSource.title}]`)
-          this.$store.commit('printTemplateModule/updateDataValue', {
+          globalStore().updateDataValue({
             data: this.element,
             value: `<span class="yvan-binding-value">[绑定:${bindingDataSource.title}]</span>`,
             key: 'propValue'
@@ -155,7 +153,7 @@ export default {
           this.canEdit = false
         }
       } else {
-        toast('拖拽元素非数据源元素，此次拖拽无效', 'info')
+        System.toast('拖拽元素非数据源元素，此次拖拽无效', 'info')
       }
     },
     handleDragEnter() {
@@ -191,7 +189,7 @@ export default {
 </script>
 
 <style lang="less">
-.RoySimpleText {
+.yvan-simple-text {
   .edit-area {
     width: 100%;
     height: 100%;

src/components/yvan-print-designer-left-element.vue

@@ -82,7 +82,8 @@ export default {
     },
     handleDragStartForFunction(e) {
       // e.dataTransfer.setData('componentCode', e.target.dataset.code)
-      e.dataTransfer.setData('datasource-index', e.target.dataset.index)
+      console.log("handleDragStartForFunction >>> ", e)
+      e.dataTransfer.setData('datasource-index', e.target.dataset.code)
     },
   },
   mounted() {

src/components/yvan-print-designer-main.vue

@@ -63,7 +63,7 @@ export default {
         globalStore().addComponent({ component })
         globalStore().recordSnapshot()
       } else {
-        system.toast('拖拽元素非页面组件，此次拖拽无效', 'info')
+        System.toast('拖拽元素非页面组件，此次拖拽无效', 'info')
       }
     },
 

src/components/yvan-ui/YvanPrintTextEditor.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="yvan-print-text-editor">
+  <div class="yvan-rich-text-editor">
     <WangToolbar
         :editor="editorRef"
         :defaultConfig="toolbarConfig"
@@ -56,7 +56,7 @@ const handleCreated = (editor) => {
 </script>
 
 <style lang="less" scoped>
-.yvan-print-text-editor {
+.yvan-rich-text-editor {
   border: 1px solid #ccc;
 }
 </style>