vue2-client 1.8.278 → 1.8.280

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.278",
+  "version": "1.8.280",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/LowCodeComponent/LowCodePageOrganization.vue

@@ -248,10 +248,16 @@ export default {
       } else {
         if (targetType === 'row') {
           // 将行内每个组件重新修改id
-          const copyKeys = Object.keys(copy)
-          copyKeys.forEach(key => {
-            const prefix = copy[key].id.split('_')[0]
-            copy[key].id = prefix + '_' + lowcodeUtils.nanoidWithoutSymbol(6)
+          const target = copy.body
+          copy.id = 'undefine'
+          target.forEach(item => {
+            if (item.type === 'container_page') {
+              item.id = 'container_' + lowcodeUtils.nanoidWithoutSymbol(6)
+              item = lowcodeUtils.reRandomComponentId(item)
+            } else {
+              const prefix = item.id.split('_')[0]
+              item.id = prefix + '_' + lowcodeUtils.nanoidWithoutSymbol(6)
+            }
           })
         } else if (targetType === 'item') {
           // 重新修改id

package/src/base-client/components/common/LowCodePageRender/editorPageRender.vue

@@ -13,7 +13,7 @@
       </template>
       <!--   渲染器主体   -->
       <template v-for="(row,rowIndex) in page.body">
-        <a-row :key="pageIndex + '_' + rowIndex">
+        <a-row :key="pageIndex + '_' + rowIndex" type="flex">
           <template v-if="!showDragSpan">
             <template v-for="(item, itemIndex) in row.body">
               <a-col :span="item.span" :key="item.id">
@@ -485,8 +485,9 @@ export default {
           const logicParamFunction = eval('(' + eachEvent.logicParamFunction + ')')
           // 将需要的组件变量组织好，并传递给函数
           const componentData = {}
-          eachEvent.logicParamTransfer.forEach(componentId => {
-            componentData[componentId] = this.componentsMap[componentId].dataForLowCode
+          const allComponents = Object.keys(this.componentsMap)
+          allComponents.forEach(component => {
+            componentData[component] = this.componentsMap[component].dataForLowCode
           })
           const param = logicParamFunction(componentData, data)
           lowcodeLog(
@@ -573,7 +574,6 @@ export default {
   watch: {
     pageConfig: {
       handler (newVal) {
-        // this.refreshSubRender()
       },
       deep: true
     }

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -41,10 +41,9 @@
         </a-button>
       </a-input-group>
       <a-input-number
-        v-else-if="attr.numberInput"
+        v-else-if="attr.numberInput && !readOnly"
         v-model="form[attr.model]"
         :whitespace="true"
-        :read-only="readOnly"
         :disabled="disabled && !readOnly"
         style="width:100%"
         @blur="attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"

package/src/base-client/components/common/XFormTable/lowcodeEditorRegister.js

@@ -12,5 +12,17 @@ export const XFormTableConfig = {
       desc: '配置对应的命名空间'
     }
   },
+  selfMethods: [
+    {
+      name: 'initConfig',
+      desc: '初始化方法,  sjahdjhashdkashdasdhkjashdashdajsdhkajshdaks',
+      params: 'config, data'
+    },
+    {
+      name: 'setFixedQueryParams',
+      desc: '额外条件传入,  ioreqhgbuivZXBqyuu',
+      params: 'params'
+    }
+  ],
   selfEvent: ['action']
 }

package/src/base-client/components/common/XReport/XReport.vue

@@ -9,6 +9,7 @@
       <XReportDesign
         @updateImg="updateImg"
         v-if="scanFinish"
+        :show-img-in-cell="showImgInCell"
         :img-prefix="imgPrefix"
         :use-oss-for-img="useOssForImg"
         :display-only="displayOnly"
@@ -44,6 +45,7 @@
         <XReportDesign
           v-if="scanFinish"
           @updateImg="updateImg"
+          :show-img-in-cell="showImgInCell"
           :img-prefix="imgPrefix"
           :use-oss-for-img="useOssForImg"
           :display-only="displayOnly"
@@ -119,6 +121,10 @@ export default {
       type: Boolean,
       default: true
     },
+    showImgInCell: {
+      type: Boolean,
+      default: false
+    },
     // 数据
     configData: {
       type: Object,

package/src/base-client/components/common/XReport/XReportDemo.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="test">
+  <div id="test" v-if="showReport">
     <XReport
       @updateImg="updateImg"
       ref="main"
@@ -7,8 +7,10 @@
       config-name="report_ticket"
       :local-config="test"
       :config-data="test_data"
+      server-name="af-apply"
+      :show-img-in-cell="true"
+      :display-only="displayOnly"
       :edit-mode="false"
-      :display-only="true"
       :show-save-button="false"
       :dont-format="true"/>
     <a-button @click="testExport">导出</a-button>
@@ -18,6 +20,7 @@
 
 <script>
 import XReport from '@vue2-client/base-client/components/common/XReport'
+// eslint-disable-next-line no-unused-vars
 import { exportHTMLNodeToPDF } from '@vue2-client/utils/htmlToPDFApi'
 
 export default {
@@ -79,11 +82,154 @@ export default {
       },
       test_data: {
         serviceall: {
-          f_signname: '/rs/image/file/6ad0dd36a7492a6b05553fed5267ab8c-valve-aofeng-check.png'
+          f_signname: [
+            {
+              uid: 'vc-upload-1721804393350-2',
+              name: '1.png',
+              status: 'done',
+              response: {
+                f_filetype: 'png',
+                f_file_size: 0.0005,
+                f_form_type: 'image',
+                f_use_type: 'Default',
+                f_downloadpath: '/apply-image/resource/webmeter/cs/20240724/22a6d6d151f5401eae58628a589233ec.png',
+                id: '52747',
+                f_filename: '1.png',
+                f_stock_id: 1,
+                f_realpath: 'D:\\nginx-resource\\resource\\webmeter/cs/20240724/22a6d6d151f5401eae58628a589233ec.png',
+                f_operator: '1',
+                fusetype: 'Default'
+              },
+              url: '/apply-image/resource/webmeter/cs/20240724/22a6d6d151f5401eae58628a589233ec.png',
+              id: '52747'
+            },
+            {
+              uid: 'vc-upload-1721804393350-4',
+              name: '2.png',
+              status: 'done',
+              response: {
+                f_filetype: 'png',
+                f_file_size: 0.0003,
+                f_form_type: 'image',
+                f_use_type: 'Default',
+                f_downloadpath: '/apply-image/resource/webmeter/cs/20240724/3cd3f0561edd466aa7026fbdc2c16803.png',
+                id: '52748',
+                f_filename: '2.png',
+                f_stock_id: 1,
+                f_realpath: 'D:\\nginx-resource\\resource\\webmeter/cs/20240724/3cd3f0561edd466aa7026fbdc2c16803.png',
+                f_operator: '1',
+                fusetype: 'Default'
+              },
+              url: '/apply-image/resource/webmeter/cs/20240724/3cd3f0561edd466aa7026fbdc2c16803.png',
+              id: '52748'
+            },
+            {
+              uid: 'vc-upload-1721804393350-6',
+              name: '3.png',
+              status: 'done',
+              response: {
+                f_filetype: 'png',
+                f_file_size: 0.0003,
+                f_form_type: 'image',
+                f_use_type: 'Default',
+                f_downloadpath: '/apply-image/resource/webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+                id: '52749',
+                f_filename: '3.png',
+                f_stock_id: 1,
+                f_realpath: 'D:\\nginx-resource\\resource\\webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+                f_operator: '1',
+                fusetype: 'Default'
+              },
+              url: '/apply-image/resource/webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+              id: '52749'
+            },
+            {
+              uid: 'vc-upload-1721804393350-6',
+              name: '3.png',
+              status: 'done',
+              response: {
+                f_filetype: 'png',
+                f_file_size: 0.0003,
+                f_form_type: 'image',
+                f_use_type: 'Default',
+                f_downloadpath: '/apply-image/resource/webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+                id: '52749',
+                f_filename: '3.png',
+                f_stock_id: 1,
+                f_realpath: 'D:\\nginx-resource\\resource\\webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+                f_operator: '1',
+                fusetype: 'Default'
+              },
+              url: '/apply-image/resource/webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+              id: '52749'
+            },
+            {
+              uid: 'vc-upload-1721804393350-6',
+              name: '3.png',
+              status: 'done',
+              response: {
+                f_filetype: 'png',
+                f_file_size: 0.0003,
+                f_form_type: 'image',
+                f_use_type: 'Default',
+                f_downloadpath: '/apply-image/resource/webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+                id: '52749',
+                f_filename: '3.png',
+                f_stock_id: 1,
+                f_realpath: 'D:\\nginx-resource\\resource\\webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+                f_operator: '1',
+                fusetype: 'Default'
+              },
+              url: '/apply-image/resource/webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+              id: '52749'
+            },
+            {
+              uid: 'vc-upload-1721804393350-6',
+              name: '3.png',
+              status: 'done',
+              response: {
+                f_filetype: 'png',
+                f_file_size: 0.0003,
+                f_form_type: 'image',
+                f_use_type: 'Default',
+                f_downloadpath: '/apply-image/resource/webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+                id: '52749',
+                f_filename: '3.png',
+                f_stock_id: 1,
+                f_realpath: 'D:\\nginx-resource\\resource\\webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+                f_operator: '1',
+                fusetype: 'Default'
+              },
+              url: '/apply-image/resource/webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+              id: '52749'
+            },
+            {
+              uid: 'vc-upload-1721804393350-6',
+              name: '3.png',
+              status: 'done',
+              response: {
+                f_filetype: 'png',
+                f_file_size: 0.0003,
+                f_form_type: 'image',
+                f_use_type: 'Default',
+                f_downloadpath: '/apply-image/resource/webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+                id: '52749',
+                f_filename: '3.png',
+                f_stock_id: 1,
+                f_realpath: 'D:\\nginx-resource\\resource\\webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+                f_operator: '1',
+                fusetype: 'Default'
+              },
+              url: '/apply-image/resource/webmeter/cs/20240724/ddc49b4375284027b11ce2c86fde47b0.png',
+              id: '52749'
+            },
+          ]
         }
       },
       total: 1,
-      registerMap: []
+      registerMap: [],
+      displayOnly: false,
+      showReport: true
     }
   },
   methods: {
@@ -91,7 +237,19 @@ export default {
       console.warn('demo', data)
     },
     testExport () {
-      exportHTMLNodeToPDF('123', '#test')
+      this.showReport = false
+      this.displayOnly = true
+      this.$nextTick(() => {
+        this.showReport = true
+        setTimeout(() => {
+          exportHTMLNodeToPDF('123', '#test')
+          this.showReport = false
+          this.displayOnly = false
+          this.$nextTick(() => {
+            this.showReport = true
+          })
+        }, 500)
+      })
     },
     testSave () {
       const result = []

package/src/base-client/components/common/XReport/XReportDesign.vue

@@ -54,6 +54,7 @@
                 <template v-if="!forDisplay">
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    :show-img-in-cell="showImgInCell"
                     :img-prefix="imgPrefix"
                     :server-name="serverName"
                     :use-oss-for-img="useOssForImg"
@@ -67,6 +68,7 @@
                 <template v-else>
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    :show-img-in-cell="showImgInCell"
                     :img-prefix="imgPrefix"
                     :server-name="serverName"
                     :use-oss-for-img="useOssForImg"
@@ -85,6 +87,7 @@
                   <template v-if="!forDisplay">
                     <x-report-tr-group
                       @updateImg="updateImg"
+                      :show-img-in-cell="showImgInCell"
                       :img-prefix="imgPrefix"
                       :server-name="serverName"
                       :use-oss-for-img="useOssForImg"
@@ -99,6 +102,7 @@
                   <template v-else>
                     <x-report-tr-group
                       @updateImg="updateImg"
+                      :show-img-in-cell="showImgInCell"
                       :img-prefix="imgPrefix"
                       :server-name="serverName"
                       :use-oss-for-img="useOssForImg"
@@ -118,6 +122,7 @@
                 <template v-if="forDisplay">
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    :show-img-in-cell="showImgInCell"
                     :img-prefix="imgPrefix"
                     :server-name="serverName"
                     :use-oss-for-img="useOssForImg"
@@ -134,6 +139,7 @@
                 <template v-if="!forDisplay">
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    :show-img-in-cell="showImgInCell"
                     :img-prefix="imgPrefix"
                     :server-name="serverName"
                     :use-oss-for-img="useOssForImg"
@@ -148,6 +154,7 @@
                   <!--  动态行交互按钮  -->
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    :show-img-in-cell="showImgInCell"
                     :img-prefix="imgPrefix"
                     :server-name="serverName"
                     :use-oss-for-img="useOssForImg"
@@ -192,6 +199,10 @@ export default {
       require: true,
       default: () => {}
     },
+    showImgInCell: {
+      type: Boolean,
+      default: false
+    },
     // 是否是展示用
     forDisplay: {
       type: Boolean,

package/src/base-client/components/common/XReport/XReportTrGroup.vue

@@ -66,9 +66,19 @@
               </template>
               <template v-else>
                 <template v-if="typeof getDeepObject(configData, cell.dataIndex) === 'object'">
-                  <template  v-for="(img,imgIndex) in getDeepObject(configData, cell.dataIndex)">
-                    <span :key="imgIndex" style="margin-right: 5%">{{ img.name }}</span>
-                  </template>
+                  <div style="display: flex; align-items: end; justify-content: space-evenly; flex-wrap: wrap">
+                    <template v-for="(img,imgIndex) in getDeepObject(configData, cell.dataIndex)">
+                      <template v-if="showImgInCell">
+                        <div :key="imgIndex">
+                          <img :src="img.url" alt="图片"/>
+                          <p>{{ img.name }}</p>
+                        </div>
+                      </template>
+                      <template v-else>
+                        <span :key="imgIndex" style="margin-right: 5%">{{ img.name }}</span>
+                      </template>
+                    </template>
+                  </div>
                 </template>
                 <template v-else>
                   <span style="margin-right: 5%">{{ formatImgStr(getDeepObject(configData, cell.dataIndex))[0].name }}</span>
@@ -366,6 +376,10 @@ export default {
       type: Array,
       required: true
     },
+    showImgInCell: {
+      type: Boolean,
+      default: false
+    },
     config: {
       type: Object,
       default: function () {

package/src/pages/lowCode/lowCodeEditor.vue

@@ -157,7 +157,20 @@
               <div v-if="editorPanelCurrent[0] === 'properties'">
                 <div v-if="editorPropertiesConfig.props !== undefined">
                   <div v-if="editorPropertiesConfig.span">
-                    栅格数:<a-input :default-value="editorPropertiesConfig.span" @change="changeSpan" :key="editorPropertiesConfig.id"/>
+                    栅格数:
+                    <a-row>
+                      <a-col :span="16">
+                        <a-slider
+                          :id="editorPropertiesConfig.id"
+                          :max="24"
+                          :min="1"
+                          v-model="editorPropertiesConfig.span"
+                          @change="changeSpan" />
+                      </a-col>
+                      <a-col :span="7">
+                        <a-input-number v-model="editorPropertiesConfig.span" :min="1" :max="24" style="margin-left: 16px; width: 100%" />
+                      </a-col>
+                    </a-row>
                   </div>
                   <template v-for="(value,key) in editorPropertiesConfig.props">
                     <div :key="editorPropertiesConfig.id + '_' + key">
@@ -238,19 +251,19 @@
           <a-input v-model="eventEditorContent.customEmitType"/>
         </a-form-item>
         <!--    事件类型    -->
-        <a-form-item label="事件类型" v-if="eventEditorContent.emitType !== 'lifeCycle'">
+        <a-form-item label="事件类型" v-if="eventEditorContent.emitType && eventEditorContent.emitType !== 'lifeCycle'">
           <a-select @change="handleEventEditorEventTypeChange" :default-value="eventEditorContent.eventType">
-            <a-select-option value="changeValue">
-              修改组件的值
+            <a-select-option value="runFunction">
+              调用组件方法
             </a-select-option>
             <a-select-option value="changeProps">
               修改组件的Props
             </a-select-option>
             <a-select-option value="runLogic">
-              执行Logic
+              发送后端请求
             </a-select-option>
             <a-select-option value="log">
-              打印日志
+              调试日志
             </a-select-option>
             <a-select-option value="showModal" v-if="this.config.page.filter(page => page.type === 'modal').length > 0">
               修改弹框可见
@@ -258,6 +271,9 @@
             <a-select-option value="showDraw" v-if="this.config.page.filter(page => page.type === 'draw').length > 0">
               修改抽屉可见
             </a-select-option>
+            <a-select-option value="customJSFunction" v-if="eventEditorContent.emitType !== 'lifeCycle'">
+              自定义JS
+            </a-select-option>
           </a-select>
         </a-form-item>
         <!--    生命周期函数    -->
@@ -320,21 +336,9 @@
           </a-select>
         </a-form-item>
         <!--    Logic名    -->
-        <a-form-item label="Logic名" v-if="eventEditorContent.eventType === 'runLogic'">
+        <a-form-item label="后端Api" v-if="eventEditorContent.eventType === 'runLogic'">
           <a-input v-model="eventEditorContent.logicName"/>
         </a-form-item>
-        <!--    服务名    -->
-        <a-form-item label="服务名" v-if="eventEditorContent.eventType === 'runLogic'">
-          <a-input v-model="eventEditorContent.serviceName"/>
-        </a-form-item>
-        <!--    自定义Logic参数，由哪些组件传递    -->
-        <a-form-item label="Logic参数取值组件" v-if="eventEditorContent.eventType === 'runLogic'">
-          <a-transfer
-            :data-source="logicParamTransferDataSource"
-            :render="item => item.title"
-            :target-keys="eventEditorContent.logicParamTransfer"
-            @change="handleLogicParamTransferChange"/>
-        </a-form-item>
         <!--    自定义Logic参数    -->
         <a-form-item label="自定义Logic参数" v-if="eventEditorContent.eventType === 'runLogic'">
           <a-button type="primary" @click="openLogicParamJSEditor">
@@ -348,7 +352,7 @@
           </a-button>
         </a-form-item>
         <!--    修改组件的值 才会显示的其余参数    -->
-        <template v-if="eventEditorContent.eventType === 'changeValue' || eventEditorContent.eventType === 'changeProps'">
+        <template v-if="eventEditorContent.eventType === 'runFunction' || eventEditorContent.eventType === 'changeProps'">
           <!--    目标组件    -->
           <a-form-item label="目标组件">
             <a-select @change="handleEventEditorTargetChange" :default-value="eventEditorContent.target">
@@ -360,21 +364,22 @@
               </a-select-option>
             </a-select>
           </a-form-item>
-          <!--    目标组件执行事件名    -->
-          <a-form-item label="目标组件执行事件名" v-if="eventEditorContent.eventName === 'changeValue'">
+          <!--    目标组件执行事件    -->
+          <a-form-item label="目标组件执行事件" v-if="eventEditorContent.eventType === 'runFunction' && eventEditorContent.target !== undefined">
             <a-select @change="handleEventEditorTargetEventTypeChange" :default-value="eventEditorContent.eventName">
-              <a-select-option :value="eventType" v-for="(eventType,eventTypeIndex) in supportedEventType" :key="'eventType_' + eventTypeIndex">
-                {{ eventType }}
+              <a-select-option :value="eventType.name" v-for="(eventType,eventTypeIndex) in targetComponentMethods" :key="'eventType_' + eventTypeIndex">
+                {{ eventType.str }}
               </a-select-option>
             </a-select>
+            <p v-if="targetComponentEventDesc !== undefined">{{ targetComponentEventDesc }}</p>
           </a-form-item>
           <!--    目标组件修改值对应的key    -->
-          <a-form-item label="目标组件修改值对应的key" v-if="eventEditorContent.target !== undefined">
+          <a-form-item label="对应的key" v-if="eventEditorContent.target !== undefined && eventEditorContent.eventType === 'changeProps'">
             <a-input v-model="eventEditorContent.targetKey"/>
           </a-form-item>
         </template>
         <!--    自定义JS方法    -->
-        <a-form-item label="自定义JS方法" v-if="eventEditorContent.emitType !== 'lifeCycle'">
+        <a-form-item label="自定义JS方法" v-if="eventEditorContent.emitType !== 'lifeCycle' && eventEditorContent.eventType === 'customJSFunction'">
           <a-button type="primary" @click="openEventJSEditor">打开编辑器</a-button>
         </a-form-item>
         <!--    自定义钩子函数    -->
@@ -625,8 +630,6 @@ export default {
       activeMainPage: undefined,
       // 保存主体中，当前激活的标签栏类型
       activeMainPageType: undefined,
-      // 定义Logic参数从哪些组件获取
-      logicParamTransferDataSource: [],
       // 添加页面容器参数
       addComponentTemp: { type: 'page' },
       // 控制添加页面容器弹框显隐
@@ -636,7 +639,11 @@ export default {
       // 指定架构树选中哪个节点
       selectTreeNode: undefined,
       // 禁用事件编辑
-      disableEventEditor: false
+      disableEventEditor: false,
+      // 目标组件暴露出的事件
+      targetComponentMethods: [],
+      // 目标组件已选择的事件描述
+      targetComponentEventDesc: undefined
     }
   },
   provide () {
@@ -850,8 +857,10 @@ export default {
       const targetDef = propsDef[key]
       if (!targetDef.label) {
         targetDef.label = key
-        targetDef.desc = '未配置该参数的说明！'
-      } else if (!targetDef.desc) {
+      } else {
+        targetDef.label = targetDef.label + '(' + key + ')'
+      }
+      if (!targetDef.desc) {
         targetDef.desc = '未配置该参数的说明！'
       }
       return targetDef
@@ -872,15 +881,12 @@ export default {
       // 页面中插入行
       if (type === 'page-row') {
         const content = copyCache.content
-        const contentKeys = Object.keys(content)
-        const result = []
-        contentKeys.forEach(key => {
-          result.push(content[key])
-        })
-        target.body.push(result)
+        const pageId = target.id
+        content.id = pageId + '_' + target.body.length
+        target.body.push(content)
       } else if (type === 'row-item') {
         // 行中插入组件
-        target.push(copyCache.content)
+        target.body.push(copyCache.content)
       } else if (type === 'page') {
         // 复制页面
         this.config.page.push(copyCache)
@@ -890,7 +896,7 @@ export default {
     },
     // span属性通过input框修改
     changeSpan (event) {
-      this.editorPropertiesConfig.span = event.target.value
+      this.editorPropertiesConfig.span = event
     },
     // logic从组件中取值穿梭框改变事件
     handleLogicParamTransferChange (targetKeys, direction, moveKeys) {
@@ -928,7 +934,7 @@ export default {
       }
       // 将组件选中
       this.clickComponentInEditor(target)
-      if (!id.includes('container')) {
+      if (!id.includes('container') && !(id.includes('page') && id.length > 11)) {
         this.twink(id)
       }
     },
@@ -992,12 +998,9 @@ export default {
             case 'row':
               // 移动行
               // 拿到父容器和目标Index
-              console.warn('dropKey', dropKey)
               dropConfig = lowcodeUtils.getPageIdAndRowIndexByRowId(dropKey)
-              console.warn('dropConfig', dropConfig)
               target = lowcodeUtils.getPageConfigById(dropConfig.pageId, this.config)
               // 保存目标
-              console.warn('target', targetCache)
               targetCache = target.body[dropConfig.rowIndex]
               // 插入
               if (dropPosition < 0) {
@@ -1052,6 +1055,14 @@ export default {
                   break
                 }
               }
+              if (father.length === 0) {
+                father.push({
+                  type: 'container',
+                  selected: false,
+                  span: 24,
+                  id: 'container_' + lowcodeUtils.nanoidWithoutSymbol(6)
+                })
+              }
               break
             case 'container_page':
               // 移动容器页面
@@ -1091,6 +1102,14 @@ export default {
                   break
                 }
               }
+              if (father.length === 0) {
+                father.push({
+                  type: 'container',
+                  selected: false,
+                  span: 24,
+                  id: 'container_' + lowcodeUtils.nanoidWithoutSymbol(6)
+                })
+              }
           }
           break
         case 'higher':
@@ -1119,6 +1138,14 @@ export default {
                   break
                 }
               }
+              if (father.length === 0) {
+                father.push({
+                  type: 'container',
+                  selected: false,
+                  span: 24,
+                  id: 'container_' + lowcodeUtils.nanoidWithoutSymbol(6)
+                })
+              }
               break
             case 'container_page':
               // 子页面插行
@@ -1131,6 +1158,14 @@ export default {
                   break
                 }
               }
+              if (father.length === 0) {
+                father.push({
+                  type: 'container',
+                  selected: false,
+                  span: 24,
+                  id: 'container_' + lowcodeUtils.nanoidWithoutSymbol(6)
+                })
+              }
               break
           }
           break
@@ -1227,7 +1262,14 @@ export default {
       const pageId = id.substring(0, id.length - 2)
       const rowId = id.substring(id.length - 1)
       const page = lowcodeUtils.getPageConfigById(pageId, this.config)
-      page.body.splice(rowId - 1, 1)
+      page.body.splice(rowId, 1)
+      // 如果该列下没有任何内容，则将该列还原为容器
+      if (page.body.length === 0) {
+        const outerContainer = lowcodeUtils.getContainerPageOuterByContainerPageId(page.id, this.config)
+        outerContainer.type = 'container'
+        outerContainer.selected = false
+        delete outerContainer.page
+      }
       this.targetContainer = undefined
       this.editorPropertiesConfig = {}
       this.refreshOrganization()
@@ -1276,6 +1318,14 @@ export default {
           row.body[0].span += deletedSpan
         }
       }
+      if (row.body.length === 0) {
+        row.body.push({
+          type: 'container',
+          selected: false,
+          span: 24,
+          id: 'container_' + lowcodeUtils.nanoidWithoutSymbol(6)
+        })
+      }
       // 从注册的全局Map中删除
       delete this.$children[0]._provided.componentsMap[id]
       this.targetContainer = undefined
@@ -1352,6 +1402,13 @@ export default {
       // 如果删除后只剩一个容器，将该容器span设置为24
       if (row.body.length === 1) {
         row.body[0].span = 24
+      } else if (row.body.length === 0) {
+        row.body.push({
+          type: 'container',
+          selected: false,
+          span: 24,
+          id: 'container_' + lowcodeUtils.nanoidWithoutSymbol(6)
+        })
       }
       this.refreshOrganization()
     },
@@ -1382,24 +1439,42 @@ export default {
           ...this.eventEditorContent
         })
       }
+      this.targetComponentMethods = []
+      this.targetComponentEventDesc = undefined
       this.showEventEditor = false
       this.eventEditorContent = {}
       this.eventEditorCurrent = undefined
     },
     // 关闭事件编辑器弹框
     handleEventEditorCancel () {
+      this.targetComponentMethods = []
+      this.targetComponentEventDesc = undefined
       this.showEventEditor = false
       this.eventEditorContent = {}
       this.eventEditorCurrent = undefined
     },
     // 事件编辑器中，触发类型改变
     handleEventEditorTypeChange (type) {
+      this.eventEditorContent = {}
       this.eventEditorContent.emitType = type
       this.$forceUpdate()
     },
     // 事件编辑器中，目标组件改变
     handleEventEditorTargetChange (target) {
+      this.targetComponentMethods = []
       this.eventEditorContent.target = target
+      // 将目标组件暴露的方法，填入单选框
+      const targetType = target.split('_')[0]
+      const editorConfig = lowcodeUtils.getEditorConfigByType(targetType)
+      editorConfig.selfMethods.forEach(eachMethod => {
+        // str用于下拉框中显示，包含函数名和形参
+        const methodStr = eachMethod.name + '(' + eachMethod.params + ')'
+        this.targetComponentMethods.push({
+          str: methodStr,
+          desc: eachMethod.desc,
+          name: eachMethod.name
+        })
+      })
       this.$forceUpdate()
     },
     handleEventEditorLifeCycleChange (lifeCycleName) {
@@ -1407,25 +1482,19 @@ export default {
     },
     // 事件编辑器中，事件类型改变
     handleEventEditorEventTypeChange (type) {
-      const componentsMap = this.$children[0]._provided.componentsMap
-      this.eventEditorContent.eventType = type
-      this.logicParamTransferDataSource = []
-      // 如果事件为运行Logic将组件加入穿梭框
-      if (type === 'runLogic') {
-        const keys = Object.keys(componentsMap)
-        keys.forEach(key => {
-          const name = lowcodeUtils.getComponentNameById(key, this.config)
-          this.logicParamTransferDataSource.push({
-            key: key,
-            title: name,
-          })
-        })
-        this.eventEditorContent.logicParamTransfer = []
+      this.eventEditorContent = {
+        emitType: this.eventEditorContent.emitType
       }
+      this.eventEditorContent.eventType = type
       this.$forceUpdate()
     },
     // 事件编辑器中，目标组件执行事件类型改变
     handleEventEditorTargetEventTypeChange (type) {
+      this.targetComponentMethods.forEach(eachMethod => {
+        if (eachMethod.name === type) {
+          this.targetComponentEventDesc = eachMethod.desc
+        }
+      })
       this.eventEditorContent.eventName = type
       this.$forceUpdate()
     },
@@ -1686,6 +1755,13 @@ export default {
       }
       // 如果选中的是容器页面
       if (configItem.type === 'container_page') {
+        // 选中容器页面中所有组件
+        lowcodeUtils.unCheckAll(this.config)
+        configItem.page.forEach(page => {
+          page.body.forEach(row => {
+            lowcodeUtils.checkRowAll(row)
+          })
+        })
         this.editorPropertiesConfig = configItem
         this.disableEventEditor = true
         this.editorPropertiesConfig.props = {}
@@ -1694,6 +1770,7 @@ export default {
 
       // 如果选中的是行
       if (configItem.type === 'row' || !configItem.type) {
+        lowcodeUtils.checkRowAll(configItem, this.config)
         this.editorPropertiesConfig = configItem
         this.disableEventEditor = true
         this.editorPropertiesConfig.props = {}
@@ -1758,6 +1835,63 @@ export default {
     this.supportedEventType = [...lowcodeComponentMixin.supportedEventType]
     // 深拷贝外侧传来的配置
     this.config = JSON.parse(JSON.stringify(this.originalConfig))
+    this.config = {
+      page: [
+        {
+          id: 'page_gmSWjh',
+          type: 'page',
+          title: '1',
+          body: [
+            {
+              id: 'page_gmSWjh_0',
+              config: {},
+              type: 'row',
+              body: [
+                {
+                  type: 'container_page',
+                  span: 24,
+                  id: 'container_LsS5uq',
+                  page: [
+                    {
+                      id: 'container_page_U4',
+                      type: 'page',
+                      body: [
+                        {
+                          id: 'container_page_U4_0',
+                          type: 'row',
+                          config: {},
+                          body: [
+                            {
+                              type: 'container',
+                              selected: false,
+                              span: 24,
+                              id: 'container_3xuSvW'
+                            }
+                          ]
+                        },
+                        {
+                          id: 'container_page_U4_1',
+                          type: 'row',
+                          config: {},
+                          body: [
+                            {
+                              type: 'container',
+                              selected: false,
+                              span: 24,
+                              id: 'container_mC-Es1'
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
     this.refreshOrganization()
   }
 }

package/src/utils/lowcode/lowcodeUtils.js

@@ -29,7 +29,7 @@ export function getEditorConfigByType (componentType) {
       result = registeredConfig[key]
     }
   })
-  return result
+  return JSON.parse(JSON.stringify(result))
 }
 
 // 根据组件的id获取页面容器
@@ -227,22 +227,32 @@ export function getRowConfigById (id, config) {
   const rowIndex = id.substring(lastIndex + 1)
   const pageId = id.substring(0, lastIndex)
   const page = getPageConfigById(pageId, config)
-  return page.body[rowIndex - 1]
-  // for (let i = 0; i < config.page.length; i++) {
-  //   const page = config.page[i]
-  //   if (page.id === pageId) {
-  //     return page.body[rowIndex]
-  //   }
-  // }
+  let result = page.body[rowIndex]
+  if (result === undefined) {
+    config.page.forEach(page => {
+      page.body.forEach(row => {
+        row.body.forEach(item => {
+          if (item.type === 'container_page') {
+            result = getRowConfigById(id, item)
+            if (result) {
+              return result
+            }
+          }
+        })
+      })
+    })
+  } else {
+    return result
+  }
 }
 
 // 根据id获取配置，根据id的长度自动判断类型
 export function getConfig (id, config) {
   let result
-  if (id.startsWith('page') && id.length <= 11) {
+  if ((id.startsWith('page') && id.length <= 11) || (id.startsWith('container_page') && id.length <= 17)) {
     // page
     result = getPageConfigById(id, config)
-  } else if (id.startsWith('page') && id.length > 11) {
+  } else if ((id.startsWith('page') && id.length > 11) || (id.startsWith('container_page') && id.length > 17)) {
     // row
     result = getRowConfigById(id, config)
   } else {
@@ -267,6 +277,24 @@ export function unCheckAll (config) {
   })
 }
 
+// 取消选择所有容器
+export function checkRowAll (row, config = undefined) {
+  if (config) {
+    unCheckAll(config)
+  }
+  row.body.forEach(item => {
+    if (item.type === 'container') {
+      item.selected = true
+    } else if (item.type === 'container_page') {
+      item.page.forEach(page => {
+        page.body.forEach(subRow => {
+          checkRowAll(subRow)
+        })
+      })
+    }
+  })
+}
+
 // 根据组件id获取它的name，如果没有name则返回id
 export function getComponentNameById (id, config) {
   const targetConfig = getComponentConfig(id, config)
@@ -281,13 +309,16 @@ export function getComponentNameById (id, config) {
 export function reRandomComponentId (config) {
   config.page.forEach(page => {
     const pagePrefix = getIdPrefix(page.id)
-    page.id = pagePrefix + '_' + nanoidWithoutSymbol(2)
-    page.body.forEach(row => {
+    const pageNewId = pagePrefix + '_' + nanoidWithoutSymbol(2)
+    page.id = pageNewId
+    for (let i = 0; i < page.body.length; i++) {
+      const row = page.body[i]
+      row.id = pageNewId + '_' + i
       row.body.forEach(item => {
         const itemPrefix = getIdPrefix(item.id)
         item.id = itemPrefix + '_' + nanoidWithoutSymbol(6)
       })
-    })
+    }
   })
   return config
 }

package/vue.config.js

@@ -33,6 +33,9 @@ module.exports = {
     port: 8001,
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
+      // '/apply-image': {
+      //   target: revenue,
+      // },
       '/rs': {
         target: v3Server,
         ws: false,