Merge branch 'mvp_step2_dev' into feature-appfieldselect
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
"name": "kintone-automate",
|
||||
"version": "0.2.0",
|
||||
"description": "Kintoneアプリの自動生成とデプロイを支援ツールです",
|
||||
"productName": "Kintone Automate",
|
||||
"productName": "kintone Automate",
|
||||
"author": "maxiaozhe@alicorns.co.jp <maxiaozhe@alicorns.co.jp>",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
<template>
|
||||
<q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label/>
|
||||
<q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label>
|
||||
<template v-slot:append v-if="hint!==''">
|
||||
<q-icon name="help" size="22px" color="blue-8">
|
||||
<q-tooltip class="bg-yellow-2 text-black shadow-4" anchor="bottom right"><div class="hint-text" v-html="hint"/></q-tooltip>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
@@ -39,7 +45,15 @@ export default defineComponent({
|
||||
|
||||
return {
|
||||
inputValue,
|
||||
showhint:ref(false)
|
||||
};
|
||||
},
|
||||
});
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.hint-text{
|
||||
white-space : always;
|
||||
max-width: 450px;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -447,7 +447,7 @@ export class ActionFlow implements IActionFlow {
|
||||
|
||||
getPrevVarNames(prevNode:IActionNode):IActionVariable[]{
|
||||
let varNames:IActionVariable[]=[];
|
||||
if(prevNode.varName!==undefined){
|
||||
if(prevNode.varName!==undefined && prevNode.varName.modelValue){
|
||||
varNames.unshift({
|
||||
actionName:prevNode.name,
|
||||
displayName:prevNode.varName.displayName,
|
||||
|
||||
Reference in New Issue
Block a user