vue2-client 1.8.262 → 1.8.263

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.262",
+  "version": "1.8.263",
   "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

@@ -5,6 +5,7 @@
       defaultExpandAll
       show-icon
       @select="handleTreeSelect"
+      :selectedKeys="selectedKeys"
       style="overflow: hidden"
       :draggable="true"
       @drop="treeDrop"
@@ -56,6 +57,10 @@ export default {
     config: {
       type: Object,
       required: true,
+    },
+    selectTreeNode: {
+      type: String,
+      default: undefined
     }
   },
   methods: {
@@ -303,6 +308,7 @@ export default {
     },
     // 处理架构树点击事件
     handleTreeSelect (value) {
+      this.selectedKeys = value
       this.$emit('treeOrganizationClick', value[0])
       // 如果选中的id只有两位证明是页面容器
       // let isPage = false
@@ -413,7 +419,17 @@ export default {
       showRenameModal: false,
       copyCache: undefined,
       pageNewName: undefined,
-      renameId: undefined
+      renameId: undefined,
+      selectedKeys: []
+    }
+  },
+  watch: {
+    selectTreeNode: {
+      handler (newVal) {
+        if (newVal) {
+          this.selectedKeys = [newVal]
+        }
+      }
     }
   }
 }

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

@@ -57,17 +57,18 @@
                   </div>
                 </div>
                 <!--   页面渲染 / 编辑模式中，将弹框或抽屉中的内容渲染为页面   -->
-                <div
-                  @click="clickComponentInEditor(item)"
-                  :class=" editMode ? 'componentInEditor' : '' "
-                  v-else-if="editMode || (page.type !== 'modal' && page.type !== 'draw')">
-                  <component
-                    :lifeCycleFunction="resolveLifeCycleEvent(item)"
-                    :is="resolveComponentType(item.type, item.id)"
-                    :propsData="{...item.props}"
-                    @componentDidMounted="componentDidMounted"
-                    @onEvent="handleEvent"
-                    :mixinComponentId="item.id"/>
+                <div :ref="item.id" v-else-if="editMode || (page.type !== 'modal' && page.type !== 'draw')">
+                  <div
+                    @click="clickComponentInEditor(item)"
+                    :class=" editMode ? 'componentInEditor' : '' ">
+                    <component
+                      :lifeCycleFunction="resolveLifeCycleEvent(item)"
+                      :is="resolveComponentType(item.type, item.id)"
+                      :propsData="{...item.props}"
+                      @componentDidMounted="componentDidMounted"
+                      @onEvent="handleEvent"
+                      :mixinComponentId="item.id"/>
+                  </div>
                 </div>
               </a-col>
             </template>
@@ -169,7 +170,8 @@ export default {
       // 抽屉显示集合
       drawVisible: {},
       // 控制递归渲染
-      renderSub: true
+      renderSub: true,
+      colClassName: ''
     }
   },
   inject: [
@@ -478,6 +480,9 @@ export default {
           }
         }
       })
