Merge branch 'master' into develop

pull/1/head
rookie4show 1 month ago
commit 60091e88a2
  1. 5
      src/components/Yys.vue

@ -137,6 +137,7 @@ import {QuillEditor} from '@vueup/vue-quill'
import '@vueup/vue-quill/dist/vue-quill.snow.css' // import '@vueup/vue-quill/dist/vue-quill.snow.css' //
import * as ElementPlusIconsVue from '@element-plus/icons-vue' import * as ElementPlusIconsVue from '@element-plus/icons-vue'
import shikigamiData from '../data/Shikigami.json'; import shikigamiData from '../data/Shikigami.json';
import _ from 'lodash';
const dialogTableVisible = ref(false) const dialogTableVisible = ref(false)
// //
@ -230,7 +231,7 @@ const updateShikigami = (shikigami) => {
state.showSelectShikigami = false; state.showSelectShikigami = false;
const oldProperties = state.groups[state.groupIndex].groupInfo[state.positionIndex].properties; const oldProperties = state.groups[state.groupIndex].groupInfo[state.positionIndex].properties;
state.groups[state.groupIndex].groupInfo[state.positionIndex] = shikigami; state.groups[state.groupIndex].groupInfo[state.positionIndex] = _.cloneDeep(shikigami);
state.groups[state.groupIndex].groupInfo[state.positionIndex].properties = oldProperties; state.groups[state.groupIndex].groupInfo[state.positionIndex].properties = oldProperties;
}; };
@ -249,7 +250,7 @@ const closeProperty = () => {
const updateProperty = (property) => { const updateProperty = (property) => {
state.showProperty = false; state.showProperty = false;
state.currentShikigami = {}; state.currentShikigami = {};
state.groups[state.groupIndex].groupInfo[state.positionIndex].properties = property; state.groups[state.groupIndex].groupInfo[state.positionIndex].properties = _.cloneDeep(property);
}; };
const removeGroupElement = (groupIndex, positionIndex) => { const removeGroupElement = (groupIndex, positionIndex) => {

Loading…
Cancel
Save