Do BlockParamEditor a bit

coolreader18 · coolreader18 · commit 2bf515822f82 · 2019-03-18T19:30:54.000-05:00
diff --git a/src/nico/src/nico/components/Block.vue b/src/nico/src/nico/components/Block.vue
@@ -1,20 +1,29 @@
 <template lang="pug">
-  draggable.dragArea(tag="ul" :list="children" :group="group")
+  draggable.dragArea(tag="ul" :list="children" :group="group" :clone="onClone")
     li(v-for="child in children")
       div(v-if="child.type === 'if'")
         | if {{ child.condition }}
         Block.child(:children="child.children")
       div(v-else-if="child.type === 'callMars'")
-        | call {{ child.func }}
+        | {{ child.func }}
+        BlockParamEditor(
+          v-for="(param, i) in marsFuncs.find(func => child.func === func.name).parameters"
+          v-model="child.params[i]"
+          :type="param"
+        )
 </template>
 
 <script>
 import draggable from 'vuedraggable'
+import BlockParamEditor from "./BlockParamEditor"
+import { FUNCTIONS_ONLY } from "../constants"
+import _ from "lodash"
 
 export default {
   name: 'Block',
   components: {
     draggable,
+    BlockParamEditor,
   },
   props: {
     children: {
@@ -32,12 +41,12 @@ export default {
         ? { name: 'blocks', pull: 'clone', put: false }
         : { name: 'blocks' }
     },
+    marsFuncs: () => FUNCTIONS_ONLY
   },
   methods: {
-    put (...args) {
-      console.log(args)
-      return true
-    },
+    onClone (data) {
+      return _.cloneDeep(data)
+    }
   },
 }
 </script>
diff --git a/src/nico/src/nico/components/BlockEditor.vue b/src/nico/src/nico/components/BlockEditor.vue
@@ -6,6 +6,7 @@
     .flex-grow-2
       h6.font-weight-bold Nico
       Block(:children="nicoFuncs" :clone="true")
+      | {{ blocksRoot }}
     .flex-grow-1.p-3
       Block(:children="blocksRoot")
 </template>
@@ -31,6 +32,7 @@ export default {
         {
           type: 'callMars',
           func: 'sprite',
+          params: [],
         },
       ],
     }
diff --git a/src/nico/src/nico/components/BlockParamEditor.vue b/src/nico/src/nico/components/BlockParamEditor.vue
@@ -1,20 +1,23 @@
 <template lang="pug">
-  div
-    div(v-if)
+  .d-inline
+    .d-inline(v-if="type.type === 'str'")
+      input(v-bind:value="value" v-on:input="$emit('input', $event.target.value)")
+    .d-inline(v-if="type.type === 'num'")
+      input.w-25(
+        type="number"
+        v-bind:value="value"
+        v-on:input="$emit('input', $event.target.value)"
+      )
 </template>
 
 <script>
 export default {
   name: 'BlockParamEditor',
   props: {
-    param: {
-      type: {
-        name: String,
-        type: String,
-      },
+    value: {
       required: true,
     },
-    value: {
+    type: {
       required: true,
     }
   },
diff --git a/src/nico/src/nico/constants.js b/src/nico/src/nico/constants.js
@@ -160,8 +160,7 @@ export const FUNCTIONS = [
 ].reverse()
 // reverse is because the sections appear in reverse order due to the rotation
 
-export const FUNCTIONS_BARE =
-  FUNCTIONS |>
-  _.filter(section => section.name !== 'User') |>
-  _.flatMap('functions') |>
-  _.map('name')
+export const FUNCTIONS_ONLY =
+  FUNCTIONS |> _.filter(section => section.name !== 'User') |> _.flatMap('functions')
+
+export const FUNCTIONS_BARE = FUNCTIONS_ONLY |> _.map('name')
