调整式神属性配置

src/components/ShikigamiProperty.vue

@@ -1,25 +1,42 @@
 <template>
   <el-dialog
-    v-model="show"
+      v-model="show"
-    :visable.sync="show"
+      :visable.sync="show"
-    title="配置属性"
+      title="配置属性"
-    @cancel="cancel"
+      @cancel="cancel"
-    :before-close="cancel"
+      :before-close="cancel"
   >
-    <span>当前选择侍神：{{current.name}}</span>
+    <span>当前选择式神：{{ current.name }}</span>
-    <el-form :model="form" label-width="120px">
+    <el-form :model="shikigami" label-width="120px">
+      <el-form-item label="等级要求">
+        <el-radio-group v-model="shikigami.levelRequired" class="ml-4">
+          <el-radio label="40" size="large">40</el-radio>
+          <el-radio label="0" size="large">献祭</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="技能要求">
+        <el-radio-group v-model="shikigami.skillRequiredMode" class="ml-4">
+          <el-radio label="all" size="large">全满</el-radio>
+          <el-radio label="111" size="large">111</el-radio>
+          <el-radio label="custom" size="large">自定义</el-radio>
+        </el-radio-group>
+        <div v-if="shikigami.skillRequiredMode === 'custom'" style="display: flex; flex-direction: row; width: 100%;">
+          <el-select v-for="(value, key, index) in shikigami.skillRequired" :placeholder="value"
+                     style="margin-bottom: 10px;" @change="updateSkillRequired(key, $event)">
+            <el-option label="*" value="*"/>
+            <el-option label="1" value="1"/>
+            <el-option label="2" value="2"/>
+            <el-option label="3" value="3"/>
+            <el-option label="4" value="4"/>
+            <el-option label="5" value="5"/>
+          </el-select>
+        </div>
+      </el-form-item>
       <el-form-item label="速度">
-        <el-input v-model="form.speed" />
+        <el-input v-model="shikigami.speed"/>
       </el-form-item>
-      <el-form-item label="天赋">
-        <el-select v-model="form.region" placeholder="please select your zone">
-          <el-option label="Zone one" value="shanghai" />
-          <el-option label="Zone two" value="beijing" />
-        </el-select>
-      </el-form-item>
-
       <el-form-item label="Activity form">
-        <el-input v-model="form.desc" type="textarea" />
+        <el-input v-model="shikigami.desc" type="textarea"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="confirm">Confirm</el-button>
@@ -31,7 +48,7 @@
 
 <script>
 import propertyData from "../data/property.json";
-import { ref } from "vue";
+import {ref} from "vue";
 
 export default {
   props: {
@@ -47,8 +64,12 @@ export default {
   data() {
     return {
       propertyData: propertyData,
-      form: {
+      shikigami: {
-        speed: ""
+        edit: false,
+        levelRequired: "40",
+        speed: "",
+        skillRequiredMode: "all",
+        skillRequired: ["技能一", "技能二", "技能三"]
       },
       current: {},
       show: false,
@@ -60,11 +81,15 @@ export default {
       this.show = newVal;
     },
     currentShikigami(newVal, oldVal) {
-        console.log("===item====>>>> ", newVal, oldVal);
+      console.log("confirm====" + JSON.stringify(newVal))
-        if (newVal.property != undefined) {
+
-          this.form = newVal.property;
+      console.log("confirm====" + JSON.stringify(oldVal))
-        }
+
-        this.current = newVal;
+      console.log("===item====>>>> ", newVal, oldVal);
+      if (newVal.properties != undefined && newVal.properties.edit == true) {
+        this.shikigami = newVal.properties;
+      }
+      this.current = newVal;
     },
   },
   methods: {
@@ -74,7 +99,20 @@ export default {
     },
     confirm() {
       console.log("confirm====");
-      this.$emit("updateProperty", this.form);
+      console.log("confirm====" + JSON.stringify(this.shikigami.edit))
+      // if (null == this.shikigami[this.index].properties) {
+      this.shikigami.edit = true
+        this.$emit("updateProperty", JSON.parse(JSON.stringify(this.shikigami)));
+        Object.assign(this.$data, this.$options.data())
+      console.log("confirm====" + JSON.stringify(this.shikigami.edit))
+
+      // }
+    },
+    updateSkillRequired(index, value) {
+      console.log(index)
+      console.log(value)
+      this.shikigami.skillRequired[index] = value;
+      console.log(this.shikigami.skillRequired)
     },
   },
 };

src/components/ShikigamiSelect.vue

@@ -117,7 +117,7 @@ export default {
     },
     confirm(i) {
       console.log("confirm====");
-      this.$emit("updateShikigami", i);
+      this.$emit("updateShikigami", JSON.parse(JSON.stringify(i)))
       // this.current = {};
     },
     filterShikigamiByRarity(rarity) {

src/components/Yys.vue

@@ -116,6 +116,7 @@ export default {
       console.log("add properties", index, item);
       this.showProperty = true;
       this.currentShikigami = item;
+      this.index = index;
     },
     closeProperty() {
       console.log("close property ===");