+    },
+    twink (id) {
+
     }
   },
   watch: {
@@ -498,6 +503,9 @@ export default {
 .componentInEditor:hover{
   border: 2px rgb( 24,144,255) solid;
 }
+.colWithBorder{
+  border: 2px rgb( 24,144,255) solid;
+}
 .container{
   display: flex;
   flex-direction: column;

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

@@ -85,6 +85,11 @@ export default {
     outerContainerIndex: {
       type: [String, Number],
       default: undefined
+    },
+    // 图片上传后添加前缀
+    imgPrefix: {
+      type: String,
+      default: undefined
     }
   },
   computed: {
@@ -154,7 +159,12 @@ export default {
           }
           fileInfo.response = dataObj
           fileInfo.id = dataObj.id
-          fileInfo.url = dataObj.f_downloadpath
+          // 如果新上传的图片是V4，需要携带serviceName前缀，但是同时也要回显老系统图片
+          if (this.imgPrefix) {
+            fileInfo.url = this.imgPrefix + dataObj.f_downloadpath
+          } else {
+            fileInfo.url = dataObj.f_downloadpath
+          }
           if (this.outerContainerIndex !== undefined) {
             this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done'), this.outerContainerIndex)
           } else {

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

@@ -9,6 +9,7 @@
       <XReportDesign
         @updateImg="updateImg"
         v-if="scanFinish"
+        :img-prefix="imgPrefix"
         :use-oss-for-img="useOssForImg"
         :display-only="displayOnly"
         :config="type === 'display' ? originalConfig : activeConfig"
@@ -43,6 +44,7 @@
         <XReportDesign
           v-if="scanFinish"
           @updateImg="updateImg"
+          :img-prefix="imgPrefix"
           :use-oss-for-img="useOssForImg"
           :display-only="displayOnly"
           :config="type === 'display' ? originalConfig : activeConfig"
@@ -161,6 +163,11 @@ export default {
     useOssForImg: {
       type: Boolean,
       default: true
+    },
+    // 图片上传后添加前缀
+    imgPrefix: {
+      type: String,
+      default: undefined
     }
   },
   components: {

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

@@ -2,6 +2,7 @@
   <div>
     <template v-if="this.activatedConfig.designMode === 'json'">
       <XReportJsonRender
+        :img-prefix="imgPrefix"
         :server-name="serverName"
         :display-only="displayOnly"
         :show-title="showTitle"
@@ -53,6 +54,7 @@
                 <template v-if="!forDisplay">
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    :img-prefix="imgPrefix"
                     :server-name="serverName"
                     :use-oss-for-img="useOssForImg"
                     :key="rowIndex"
@@ -65,6 +67,7 @@
                 <template v-else>
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    :img-prefix="imgPrefix"
                     :server-name="serverName"
                     :use-oss-for-img="useOssForImg"
                     :config="activatedConfig"
@@ -82,6 +85,7 @@
                   <template v-if="!forDisplay">
                     <x-report-tr-group
                       @updateImg="updateImg"
+                      :img-prefix="imgPrefix"
                       :server-name="serverName"
                       :use-oss-for-img="useOssForImg"
                       :config="activatedConfig"
@@ -95,6 +99,7 @@
                   <template v-else>
                     <x-report-tr-group
                       @updateImg="updateImg"
+                      :img-prefix="imgPrefix"
                       :server-name="serverName"
                       :use-oss-for-img="useOssForImg"
                       :config="activatedConfig"
@@ -113,6 +118,7 @@
                 <template v-if="forDisplay">
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    :img-prefix="imgPrefix"
                     :server-name="serverName"
                     :use-oss-for-img="useOssForImg"
                     :config="activatedConfig"
@@ -128,6 +134,7 @@
                 <template v-if="!forDisplay">
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    :img-prefix="imgPrefix"
                     :server-name="serverName"
                     :use-oss-for-img="useOssForImg"
                     :config="activatedConfig"
@@ -141,6 +148,7 @@
                   <!--  动态行交互按钮  -->
                   <x-report-tr-group
                     @updateImg="updateImg"
+                    :img-prefix="imgPrefix"
                     :server-name="serverName"
                     :use-oss-for-img="useOssForImg"
                     :config="activatedConfig"
@@ -233,6 +241,11 @@ export default {
     useOssForImg: {
       type: Boolean,
       default: true
+    },
+    // 图片上传后添加前缀
+    imgPrefix: {
+      type: String,
+      default: undefined
     }
   },
   components: {

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

@@ -144,6 +144,11 @@ export default {
     displayOnly: {
       type: Boolean,
       default: true
+    },
+    // 图片上传后添加前缀
+    imgPrefix: {
+      type: String,
+      default: undefined
     }
   },
   data () {

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

@@ -242,6 +242,7 @@
             <template v-if="configData.images[cell.dataIndex]?.length > 0">
               <upload
                 :model="uploadParams"
+                :img-prefix="imgPrefix"
                 :service-name="serverName"
                 :images="checkImg(cell.dataIndex, 'configData')"
                 :outer-container-index="cell.dataIndex"
@@ -252,6 +253,7 @@
             <template v-else>
               <upload
                 :model="uploadParams"
+                :img-prefix="imgPrefix"
                 :service-name="serverName"
                 :images="checkImg(cell.dataIndex, 'config')"
                 :outer-container-index="cell.dataIndex"
@@ -401,6 +403,11 @@ export default {
     useOssForImg: {
       type: Boolean,
       default: true
+    },
+    // 图片上传后添加前缀
+    imgPrefix: {
+      type: String,
+      default: undefined
     }
   },
   data () {

package/src/pages/lowCode/lowCodeEditor.vue

@@ -47,6 +47,7 @@
                   <LowCodePageOrganization
                     :config="config"
                     v-if="showPageOrganization"
+                    :select-tree-node="selectTreeNode"
                     @rename="rename"
                     @split="handleSplit"
                     @pasteItem="handlePasteItem"
@@ -611,7 +612,8 @@ export default {
       addComponentTemp: { type: 'page' },
       // 控制添加页面容器弹框显隐
       showPageContainerAddModal: false,
-      showLifeCycleFunctionEditor: false
+      showLifeCycleFunctionEditor: false,
+      selectTreeNode: undefined
     }
   },
   provide () {
@@ -622,17 +624,17 @@ export default {
   },
   methods: {
     handleSplit (id, isVertical) {
-      if (isVertical) {
-        const target = lowcodeUtils.getComponentConfig(id, this.config)
-        const row = lowcodeUtils.getRowConfigByComponentId(id, this.config)
-        let index
-        for (let i = 0; i < row.length; i++) {
-          if (row[i].id === id) {
-            index = i
-            break
-          }
+      const target = lowcodeUtils.getComponentConfig(id, this.config)
+      const row = lowcodeUtils.getRowConfigByComponentId(id, this.config)
+      let index
+      for (let i = 0; i < row.length; i++) {
+        if (row[i].id === id) {
+          index = i
+          break
         }
-        const cache = JSON.parse(JSON.stringify(target))
+      }
+      const cache = JSON.parse(JSON.stringify(target))
+      if (isVertical) {
         const temp = {
           type: 'container_page',
           span: cache.span,
@@ -649,14 +651,23 @@ export default {
         }
         cache.span = 24
         temp.page[0].body[0].push(cache)
-        temp.page[0].body[0].push({
+        temp.page[0].body[1] = []
+        temp.page[0].body[1].push({
           type: 'container',
           span: 24,
           id: 'container_' + lowcodeUtils.nanoidWithoutSymbol(6)
         })
         row.splice(index, 1, temp)
       } else {
-        // TODO
+        const outerSpan = cache.span
+        const firstSpan = Math.round(outerSpan / 2)
+        const secondSpan = outerSpan - firstSpan
+        cache.span = firstSpan
+        row.splice(index, 1, cache, {
+          type: 'container',
+          span: secondSpan,
+          id: 'container_' + lowcodeUtils.nanoidWithoutSymbol(6)
+        })
       }
       this.refreshOrganization()
     },
@@ -1302,6 +1313,8 @@ export default {
     },
     // 选中某个组件
     clickComponentInEditor (configItem) {
+      // 同步选中架构
+      this.selectTreeNode = configItem.id
       this.editorPropertiesConfig = {}
       // 如果选中的是容器
       if (configItem.type === 'container') {