Merge branch 'dev' into feature/validation-half-width

plugin/kintone-addins/src/actions/auto-numbering.ts

@@ -84,6 +84,7 @@ export class AutoNumbering implements IAction{
 
     execEval(match:string,expr:string):string{
         console.log(match);
+        // @ts-ignore
         return eval(expr);
     }
 

plugin/kintone-addins/src/actions/button-add.css

@@ -0,0 +1,24 @@
+.alc-button-normal {
+    display: inline-block;
+    box-sizing: border-box;
+    padding: 0 16px;
+    margin-left: 16px;
+    margin-top: 8px;
+    min-width: 100px;
+    outline: none;
+    border: 1px solid #e3e7e8;
+    background-color: #f7f9fa;
+    box-shadow: 1px 1px 1px #fff inset;
+    color: #3498db;
+    text-align: center;
+    line-height: 32px;
+}
+.alc-button-normal:hover {
+    background-color: #c8d6dd;
+    box-shadow: none;
+    cursor: pointer;
+  }
+.alc-button-normal:active {
+    color: #f7f9fa;
+    background-color: #54b8eb;
+}

plugin/kintone-addins/src/actions/button-add.ts

@@ -2,16 +2,24 @@
 import { actionAddins } from ".";
 import $ from 'jquery';
 import { IAction, IActionProperty, IActionNode, IActionResult } from "../types/ActionTypes";
+import "./button-add.css";
+
 /**
  * ボタン配置属性定義
  */
 interface IButtonAddProps {
     //ボタン表示名
     buttonName: string;
+    space?:ISpace;
     //配置位置
     position: string;
     //イベント名
     eventName:string
+}   
+
+interface ISpace{
+    type:string,
+    elementId:string
 }
 
 export class ButtonAddAction implements IAction {
@@ -47,43 +55,19 @@ export class ButtonAddAction implements IAction {
             }
             this.props = actionNode.ActionValue as IButtonAddProps; 
             //ボタンを配置する
-            const menuSpace = kintone.app.record.getHeaderMenuSpaceElement();
-            if(!menuSpace) return result;
-            if($("style#alc-button-add").length===0){
-                const css=`
-                .alc-button-normal {
-                    display: inline-block;
-                    box-sizing: border-box;
-                    padding: 0 16px;
-                    margin-left: 16px;
-                    margin-top: 8px;
-                    min-width: 100px;
-                    outline: none;
-                    border: 1px solid #e3e7e8;
-                    background-color: #f7f9fa;
-                    box-shadow: 1px 1px 1px #fff inset;
-                    color: #3498db;
-                    text-align: center;
-                    line-height: 32px;
-                }
-                .alc-button-normal:hover {
-                    background-color: #c8d6dd;
-                    box-shadow: none;
-                    cursor: pointer;
-                  }
-                .alc-button-normal:active {
-                    color: #f7f9fa;
-                    background-color: #54b8eb;
-                }`;
-                const style = $("<style id='alc-button-add'>/<style>");
-                style.text(css);
-                $("head").append(style);
+            let buttonSpace;
+            if(this.props.space && this.props.space.elementId){
+                buttonSpace = kintone.app.record.getSpaceElement(this.props.space.elementId);
+            }else{
+                buttonSpace = kintone.app.record.getHeaderMenuSpaceElement();
             }
+            if(!buttonSpace) return result;
+  
             const button =$(`<button id='${this.props.eventName}' class='alc-button-normal' >${this.props.buttonName}</button>`);
             if(this.props.position==="一番左に追加する"){
-                $(menuSpace).prepend(button);
+                $(buttonSpace).prepend(button);
             }else{
-                $(menuSpace).append(button);
+                $(buttonSpace).append(button);
             }
             const clickEventName = `${event.type}.customButtonClick.${this.props.eventName}`;
             button.on("click",()=>{
@@ -97,6 +81,7 @@ export class ButtonAddAction implements IAction {
             return result;
         }
     }
+  
 
     register(): void {
         actionAddins[this.name] = this;

plugin/kintone-addins/src/actions/insert-value.ts

@@ -1,8 +1,11 @@
 
+
 import { actionAddins } from ".";
 import {  IAction,IActionResult, IActionNode, IActionProperty, IField, IContext } from "../types/ActionTypes";
 import { ConditionTree } from '../types/Conditions';
 
+
+
 /**
  * アクションの属性定義
  */
@@ -353,11 +356,11 @@ export class InsertValueAction implements IAction{
             let correctFormattedValue;
             //入力値チェック後、形式変換、型変換した値を格納する配列
             let correctValues :string[] = [];
-            //空白文字チェックの結果が負の場合、true
-            let checkInputError=this.checkInputBlank(fieldType,fieldValue,fieldCode,fieldRequired,event);
+            //入力エラー（空白文字の混入）がないことをチェック
+            let notInputError=this.checkInputBlank(fieldType,fieldValue,fieldCode,fieldRequired,event);
 
-            //条件式の結果がtrue、空白文字チェックでエラーがない場合、挿入する値をフィールドタイプ別にチェックする
-            if(conditionResult && !checkInputError){
+            //条件式の結果がtrue、入力エラー（空白文字の混入）がない場合、挿入する値をフィールドタイプ別にチェックする
+            if(conditionResult && notInputError){
 
                 //文字列型のフィールドに挿入しようとしている値が適切の場合、correctFormattedValueに代入する
                 if(fieldType === "SINGLE_LINE_TEXT" || fieldType === "MULTI_LINE_TEXT" || fieldType === "RICH_TEXT" || fieldType === "LINK" ){

plugin/kintone-addins/src/index.ts

@@ -1,9 +1,3 @@
-// export const sum = (a: number, b: number) => {
-//   if ('development' === process.env.NODE_ENV) {
-//     console.log('boop');
-//   }
-//   return a + b;
-// };
 import $ from 'jquery';
 import { ActionProcess } from './types/action-process';
 import { ActionFlow } from './types/ActionTypes';