Merge branch 'master' into feat/noticeBar

app/web/page/editor/component/OperationPanel/index.ts

@@ -94,6 +94,13 @@ export default class OperationPanel extends Mixins(TransformStyleMixin) {
     //
   }
 
+  fixGridKey(item) {
+    if (typeof item.point?.i === 'number' && !isNaN(item.point?.i)) {
+      return item.id;
+    }
+    return item.point?.i || '';
+  }
+
   layoutUpdatedEvent() {
     this.$nextTick(() => {
       let layoutSorted = JSON.parse(JSON.stringify(this.layout));

app/web/page/editor/component/OperationPanel/index.vue

@@ -23,13 +23,13 @@
               :w="item.point.w"
               :h="item.point.h"
               :i="item.point.i"
-              :key="item.point.i + index"
+              :key="fixGridKey(item) + index"
               @contextmenu.native.prevent="show($event, index)"
               @resized="resizedEvent"
               @moved="movedEvent"
               :style="transformStyle(item.commonStyle, item.name)"
               :class="{'Dcmcp-item_selected': curEleIndex === index && curChildIndex === null, 'Dcmcp-item_is-freecontainer': item.name === 'freedom-container'}">
-                  <component ref="container" :id="item.id" class="Dcmcp-item-com" @handleElementClick="handleElementClick" :containerIndex="index" :childItem="item" :is="item.name" :key="item.point.i + index" v-bind="item.props"></component>
+                  <component ref="container" :id="item.id" class="Dcmcp-item-com" @handleElementClick="handleElementClick" :containerIndex="index" :childItem="item" :is="item.name" :key="fixGridKey(item) + index" v-bind="item.props"></component>
               </grid-item>
               <grid-item
                 v-if="pageData.props.showPageBottomTip"

app/web/page/store/modules/editor/index.ts

@@ -150,7 +150,7 @@ export default class EditorModule implements Module<EditorState, RootState> {
           eleCopyed = cloneDeep(page[containerIndex] || {});
           eleCopyed.id = newId;
           eleCopyed.point.i = newId;
-          page.push({ ...eleCopyed, point: { ...eleCopyed.point, i: page.length }});
+          page.push({ ...eleCopyed, point: { ...eleCopyed.point }});
         }
       }
     },

package-lock.json

@@ -1501,9 +1501,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.9",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.9.tgz",
-      "integrity": "sha512-lo/GdBup72W1MN4sc9yshNzxeK8h4lKqNliDqcGadEiDhUyurl4Y7pyMr3gw9avOsLVz4ic3EfYlazCl9tvjLw==",
+      "version": "0.3.15",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.15.tgz",
+      "integrity": "sha512-r2+TQNexoWy3Gl7egv5cmkA79lyIkWeVLJJt9wQcKzlBXo0vS9HHL/4jHVZJCJpi8ilDavtrjuouQN/aevekmg==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",

package.json

@@ -27,7 +27,7 @@
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.9",
+    "@qg/citrus-ui": "0.3.15",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",