[UI] version page

# Conflicts:
#	frontend/src/types/AppTypes.ts

.gitignore

@@ -1,3 +1,7 @@
 .vscode
 .mypy_cache
 docker-stack.yml
+backend/pyvenv.cfg
+backend/Include/
+backend/Scripts/
+

backend/Scripts/Activate.ps1

@@ -1,502 +0,0 @@
-<#
-.Synopsis
-Activate a Python virtual environment for the current PowerShell session.
-
-.Description
-Pushes the python executable for a virtual environment to the front of the
-$Env:PATH environment variable and sets the prompt to signify that you are
-in a Python virtual environment. Makes use of the command line switches as
-well as the `pyvenv.cfg` file values present in the virtual environment.
-
-.Parameter VenvDir
-Path to the directory that contains the virtual environment to activate. The
-default value for this is the parent of the directory that the Activate.ps1
-script is located within.
-
-.Parameter Prompt
-The prompt prefix to display when this virtual environment is activated. By
-default, this prompt is the name of the virtual environment folder (VenvDir)
-surrounded by parentheses and followed by a single space (ie. '(.venv) ').
-
-.Example
-Activate.ps1
-Activates the Python virtual environment that contains the Activate.ps1 script.
-
-.Example
-Activate.ps1 -Verbose
-Activates the Python virtual environment that contains the Activate.ps1 script,
-and shows extra information about the activation as it executes.
-
-.Example
-Activate.ps1 -VenvDir C:\Users\MyUser\Common\.venv
-Activates the Python virtual environment located in the specified location.
-
-.Example
-Activate.ps1 -Prompt "MyPython"
-Activates the Python virtual environment that contains the Activate.ps1 script,
-and prefixes the current prompt with the specified string (surrounded in
-parentheses) while the virtual environment is active.
-
-.Notes
-On Windows, it may be required to enable this Activate.ps1 script by setting the
-execution policy for the user. You can do this by issuing the following PowerShell
-command:
-
-PS C:\> Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
-
-For more information on Execution Policies: 
-https://go.microsoft.com/fwlink/?LinkID=135170
-
-#>
-Param(
-    [Parameter(Mandatory = $false)]
-    [String]
-    $VenvDir,
-    [Parameter(Mandatory = $false)]
-    [String]
-    $Prompt
-)
-
-<# Function declarations --------------------------------------------------- #>
-
-<#
-.Synopsis
-Remove all shell session elements added by the Activate script, including the
-addition of the virtual environment's Python executable from the beginning of
-the PATH variable.
-
-.Parameter NonDestructive
-If present, do not remove this function from the global namespace for the
-session.
-
-#>
-function global:deactivate ([switch]$NonDestructive) {
-    # Revert to original values
-
-    # The prior prompt:
-    if (Test-Path -Path Function:_OLD_VIRTUAL_PROMPT) {
-        Copy-Item -Path Function:_OLD_VIRTUAL_PROMPT -Destination Function:prompt
-        Remove-Item -Path Function:_OLD_VIRTUAL_PROMPT
-    }
-
-    # The prior PYTHONHOME:
-    if (Test-Path -Path Env:_OLD_VIRTUAL_PYTHONHOME) {
-        Copy-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME -Destination Env:PYTHONHOME
-        Remove-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME
-    }
-
-    # The prior PATH:
-    if (Test-Path -Path Env:_OLD_VIRTUAL_PATH) {
-        Copy-Item -Path Env:_OLD_VIRTUAL_PATH -Destination Env:PATH
-        Remove-Item -Path Env:_OLD_VIRTUAL_PATH
-    }
-
-    # Just remove the VIRTUAL_ENV altogether:
-    if (Test-Path -Path Env:VIRTUAL_ENV) {
-        Remove-Item -Path env:VIRTUAL_ENV
-    }
-
-    # Just remove VIRTUAL_ENV_PROMPT altogether.
-    if (Test-Path -Path Env:VIRTUAL_ENV_PROMPT) {
-        Remove-Item -Path env:VIRTUAL_ENV_PROMPT
-    }
-
-    # Just remove the _PYTHON_VENV_PROMPT_PREFIX altogether:
-    if (Get-Variable -Name "_PYTHON_VENV_PROMPT_PREFIX" -ErrorAction SilentlyContinue) {
-        Remove-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Scope Global -Force
-    }
-
-    # Leave deactivate function in the global namespace if requested:
-    if (-not $NonDestructive) {
-        Remove-Item -Path function:deactivate
-    }
-}
-
-<#
-.Description
-Get-PyVenvConfig parses the values from the pyvenv.cfg file located in the
-given folder, and returns them in a map.
-
-For each line in the pyvenv.cfg file, if that line can be parsed into exactly
-two strings separated by `=` (with any amount of whitespace surrounding the =)
-then it is considered a `key = value` line. The left hand string is the key,
-the right hand is the value.
-
-If the value starts with a `'` or a `"` then the first and last character is
-stripped from the value before being captured.
-
-.Parameter ConfigDir
-Path to the directory that contains the `pyvenv.cfg` file.
-#>
-function Get-PyVenvConfig(
-    [String]
-    $ConfigDir
-) {
-    Write-Verbose "Given ConfigDir=$ConfigDir, obtain values in pyvenv.cfg"
-
-    # Ensure the file exists, and issue a warning if it doesn't (but still allow the function to continue).
-    $pyvenvConfigPath = Join-Path -Resolve -Path $ConfigDir -ChildPath 'pyvenv.cfg' -ErrorAction Continue
-
-    # An empty map will be returned if no config file is found.
-    $pyvenvConfig = @{ }
-
-    if ($pyvenvConfigPath) {
-
-        Write-Verbose "File exists, parse `key = value` lines"
-        $pyvenvConfigContent = Get-Content -Path $pyvenvConfigPath
-
-        $pyvenvConfigContent | ForEach-Object {
-            $keyval = $PSItem -split "\s*=\s*", 2
-            if ($keyval[0] -and $keyval[1]) {
-                $val = $keyval[1]
-
-                # Remove extraneous quotations around a string value.
-                if ("'""".Contains($val.Substring(0, 1))) {
-                    $val = $val.Substring(1, $val.Length - 2)
-                }
-
-                $pyvenvConfig[$keyval[0]] = $val
-                Write-Verbose "Adding Key: '$($keyval[0])'='$val'"
-            }
-        }
-    }
-    return $pyvenvConfig
-}
-
-
-<# Begin Activate script --------------------------------------------------- #>
-
-# Determine the containing directory of this script
-$VenvExecPath = Split-Path -Parent $MyInvocation.MyCommand.Definition
-$VenvExecDir = Get-Item -Path $VenvExecPath
-
-Write-Verbose "Activation script is located in path: '$VenvExecPath'"
-Write-Verbose "VenvExecDir Fullname: '$($VenvExecDir.FullName)"
-Write-Verbose "VenvExecDir Name: '$($VenvExecDir.Name)"
-
-# Set values required in priority: CmdLine, ConfigFile, Default
-# First, get the location of the virtual environment, it might not be
-# VenvExecDir if specified on the command line.
-if ($VenvDir) {
-    Write-Verbose "VenvDir given as parameter, using '$VenvDir' to determine values"
-}
-else {
-    Write-Verbose "VenvDir not given as a parameter, using parent directory name as VenvDir."
-    $VenvDir = $VenvExecDir.Parent.FullName.TrimEnd("\\/")
-    Write-Verbose "VenvDir=$VenvDir"
-}
-
-# Next, read the `pyvenv.cfg` file to determine any required value such
-# as `prompt`.
-$pyvenvCfg = Get-PyVenvConfig -ConfigDir $VenvDir
-
-# Next, set the prompt from the command line, or the config file, or
-# just use the name of the virtual environment folder.
-if ($Prompt) {
-    Write-Verbose "Prompt specified as argument, using '$Prompt'"
-}
-else {
-    Write-Verbose "Prompt not specified as argument to script, checking pyvenv.cfg value"
-    if ($pyvenvCfg -and $pyvenvCfg['prompt']) {
-        Write-Verbose "  Setting based on value in pyvenv.cfg='$($pyvenvCfg['prompt'])'"
-        $Prompt = $pyvenvCfg['prompt'];
-    }
-    else {
-        Write-Verbose "  Setting prompt based on parent's directory's name. (Is the directory name passed to venv module when creating the virtual environment)"
-        Write-Verbose "  Got leaf-name of $VenvDir='$(Split-Path -Path $venvDir -Leaf)'"
-        $Prompt = Split-Path -Path $venvDir -Leaf
-    }
-}
-
-Write-Verbose "Prompt = '$Prompt'"
-Write-Verbose "VenvDir='$VenvDir'"
-
-# Deactivate any currently active virtual environment, but leave the
-# deactivate function in place.
-deactivate -nondestructive
-
-# Now set the environment variable VIRTUAL_ENV, used by many tools to determine
-# that there is an activated venv.
-$env:VIRTUAL_ENV = $VenvDir
-
-if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) {
-
-    Write-Verbose "Setting prompt to '$Prompt'"
-
-    # Set the prompt to include the env name
-    # Make sure _OLD_VIRTUAL_PROMPT is global
-    function global:_OLD_VIRTUAL_PROMPT { "" }
-    Copy-Item -Path function:prompt -Destination function:_OLD_VIRTUAL_PROMPT
-    New-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Description "Python virtual environment prompt prefix" -Scope Global -Option ReadOnly -Visibility Public -Value $Prompt
-
-    function global:prompt {
-        Write-Host -NoNewline -ForegroundColor Green "($_PYTHON_VENV_PROMPT_PREFIX) "
-        _OLD_VIRTUAL_PROMPT
-    }
-    $env:VIRTUAL_ENV_PROMPT = $Prompt
-}
-
-# Clear PYTHONHOME
-if (Test-Path -Path Env:PYTHONHOME) {
-    Copy-Item -Path Env:PYTHONHOME -Destination Env:_OLD_VIRTUAL_PYTHONHOME
-    Remove-Item -Path Env:PYTHONHOME
-}
-
-# Add the venv to the PATH
-Copy-Item -Path Env:PATH -Destination Env:_OLD_VIRTUAL_PATH
-$Env:PATH = "$VenvExecDir$([System.IO.Path]::PathSeparator)$Env:PATH"
-
-# SIG # Begin signature block
-# MIIvIgYJKoZIhvcNAQcCoIIvEzCCLw8CAQExDzANBglghkgBZQMEAgEFADB5Bgor
-# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
-# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCBnL745ElCYk8vk
-# dBtMuQhLeWJ3ZGfzKW4DHCYzAn+QB6CCE8MwggWQMIIDeKADAgECAhAFmxtXno4h
-# MuI5B72nd3VcMA0GCSqGSIb3DQEBDAUAMGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQK
-# EwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNV
-# BAMTGERpZ2lDZXJ0IFRydXN0ZWQgUm9vdCBHNDAeFw0xMzA4MDExMjAwMDBaFw0z
-# ODAxMTUxMjAwMDBaMGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJ
-# bmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0
-# IFRydXN0ZWQgUm9vdCBHNDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
-# AL/mkHNo3rvkXUo8MCIwaTPswqclLskhPfKK2FnC4SmnPVirdprNrnsbhA3EMB/z
-# G6Q4FutWxpdtHauyefLKEdLkX9YFPFIPUh/GnhWlfr6fqVcWWVVyr2iTcMKyunWZ
-# anMylNEQRBAu34LzB4TmdDttceItDBvuINXJIB1jKS3O7F5OyJP4IWGbNOsFxl7s
-# Wxq868nPzaw0QF+xembud8hIqGZXV59UWI4MK7dPpzDZVu7Ke13jrclPXuU15zHL
-# 2pNe3I6PgNq2kZhAkHnDeMe2scS1ahg4AxCN2NQ3pC4FfYj1gj4QkXCrVYJBMtfb
-# BHMqbpEBfCFM1LyuGwN1XXhm2ToxRJozQL8I11pJpMLmqaBn3aQnvKFPObURWBf3
-# JFxGj2T3wWmIdph2PVldQnaHiZdpekjw4KISG2aadMreSx7nDmOu5tTvkpI6nj3c
-# AORFJYm2mkQZK37AlLTSYW3rM9nF30sEAMx9HJXDj/chsrIRt7t/8tWMcCxBYKqx
-# YxhElRp2Yn72gLD76GSmM9GJB+G9t+ZDpBi4pncB4Q+UDCEdslQpJYls5Q5SUUd0
-# viastkF13nqsX40/ybzTQRESW+UQUOsxxcpyFiIJ33xMdT9j7CFfxCBRa2+xq4aL
-# T8LWRV+dIPyhHsXAj6KxfgommfXkaS+YHS312amyHeUbAgMBAAGjQjBAMA8GA1Ud
-# EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTs1+OC0nFdZEzf
-# Lmc/57qYrhwPTzANBgkqhkiG9w0BAQwFAAOCAgEAu2HZfalsvhfEkRvDoaIAjeNk
-# aA9Wz3eucPn9mkqZucl4XAwMX+TmFClWCzZJXURj4K2clhhmGyMNPXnpbWvWVPjS
-# PMFDQK4dUPVS/JA7u5iZaWvHwaeoaKQn3J35J64whbn2Z006Po9ZOSJTROvIXQPK
-# 7VB6fWIhCoDIc2bRoAVgX+iltKevqPdtNZx8WorWojiZ83iL9E3SIAveBO6Mm0eB
-# cg3AFDLvMFkuruBx8lbkapdvklBtlo1oepqyNhR6BvIkuQkRUNcIsbiJeoQjYUIp
-# 5aPNoiBB19GcZNnqJqGLFNdMGbJQQXE9P01wI4YMStyB0swylIQNCAmXHE/A7msg
-# dDDS4Dk0EIUhFQEI6FUy3nFJ2SgXUE3mvk3RdazQyvtBuEOlqtPDBURPLDab4vri
-# RbgjU2wGb2dVf0a1TD9uKFp5JtKkqGKX0h7i7UqLvBv9R0oN32dmfrJbQdA75PQ7
-# 9ARj6e/CVABRoIoqyc54zNXqhwQYs86vSYiv85KZtrPmYQ/ShQDnUBrkG5WdGaG5
-# nLGbsQAe79APT0JsyQq87kP6OnGlyE0mpTX9iV28hWIdMtKgK1TtmlfB2/oQzxm3
-# i0objwG2J5VT6LaJbVu8aNQj6ItRolb58KaAoNYes7wPD1N1KarqE3fk3oyBIa0H
-# EEcRrYc9B9F1vM/zZn4wggawMIIEmKADAgECAhAIrUCyYNKcTJ9ezam9k67ZMA0G
-# CSqGSIb3DQEBDAUAMGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJ
-# bmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0
-# IFRydXN0ZWQgUm9vdCBHNDAeFw0yMTA0MjkwMDAwMDBaFw0zNjA0MjgyMzU5NTla
-# MGkxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjFBMD8GA1UE
-# AxM4RGlnaUNlcnQgVHJ1c3RlZCBHNCBDb2RlIFNpZ25pbmcgUlNBNDA5NiBTSEEz
-# ODQgMjAyMSBDQTEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDVtC9C
-# 0CiteLdd1TlZG7GIQvUzjOs9gZdwxbvEhSYwn6SOaNhc9es0JAfhS0/TeEP0F9ce
-# 2vnS1WcaUk8OoVf8iJnBkcyBAz5NcCRks43iCH00fUyAVxJrQ5qZ8sU7H/Lvy0da
-# E6ZMswEgJfMQ04uy+wjwiuCdCcBlp/qYgEk1hz1RGeiQIXhFLqGfLOEYwhrMxe6T
-# SXBCMo/7xuoc82VokaJNTIIRSFJo3hC9FFdd6BgTZcV/sk+FLEikVoQ11vkunKoA
-# FdE3/hoGlMJ8yOobMubKwvSnowMOdKWvObarYBLj6Na59zHh3K3kGKDYwSNHR7Oh
-# D26jq22YBoMbt2pnLdK9RBqSEIGPsDsJ18ebMlrC/2pgVItJwZPt4bRc4G/rJvmM
-# 1bL5OBDm6s6R9b7T+2+TYTRcvJNFKIM2KmYoX7BzzosmJQayg9Rc9hUZTO1i4F4z
-# 8ujo7AqnsAMrkbI2eb73rQgedaZlzLvjSFDzd5Ea/ttQokbIYViY9XwCFjyDKK05
-# huzUtw1T0PhH5nUwjewwk3YUpltLXXRhTT8SkXbev1jLchApQfDVxW0mdmgRQRNY
-# mtwmKwH0iU1Z23jPgUo+QEdfyYFQc4UQIyFZYIpkVMHMIRroOBl8ZhzNeDhFMJlP
-# /2NPTLuqDQhTQXxYPUez+rbsjDIJAsxsPAxWEQIDAQABo4IBWTCCAVUwEgYDVR0T
-# AQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUaDfg67Y7+F8Rhvv+YXsIiGX0TkIwHwYD
-# VR0jBBgwFoAU7NfjgtJxXWRM3y5nP+e6mK4cD08wDgYDVR0PAQH/BAQDAgGGMBMG
-# A1UdJQQMMAoGCCsGAQUFBwMDMHcGCCsGAQUFBwEBBGswaTAkBggrBgEFBQcwAYYY
-# aHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEEGCCsGAQUFBzAChjVodHRwOi8vY2Fj
-# ZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkUm9vdEc0LmNydDBDBgNV
-# HR8EPDA6MDigNqA0hjJodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRU
-# cnVzdGVkUm9vdEc0LmNybDAcBgNVHSAEFTATMAcGBWeBDAEDMAgGBmeBDAEEATAN
-# BgkqhkiG9w0BAQwFAAOCAgEAOiNEPY0Idu6PvDqZ01bgAhql+Eg08yy25nRm95Ry
-# sQDKr2wwJxMSnpBEn0v9nqN8JtU3vDpdSG2V1T9J9Ce7FoFFUP2cvbaF4HZ+N3HL
-# IvdaqpDP9ZNq4+sg0dVQeYiaiorBtr2hSBh+3NiAGhEZGM1hmYFW9snjdufE5Btf
-# Q/g+lP92OT2e1JnPSt0o618moZVYSNUa/tcnP/2Q0XaG3RywYFzzDaju4ImhvTnh
-# OE7abrs2nfvlIVNaw8rpavGiPttDuDPITzgUkpn13c5UbdldAhQfQDN8A+KVssIh
-# dXNSy0bYxDQcoqVLjc1vdjcshT8azibpGL6QB7BDf5WIIIJw8MzK7/0pNVwfiThV
-# 9zeKiwmhywvpMRr/LhlcOXHhvpynCgbWJme3kuZOX956rEnPLqR0kq3bPKSchh/j
-# wVYbKyP/j7XqiHtwa+aguv06P0WmxOgWkVKLQcBIhEuWTatEQOON8BUozu3xGFYH
-# Ki8QxAwIZDwzj64ojDzLj4gLDb879M4ee47vtevLt/B3E+bnKD+sEq6lLyJsQfmC
-# XBVmzGwOysWGw/YmMwwHS6DTBwJqakAwSEs0qFEgu60bhQjiWQ1tygVQK+pKHJ6l
-# /aCnHwZ05/LWUpD9r4VIIflXO7ScA+2GRfS0YW6/aOImYIbqyK+p/pQd52MbOoZW
-# eE4wggd3MIIFX6ADAgECAhAHHxQbizANJfMU6yMM0NHdMA0GCSqGSIb3DQEBCwUA
-# MGkxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjFBMD8GA1UE
-# AxM4RGlnaUNlcnQgVHJ1c3RlZCBHNCBDb2RlIFNpZ25pbmcgUlNBNDA5NiBTSEEz
-# ODQgMjAyMSBDQTEwHhcNMjIwMTE3MDAwMDAwWhcNMjUwMTE1MjM1OTU5WjB8MQsw
-# CQYDVQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMRIwEAYDVQQHEwlCZWF2ZXJ0b24x
-# IzAhBgNVBAoTGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMSMwIQYDVQQDExpQ
-# eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-# ADCCAgoCggIBAKgc0BTT+iKbtK6f2mr9pNMUTcAJxKdsuOiSYgDFfwhjQy89koM7
-# uP+QV/gwx8MzEt3c9tLJvDccVWQ8H7mVsk/K+X+IufBLCgUi0GGAZUegEAeRlSXx
-# xhYScr818ma8EvGIZdiSOhqjYc4KnfgfIS4RLtZSrDFG2tN16yS8skFa3IHyvWdb
-# D9PvZ4iYNAS4pjYDRjT/9uzPZ4Pan+53xZIcDgjiTwOh8VGuppxcia6a7xCyKoOA
-# GjvCyQsj5223v1/Ig7Dp9mGI+nh1E3IwmyTIIuVHyK6Lqu352diDY+iCMpk9Zanm
-# SjmB+GMVs+H/gOiofjjtf6oz0ki3rb7sQ8fTnonIL9dyGTJ0ZFYKeb6BLA66d2GA
-# LwxZhLe5WH4Np9HcyXHACkppsE6ynYjTOd7+jN1PRJahN1oERzTzEiV6nCO1M3U1
-# HbPTGyq52IMFSBM2/07WTJSbOeXjvYR7aUxK9/ZkJiacl2iZI7IWe7JKhHohqKuc
-# eQNyOzxTakLcRkzynvIrk33R9YVqtB4L6wtFxhUjvDnQg16xot2KVPdfyPAWd81w
-# tZADmrUtsZ9qG79x1hBdyOl4vUtVPECuyhCxaw+faVjumapPUnwo8ygflJJ74J+B
-# Yxf6UuD7m8yzsfXWkdv52DjL74TxzuFTLHPyARWCSCAbzn3ZIly+qIqDAgMBAAGj
-# ggIGMIICAjAfBgNVHSMEGDAWgBRoN+Drtjv4XxGG+/5hewiIZfROQjAdBgNVHQ4E
-# FgQUt/1Teh2XDuUj2WW3siYWJgkZHA8wDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQM
-# MAoGCCsGAQUFBwMDMIG1BgNVHR8Ega0wgaowU6BRoE+GTWh0dHA6Ly9jcmwzLmRp
-# Z2ljZXJ0LmNvbS9EaWdpQ2VydFRydXN0ZWRHNENvZGVTaWduaW5nUlNBNDA5NlNI
-# QTM4NDIwMjFDQTEuY3JsMFOgUaBPhk1odHRwOi8vY3JsNC5kaWdpY2VydC5jb20v
-# RGlnaUNlcnRUcnVzdGVkRzRDb2RlU2lnbmluZ1JTQTQwOTZTSEEzODQyMDIxQ0Ex
-# LmNybDA+BgNVHSAENzA1MDMGBmeBDAEEATApMCcGCCsGAQUFBwIBFhtodHRwOi8v
-# d3d3LmRpZ2ljZXJ0LmNvbS9DUFMwgZQGCCsGAQUFBwEBBIGHMIGEMCQGCCsGAQUF
-# BzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wXAYIKwYBBQUHMAKGUGh0dHA6
-# Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRydXN0ZWRHNENvZGVTaWdu
-# aW5nUlNBNDA5NlNIQTM4NDIwMjFDQTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZI
-# hvcNAQELBQADggIBABxv4AeV/5ltkELHSC63fXAFYS5tadcWTiNc2rskrNLrfH1N
-# s0vgSZFoQxYBFKI159E8oQQ1SKbTEubZ/B9kmHPhprHya08+VVzxC88pOEvz68nA
-# 82oEM09584aILqYmj8Pj7h/kmZNzuEL7WiwFa/U1hX+XiWfLIJQsAHBla0i7QRF2
-# de8/VSF0XXFa2kBQ6aiTsiLyKPNbaNtbcucaUdn6vVUS5izWOXM95BSkFSKdE45O
-# q3FForNJXjBvSCpwcP36WklaHL+aHu1upIhCTUkzTHMh8b86WmjRUqbrnvdyR2yd
-# I5l1OqcMBjkpPpIV6wcc+KY/RH2xvVuuoHjlUjwq2bHiNoX+W1scCpnA8YTs2d50
-# jDHUgwUo+ciwpffH0Riq132NFmrH3r67VaN3TuBxjI8SIZM58WEDkbeoriDk3hxU
-# 8ZWV7b8AW6oyVBGfM06UgkfMb58h+tJPrFx8VI/WLq1dTqMfZOm5cuclMnUHs2uq
-# rRNtnV8UfidPBL4ZHkTcClQbCoz0UbLhkiDvIS00Dn+BBcxw/TKqVL4Oaz3bkMSs
-# M46LciTeucHY9ExRVt3zy7i149sd+F4QozPqn7FrSVHXmem3r7bjyHTxOgqxRCVa
-# 18Vtx7P/8bYSBeS+WHCKcliFCecspusCDSlnRUjZwyPdP0VHxaZg2unjHY3rMYIa
-# tTCCGrECAQEwfTBpMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIElu
-# Yy4xQTA/BgNVBAMTOERpZ2lDZXJ0IFRydXN0ZWQgRzQgQ29kZSBTaWduaW5nIFJT
-# QTQwOTYgU0hBMzg0IDIwMjEgQ0ExAhAHHxQbizANJfMU6yMM0NHdMA0GCWCGSAFl
-# AwQCAQUAoIHIMBkGCSqGSIb3DQEJAzEMBgorBgEEAYI3AgEEMBwGCisGAQQBgjcC
-# AQsxDjAMBgorBgEEAYI3AgEVMC8GCSqGSIb3DQEJBDEiBCBnAZ6P7YvTwq0fbF62
-# o7E75R0LxsW5OtyYiFESQckLhjBcBgorBgEEAYI3AgEMMU4wTKBGgEQAQgB1AGkA
-# bAB0ADoAIABSAGUAbABlAGEAcwBlAF8AdgAzAC4AMQAxAC4ANABfADIAMAAyADMA
-# MAA2ADAANwAuADAAMaECgAAwDQYJKoZIhvcNAQEBBQAEggIAVdxtEr9NH8SoVTzT
-# o/jdr3t1yqExSecge3YGCu9USfMqLtmCKzG5r2rf3xZkJ6CpvmHwji3FUY6Hl991
-# Ttd0eEEpjeEse9gotnojgHTQACJntGuPcK+65jIQYNvp3JIuczjTW0JjWkJf4lqI
-# hVS6rEc00D/0NsUF9BbNkjNZ0AUQeOWe2WZJnqRRFN4U3pToN51NDjpEtRjlNTkc
-# SzoNO7ZyEsSXkNenlgbgS1yXEQ8v4bbnbPyyL+2yWMG1QsLv6M3OV0kXx9aow1r5
-# gZ1mCjBkbtWKH58WVBoepUaPYTjFBWCT2pDrorbg6cguwBdyz7s8X+WlCD4ycFfW
-# o95x7u1W9RwPPPppszr8Pd4jZSbEXEQ/G9Ke5NvTvNmK93b7/kySfNYfwW2meP6E
-# JIc0R9DMSZlK+ChtU5mmvo4e6YQTLXIXQhPIz7jVNlUjXMJX7WALjE72EDdC5MpQ
-# ygW7wue6EhjlUVXT4pEIySCGaXxUzRi1oh+Q+Jbe3rDvhSPZUWzCqEtOkJ35dLYh
-# D9Rahi2BM1qaepfu1wVtSXbVbc0SDPjloojEmTyDnk61u5epo0E0oHqNAU8t1ZTN
-# +Guptl/agMp52uRsaC5Bi276icqRtclfx9E4SfJEiw7xRlImCclMpw2dRsyzIrpb
-# MKpWDAno4rClgYS3M9lqQ71RlXehghc+MIIXOgYKKwYBBAGCNwMDATGCFyowghcm
-# BgkqhkiG9w0BBwKgghcXMIIXEwIBAzEPMA0GCWCGSAFlAwQCAQUAMHgGCyqGSIb3
-# DQEJEAEEoGkEZzBlAgEBBglghkgBhv1sBwEwMTANBglghkgBZQMEAgEFAAQgsPGH
-# UIiYgGXi/94WNZrP+V1kV/B5SVJn3ck+XzTJ0aACEQCJ79BpOkCDCW06IgZOU3EQ
-# GA8yMDIzMDYwNzA1NTc0NFqgghMHMIIGwDCCBKigAwIBAgIQDE1pckuU+jwqSj0p
-# B4A9WjANBgkqhkiG9w0BAQsFADBjMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGln
-# aUNlcnQsIEluYy4xOzA5BgNVBAMTMkRpZ2lDZXJ0IFRydXN0ZWQgRzQgUlNBNDA5
-# NiBTSEEyNTYgVGltZVN0YW1waW5nIENBMB4XDTIyMDkyMTAwMDAwMFoXDTMzMTEy
-# MTIzNTk1OVowRjELMAkGA1UEBhMCVVMxETAPBgNVBAoTCERpZ2lDZXJ0MSQwIgYD
-# VQQDExtEaWdpQ2VydCBUaW1lc3RhbXAgMjAyMiAtIDIwggIiMA0GCSqGSIb3DQEB
-# AQUAA4ICDwAwggIKAoICAQDP7KUmOsap8mu7jcENmtuh6BSFdDMaJqzQHFUeHjZt
-# vJJVDGH0nQl3PRWWCC9rZKT9BoMW15GSOBwxApb7crGXOlWvM+xhiummKNuQY1y9
-# iVPgOi2Mh0KuJqTku3h4uXoW4VbGwLpkU7sqFudQSLuIaQyIxvG+4C99O7HKU41A
-# gx7ny3JJKB5MgB6FVueF7fJhvKo6B332q27lZt3iXPUv7Y3UTZWEaOOAy2p50dIQ
-# kUYp6z4m8rSMzUy5Zsi7qlA4DeWMlF0ZWr/1e0BubxaompyVR4aFeT4MXmaMGgok
-# vpyq0py2909ueMQoP6McD1AGN7oI2TWmtR7aeFgdOej4TJEQln5N4d3CraV++C0b
-# H+wrRhijGfY59/XBT3EuiQMRoku7mL/6T+R7Nu8GRORV/zbq5Xwx5/PCUsTmFnta
-# fqUlc9vAapkhLWPlWfVNL5AfJ7fSqxTlOGaHUQhr+1NDOdBk+lbP4PQK5hRtZHi7
-# mP2Uw3Mh8y/CLiDXgazT8QfU4b3ZXUtuMZQpi+ZBpGWUwFjl5S4pkKa3YWT62SBs
-# GFFguqaBDwklU/G/O+mrBw5qBzliGcnWhX8T2Y15z2LF7OF7ucxnEweawXjtxojI
-# sG4yeccLWYONxu71LHx7jstkifGxxLjnU15fVdJ9GSlZA076XepFcxyEftfO4tQ6
-# dwIDAQABo4IBizCCAYcwDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwFgYD
-# VR0lAQH/BAwwCgYIKwYBBQUHAwgwIAYDVR0gBBkwFzAIBgZngQwBBAIwCwYJYIZI
-# AYb9bAcBMB8GA1UdIwQYMBaAFLoW2W1NhS9zKXaaL3WMaiCPnshvMB0GA1UdDgQW
-# BBRiit7QYfyPMRTtlwvNPSqUFN9SnDBaBgNVHR8EUzBRME+gTaBLhklodHRwOi8v
-# Y3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkRzRSU0E0MDk2U0hBMjU2
-# VGltZVN0YW1waW5nQ0EuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDAkBggrBgEFBQcw
-# AYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMFgGCCsGAQUFBzAChkxodHRwOi8v
-# Y2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkRzRSU0E0MDk2U0hB
-# MjU2VGltZVN0YW1waW5nQ0EuY3J0MA0GCSqGSIb3DQEBCwUAA4ICAQBVqioa80bz
-# eFc3MPx140/WhSPx/PmVOZsl5vdyipjDd9Rk/BX7NsJJUSx4iGNVCUY5APxp1Mqb
-# KfujP8DJAJsTHbCYidx48s18hc1Tna9i4mFmoxQqRYdKmEIrUPwbtZ4IMAn65C3X
-# CYl5+QnmiM59G7hqopvBU2AJ6KO4ndetHxy47JhB8PYOgPvk/9+dEKfrALpfSo8a
-# OlK06r8JSRU1NlmaD1TSsht/fl4JrXZUinRtytIFZyt26/+YsiaVOBmIRBTlClmi
-# a+ciPkQh0j8cwJvtfEiy2JIMkU88ZpSvXQJT657inuTTH4YBZJwAwuladHUNPeF5
-# iL8cAZfJGSOA1zZaX5YWsWMMxkZAO85dNdRZPkOaGK7DycvD+5sTX2q1x+DzBcNZ
-# 3ydiK95ByVO5/zQQZ/YmMph7/lxClIGUgp2sCovGSxVK05iQRWAzgOAj3vgDpPZF
-# R+XOuANCR+hBNnF3rf2i6Jd0Ti7aHh2MWsgemtXC8MYiqE+bvdgcmlHEL5r2X6cn
-# l7qWLoVXwGDneFZ/au/ClZpLEQLIgpzJGgV8unG1TnqZbPTontRamMifv427GFxD
-# 9dAq6OJi7ngE273R+1sKqHB+8JeEeOMIA11HLGOoJTiXAdI/Otrl5fbmm9x+LMz/
-# F0xNAKLY1gEOuIvu5uByVYksJxlh9ncBjDCCBq4wggSWoAMCAQICEAc2N7ckVHzY
-# R6z9KGYqXlswDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCVVMxFTATBgNVBAoT
-# DERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEhMB8GA1UE
-# AxMYRGlnaUNlcnQgVHJ1c3RlZCBSb290IEc0MB4XDTIyMDMyMzAwMDAwMFoXDTM3
-# MDMyMjIzNTk1OVowYzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJ
-# bmMuMTswOQYDVQQDEzJEaWdpQ2VydCBUcnVzdGVkIEc0IFJTQTQwOTYgU0hBMjU2
-# IFRpbWVTdGFtcGluZyBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
-# AMaGNQZJs8E9cklRVcclA8TykTepl1Gh1tKD0Z5Mom2gsMyD+Vr2EaFEFUJfpIjz
-# aPp985yJC3+dH54PMx9QEwsmc5Zt+FeoAn39Q7SE2hHxc7Gz7iuAhIoiGN/r2j3E
-# F3+rGSs+QtxnjupRPfDWVtTnKC3r07G1decfBmWNlCnT2exp39mQh0YAe9tEQYnc
-# fGpXevA3eZ9drMvohGS0UvJ2R/dhgxndX7RUCyFobjchu0CsX7LeSn3O9TkSZ+8O
-# pWNs5KbFHc02DVzV5huowWR0QKfAcsW6Th+xtVhNef7Xj3OTrCw54qVI1vCwMROp
-# VymWJy71h6aPTnYVVSZwmCZ/oBpHIEPjQ2OAe3VuJyWQmDo4EbP29p7mO1vsgd4i
-# FNmCKseSv6De4z6ic/rnH1pslPJSlRErWHRAKKtzQ87fSqEcazjFKfPKqpZzQmif
-# tkaznTqj1QPgv/CiPMpC3BhIfxQ0z9JMq++bPf4OuGQq+nUoJEHtQr8FnGZJUlD0
-# UfM2SU2LINIsVzV5K6jzRWC8I41Y99xh3pP+OcD5sjClTNfpmEpYPtMDiP6zj9Ne
-# S3YSUZPJjAw7W4oiqMEmCPkUEBIDfV8ju2TjY+Cm4T72wnSyPx4JduyrXUZ14mCj
-# WAkBKAAOhFTuzuldyF4wEr1GnrXTdrnSDmuZDNIztM2xAgMBAAGjggFdMIIBWTAS
-# BgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBS6FtltTYUvcyl2mi91jGogj57I
-# bzAfBgNVHSMEGDAWgBTs1+OC0nFdZEzfLmc/57qYrhwPTzAOBgNVHQ8BAf8EBAMC
-# AYYwEwYDVR0lBAwwCgYIKwYBBQUHAwgwdwYIKwYBBQUHAQEEazBpMCQGCCsGAQUF
-# BzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wQQYIKwYBBQUHMAKGNWh0dHA6
-# Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRydXN0ZWRSb290RzQuY3J0
-# MEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdp
-# Q2VydFRydXN0ZWRSb290RzQuY3JsMCAGA1UdIAQZMBcwCAYGZ4EMAQQCMAsGCWCG
-# SAGG/WwHATANBgkqhkiG9w0BAQsFAAOCAgEAfVmOwJO2b5ipRCIBfmbW2CFC4bAY
-# LhBNE88wU86/GPvHUF3iSyn7cIoNqilp/GnBzx0H6T5gyNgL5Vxb122H+oQgJTQx
-# Z822EpZvxFBMYh0MCIKoFr2pVs8Vc40BIiXOlWk/R3f7cnQU1/+rT4osequFzUNf
-# 7WC2qk+RZp4snuCKrOX9jLxkJodskr2dfNBwCnzvqLx1T7pa96kQsl3p/yhUifDV
-# inF2ZdrM8HKjI/rAJ4JErpknG6skHibBt94q6/aesXmZgaNWhqsKRcnfxI2g55j7
-# +6adcq/Ex8HBanHZxhOACcS2n82HhyS7T6NJuXdmkfFynOlLAlKnN36TU6w7HQhJ
-# D5TNOXrd/yVjmScsPT9rp/Fmw0HNT7ZAmyEhQNC3EyTN3B14OuSereU0cZLXJmvk
-# OHOrpgFPvT87eK1MrfvElXvtCl8zOYdBeHo46Zzh3SP9HSjTx/no8Zhf+yvYfvJG
-# nXUsHicsJttvFXseGYs2uJPU5vIXmVnKcPA3v5gA3yAWTyf7YGcWoWa63VXAOimG
-# sJigK+2VQbc61RWYMbRiCQ8KvYHZE/6/pNHzV9m8BPqC3jLfBInwAM1dwvnQI38A
-# C+R2AibZ8GV2QqYphwlHK+Z/GqSFD/yYlvZVVCsfgPrA8g4r5db7qS9EFUrnEw4d
-# 2zc4GqEr9u3WfPwwggWNMIIEdaADAgECAhAOmxiO+dAt5+/bUOIIQBhaMA0GCSqG
-# SIb3DQEBDAUAMGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMx
-# GTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEFz
-# c3VyZWQgSUQgUm9vdCBDQTAeFw0yMjA4MDEwMDAwMDBaFw0zMTExMDkyMzU5NTla
-# MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsT
-# EHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IFRydXN0ZWQgUm9v
-# dCBHNDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL/mkHNo3rvkXUo8
-# MCIwaTPswqclLskhPfKK2FnC4SmnPVirdprNrnsbhA3EMB/zG6Q4FutWxpdtHauy
-# efLKEdLkX9YFPFIPUh/GnhWlfr6fqVcWWVVyr2iTcMKyunWZanMylNEQRBAu34Lz
-# B4TmdDttceItDBvuINXJIB1jKS3O7F5OyJP4IWGbNOsFxl7sWxq868nPzaw0QF+x
-# embud8hIqGZXV59UWI4MK7dPpzDZVu7Ke13jrclPXuU15zHL2pNe3I6PgNq2kZhA
-# kHnDeMe2scS1ahg4AxCN2NQ3pC4FfYj1gj4QkXCrVYJBMtfbBHMqbpEBfCFM1Lyu
-# GwN1XXhm2ToxRJozQL8I11pJpMLmqaBn3aQnvKFPObURWBf3JFxGj2T3wWmIdph2
-# PVldQnaHiZdpekjw4KISG2aadMreSx7nDmOu5tTvkpI6nj3cAORFJYm2mkQZK37A
-# lLTSYW3rM9nF30sEAMx9HJXDj/chsrIRt7t/8tWMcCxBYKqxYxhElRp2Yn72gLD7
-# 6GSmM9GJB+G9t+ZDpBi4pncB4Q+UDCEdslQpJYls5Q5SUUd0viastkF13nqsX40/
-# ybzTQRESW+UQUOsxxcpyFiIJ33xMdT9j7CFfxCBRa2+xq4aLT8LWRV+dIPyhHsXA
-# j6KxfgommfXkaS+YHS312amyHeUbAgMBAAGjggE6MIIBNjAPBgNVHRMBAf8EBTAD
-# AQH/MB0GA1UdDgQWBBTs1+OC0nFdZEzfLmc/57qYrhwPTzAfBgNVHSMEGDAWgBRF
-# 66Kv9JLLgjEtUYunpyGd823IDzAOBgNVHQ8BAf8EBAMCAYYweQYIKwYBBQUHAQEE
-# bTBrMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wQwYIKwYB
-# BQUHMAKGN2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEFzc3Vy
-# ZWRJRFJvb3RDQS5jcnQwRQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL2NybDMuZGln
-# aWNlcnQuY29tL0RpZ2lDZXJ0QXNzdXJlZElEUm9vdENBLmNybDARBgNVHSAECjAI
-# MAYGBFUdIAAwDQYJKoZIhvcNAQEMBQADggEBAHCgv0NcVec4X6CjdBs9thbX979X
-# B72arKGHLOyFXqkauyL4hxppVCLtpIh3bb0aFPQTSnovLbc47/T/gLn4offyct4k
-# vFIDyE7QKt76LVbP+fT3rDB6mouyXtTP0UNEm0Mh65ZyoUi0mcudT6cGAxN3J0TU
-# 53/oWajwvy8LpunyNDzs9wPHh6jSTEAZNUZqaVSwuKFWjuyk1T3osdz9HNj0d1pc
-# VIxv76FQPfx2CWiEn2/K2yCNNWAcAgPLILCsWKAOQGPFmCLBsln1VWvPJ6tsds5v
-# Iy30fnFqI2si/xK4VC0nftg62fC2h5b9W9FcrBjDTZ9ztwGpn1eqXijiuZQxggN2
-# MIIDcgIBATB3MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5j
-# LjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0MDk2IFNIQTI1NiBU
-# aW1lU3RhbXBpbmcgQ0ECEAxNaXJLlPo8Kko9KQeAPVowDQYJYIZIAWUDBAIBBQCg
-# gdEwGgYJKoZIhvcNAQkDMQ0GCyqGSIb3DQEJEAEEMBwGCSqGSIb3DQEJBTEPFw0y
-# MzA2MDcwNTU3NDRaMCsGCyqGSIb3DQEJEAIMMRwwGjAYMBYEFPOHIk2GM4KSNamU
-# vL2Plun+HHxzMC8GCSqGSIb3DQEJBDEiBCAZCWWaBjTHAZnsndSxyxCaZSOrTyqo
-# O35hv3VOlS9KHDA3BgsqhkiG9w0BCRACLzEoMCYwJDAiBCDH9OG+MiiJIKviJjq+
-# GsT8T+Z4HC1k0EyAdVegI7W2+jANBgkqhkiG9w0BAQEFAASCAgBt92vHxbHXh4Z2
-# yl+aTo7PltgPhZhoQCWg+gDSyySEqkDN+kTuoW3ROuMjR1JR0htJOwVqnmI/enhW
-# r8VJiDKfGOGupHEfzAlMaIIC+K+C3sSoeaRR1aiOWrUA/oPpJIgwXyfo65Hf07qf
-# wdn//4y5zv6oMdHNtpSfFgibze5BjNRAgOUxl9rvKArEN7B+WTCnvLWw/EJe48MQ
-# B0zUbVFIORQUHlLnCL07JGRSN5bHaMtnn5eEwZFC9522kJaHyLrmfeP4jZLMhjhn
-# fGxv69HVzggM8CpjpQA8l8hh6Il48TDMZpdqkxwjoRmJVwt3hwTrfuE11NFrXEAD
-# 8dAAta6N/M722c3BE6UxM2R4QXyV05BL6e4jVJm1aR1ebUVS4nZVZ/jbCexR/+vx
-# mfSh1SezU3KlgRMDrLF+El883BFoe/99p4/QjjnELhn41lPPAYGefhMI9ioYZULQ
-# xMyG6qIPA8s2tnYIL/AKvh7SUgFVtOsTKbTFXMMr20sipBQQFUOb8ZD+8u4Iyc4M
-# UC4d2S6z9zwlPbSr1lk9m3R8rl+j2/VkB1S21nqda3xWFk/+n/2oEJe4gUkCiQxs
-# qFaykkcAhWYdZVRRNM89ZF23DeYAEkUEaD2M1ld0CZNtvtPNmv/NZV/Xbb3H0RPR
-# yDBB2JQI1BbEjl7HWy616MUsAqWA+Q==
-# SIG # End signature block

backend/Scripts/activate

@@ -1,69 +0,0 @@
-# This file must be used with "source bin/activate" *from bash*
-# you cannot run it directly
-
-deactivate () {
-    # reset old environment variables
-    if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then
-        PATH="${_OLD_VIRTUAL_PATH:-}"
-        export PATH
-        unset _OLD_VIRTUAL_PATH
-    fi
-    if [ -n "${_OLD_VIRTUAL_PYTHONHOME:-}" ] ; then
-        PYTHONHOME="${_OLD_VIRTUAL_PYTHONHOME:-}"
-        export PYTHONHOME
-        unset _OLD_VIRTUAL_PYTHONHOME
-    fi
-
-    # This should detect bash and zsh, which have a hash command that must
-    # be called to get it to forget past commands.  Without forgetting
-    # past commands the $PATH changes we made may not be respected
-    if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
-        hash -r 2> /dev/null
-    fi
-
-    if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then
-        PS1="${_OLD_VIRTUAL_PS1:-}"
-        export PS1
-        unset _OLD_VIRTUAL_PS1
-    fi
-
-    unset VIRTUAL_ENV
-    unset VIRTUAL_ENV_PROMPT
-    if [ ! "${1:-}" = "nondestructive" ] ; then
-    # Self destruct!
-        unset -f deactivate
-    fi
-}
-
-# unset irrelevant variables
-deactivate nondestructive
-
-VIRTUAL_ENV="C:\project\Kintone\KintoneAppBuilder\backend"
-export VIRTUAL_ENV
-
-_OLD_VIRTUAL_PATH="$PATH"
-PATH="$VIRTUAL_ENV/Scripts:$PATH"
-export PATH
-
-# unset PYTHONHOME if set
-# this will fail if PYTHONHOME is set to the empty string (which is bad anyway)
-# could use `if (set -u; : $PYTHONHOME) ;` in bash
-if [ -n "${PYTHONHOME:-}" ] ; then
-    _OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}"
-    unset PYTHONHOME
-fi
-
-if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then
-    _OLD_VIRTUAL_PS1="${PS1:-}"
-    PS1="(backend) ${PS1:-}"
-    export PS1
-    VIRTUAL_ENV_PROMPT="(backend) "
-    export VIRTUAL_ENV_PROMPT
-fi
-
-# This should detect bash and zsh, which have a hash command that must
-# be called to get it to forget past commands.  Without forgetting
-# past commands the $PATH changes we made may not be respected
-if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
-    hash -r 2> /dev/null
-fi

backend/Scripts/activate.bat

@@ -1,34 +0,0 @@
-@echo off
-
-rem This file is UTF-8 encoded, so we need to update the current code page while executing it
-for /f "tokens=2 delims=:." %%a in ('"%SystemRoot%\System32\chcp.com"') do (
-    set _OLD_CODEPAGE=%%a
-)
-if defined _OLD_CODEPAGE (
-    "%SystemRoot%\System32\chcp.com" 65001 > nul
-)
-
-set VIRTUAL_ENV=C:\project\Kintone\KintoneAppBuilder\backend
-
-if not defined PROMPT set PROMPT=$P$G
-
-if defined _OLD_VIRTUAL_PROMPT set PROMPT=%_OLD_VIRTUAL_PROMPT%
-if defined _OLD_VIRTUAL_PYTHONHOME set PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%
-
-set _OLD_VIRTUAL_PROMPT=%PROMPT%
-set PROMPT=(backend) %PROMPT%
-
-if defined PYTHONHOME set _OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%
-set PYTHONHOME=
-
-if defined _OLD_VIRTUAL_PATH set PATH=%_OLD_VIRTUAL_PATH%
-if not defined _OLD_VIRTUAL_PATH set _OLD_VIRTUAL_PATH=%PATH%
-
-set PATH=%VIRTUAL_ENV%\Scripts;%PATH%
-set VIRTUAL_ENV_PROMPT=(backend) 
-
-:END
-if defined _OLD_CODEPAGE (
-    "%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul
-    set _OLD_CODEPAGE=
-)

backend/Scripts/deactivate.bat

@@ -1,22 +0,0 @@
-@echo off
-
-if defined _OLD_VIRTUAL_PROMPT (
-    set "PROMPT=%_OLD_VIRTUAL_PROMPT%"
-)
-set _OLD_VIRTUAL_PROMPT=
-
-if defined _OLD_VIRTUAL_PYTHONHOME (
-    set "PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%"
-    set _OLD_VIRTUAL_PYTHONHOME=
-)
-
-if defined _OLD_VIRTUAL_PATH (
-    set "PATH=%_OLD_VIRTUAL_PATH%"
-)
-
-set _OLD_VIRTUAL_PATH=
-
-set VIRTUAL_ENV=
-set VIRTUAL_ENV_PROMPT=
-
-:END

backend/app/api/api_v1/routers/auth.py

@@ -25,11 +25,15 @@ async def login(
         minutes=security.ACCESS_TOKEN_EXPIRE_MINUTES
     )
     if user.is_superuser:
-        permissions = "admin"
+        roles = "super"
+        permissions = "ALL"
     else:
-        permissions = "user"
+        roles = ";".join(role.name for role in user.roles)
+        perlst = [perm.privilege for role in user.roles for perm in role.permissions]
+        permissions =";".join(list(set(perlst)))
+    
     access_token = security.create_access_token(
-        data={"sub": user.id, "permissions": permissions},
+        data={"sub": user.id, "roles":roles,"permissions": permissions ,},
         expires_delta=access_token_expires,
     )
 

backend/app/api/api_v1/routers/kintone.py

@@ -9,15 +9,16 @@ import app.core.config as config
 import os
 from pathlib import Path
 from app.db.session import SessionLocal
-from app.db.crud import get_flows_by_app,get_activedomain,get_kintoneformat
+from app.db.crud import get_flows_by_app,get_kintoneformat
 from app.core.auth import get_current_active_user,get_current_user
 from app.core.apiexception import APIException
+from app.db.cruddb.dbdomain import dbdomain
 
 kinton_router = r = APIRouter()
 
 def getkintoneenv(user = Depends(get_current_user)):
     db = SessionLocal()
-    domain = get_activedomain(db, user.id)
+    domain = dbdomain.get_default_domain(db,user.id) #get_activedomain(db, user.id)
     db.close()
     kintoneevn = config.KINTONE_ENV(domain)
     return kintoneevn
@@ -156,10 +157,10 @@ def getsettingfromexcel(df):
     des = df.iloc[2,2]
     return {"name":appname,"description":des}
 
-def getsettingfromkintone(app:str,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
+def getsettingfromkintone(app:str,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
     params = {"app":app}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/app/settings.json"
+    url = f"{env.BASE_URL}{config.API_V1_STR}/app/settings.json"
     r = httpx.get(url,headers=headers,params=params)
     return r.json()
 
@@ -171,60 +172,101 @@ def analysesettings(excel,kintone):
             updatesettings[key] = excel[key]
     return updatesettings
 
-def createkintoneapp(name:str,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+def createkintoneapp(name:str,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
     data = {"name":name}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app.json"
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app.json"
     r = httpx.post(url,headers=headers,data=json.dumps(data))
     return r.json()
 
-def updateappsettingstokintone(app:str,updates:dict,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/settings.json"
+def updateappsettingstokintone(app:str,updates:dict,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/settings.json"
     data = {"app":app}
     data.update(updates)
     r = httpx.put(url,headers=headers,data=json.dumps(data))
     return r.json()
 
-def addfieldstokintone(app:str,fields:dict,c:config.KINTONE_ENV,revision:str = None):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
+def addfieldstokintone(app:str,fields:dict,env:config.KINTONE_ENV,revision:str = None):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
     if revision != None:
         data = {"app":app,"revision":revision,"properties":fields}
     else:
         data = {"app":app,"properties":fields}
     r = httpx.post(url,headers=headers,data=json.dumps(data))
+    r.raise_for_status()
     return r.json()
-
-def updatefieldstokintone(app:str,revision:str,fields:dict,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
+ 
+def updatefieldstokintone(app:str,revision:str,fields:dict,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
     data = {"app":app,"properties":fields}
     r = httpx.put(url,headers=headers,data=json.dumps(data))
     return r.json()
 
-def deletefieldsfromkintone(app:str,revision:str,fields:dict,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
+def deletefieldsfromkintone(app:str,revision:str,fields:dict,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/form/fields.json"
     params = {"app":app,"revision":revision,"fields":fields}
     #r = httpx.delete(url,headers=headers,content=json.dumps(params))
     r = httpx.request(method="DELETE",url=url,headers=headers,content=json.dumps(params))
     return r.json()
 
-def deoployappfromkintone(app:str,revision:str,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/deploy.json"
+def deoployappfromkintone(app:str,revision:str,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/deploy.json"
     data = {"apps":[{"app":app,"revision":revision}],"revert": False}
     r = httpx.post(url,headers=headers,data=json.dumps(data))
     return r.json
-    
-def getfieldsfromkintone(app:str,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
+
+# 既定項目に含めるアプリのフィールドのみ取得する
+# スペース、枠線、ラベルを含まない    
+def getfieldsfromkintone(app:str,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
     params = {"app":app}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/app/form/fields.json"
+    url = f"{env.BASE_URL}{config.API_V1_STR}/app/form/fields.json"
     r = httpx.get(url,headers=headers,params=params)
     return r.json()
 
+# フォームに配置するフィールドのみ取得する
+# スペース、枠線、ラベルも含める
+def getformfromkintone(app:str,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
+    params = {"app":app}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/form.json"
+    r = httpx.get(url,headers=headers,params=params)
+    return r.json()
+
+
+def merge_kintone_fields(fields_response: dict, form_response: dict) -> dict:
+    fields_properties = fields_response.get('properties', {})
+    form_properties = form_response.get('properties', [])
+
+    merged_properties = {k: v for k, v in fields_properties.items()}
+
+    for index, form_field in enumerate(form_properties):
+        code = form_field.get('code')
+        if code:
+            if code and code not in merged_properties:
+                merged_properties[code] = form_field
+        else:
+            element_id = form_field.get('elementId')
+            if element_id:
+                key = element_id
+                form_field['code']=element_id
+                form_field['label']=form_field.get('type')
+            # else:
+            #     key = f"{form_field.get('type')}_{index}"
+                merged_properties[key] = form_field 
+
+    merged_response = {
+        'revision': fields_response.get('revision', ''),
+        'properties': merged_properties
+    }
+    
+    return merged_response
+
 def analysefields(excel,kintone):
     updatefields={}
     addfields={}
@@ -245,10 +287,10 @@ def analysefields(excel,kintone):
 
     return {"update":updatefields,"add":addfields,"del":delfields}
 
-def getprocessfromkintone(app:str,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
+def getprocessfromkintone(app:str,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
     params = {"app":app}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/app/status.json"
+    url = f"{env.BASE_URL}{config.API_V1_STR}/app/status.json"
     r = httpx.get(url,headers=headers,params=params)
     return r.json()
 
@@ -333,49 +375,95 @@ def getkintoneorgs(c:config.KINTONE_ENV):
     r = httpx.get(url,headers=headers,params=params)
     return r.json()
 
-def uploadkintonefiles(file,c:config.KINTONE_ENV):
+def uploadkintonefiles(file,env:config.KINTONE_ENV):
     if (file.endswith('alc_runtime.js') and config.DEPLOY_MODE == "DEV"):
         return {'fileKey':file}
     upload_files = {'file': open(file,'rb')}
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
     data ={'name':'file','filename':os.path.basename(file)}
-    url = f"{c.BASE_URL}/k/v1/file.json"
-    r = httpx.post(url,headers=headers,data=data,files=upload_files)
+    url = f"{env.BASE_URL}/k/v1/file.json"
+    r = httpx.post(url,headers=headers,data=data,files=upload_files)    
+    #{"name":data['filename'],'fileKey':r['fileKey']}
     return r.json()
 
-def updateappjscss(app,uploads,c:config.KINTONE_ENV):
+def updateappjscss(app,uploads,env:config.KINTONE_ENV):
     dsjs = []
     dscss = []
+    #mobile側
+    mbjs = []  
+    mbcss = []
+    customize = getappcustomize(app, env)
+    current_js = customize['desktop'].get('js', [])
+    current_css = customize['desktop'].get('css', [])
+    current_mobile_js = customize['mobile'].get('js', [])
+    current_mobile_css = customize['mobile'].get('css', [])
+    current_js = [item for item in current_js if not (item.get('type') == 'URL' and item.get('url', '').endswith('alc_runtime.js'))]
     for upload in uploads:
         for key in upload:
+             filename = os.path.basename(key)
              if key.endswith('.js'):
-                 if (key.endswith('alc_runtime.js') and config.DEPLOY_MODE == "DEV"):
-                    dsjs.append({'type':'URL','url':config.DEPLOY_JS_URL})
-                 else:
+                 existing_js = next((item for item in current_js 
+                                     if item.get('type') == 'FILE' and  item['file']['name'] == filename 
+                                    ), None)
+                 if existing_js:
+                    current_js = [item for item in current_js if item.get('type') == 'URL' or item['file'].get('name') != filename]
                     dsjs.append({'type':'FILE','file':{'fileKey':upload[key]}})
+                 else:
+                    if (key.endswith('alc_runtime.js') and config.DEPLOY_MODE == "DEV"):
+                        dsjs.append({'type':'URL','url':config.DEPLOY_JS_URL})
+                    else:
+                        dsjs.append({'type':'FILE','file':{'fileKey':upload[key]}})
              elif key.endswith('.css'):
-                 dscss.append({'type':'FILE','file':{'fileKey':upload[key]}})
+                existing_css = next((item for item in current_css 
+                                    if item.get('type') == 'FILE' and item['file']['name'] == filename
+                                ), None)
+                if existing_css:
+                    current_css = [item for item in current_css if item.get('type') == 'URL' or item['file'].get('name') != filename]
+                    dscss.append({'type': 'FILE', 'file': {'fileKey': upload[key]}})
+                else:
+                    dscss.append({'type': 'FILE', 'file': {'fileKey': upload[key]}})
+    #現在のJSとCSSがdsjsに追加する
+    dsjs.extend(current_js)
+    dscss.extend(current_css)
+    mbjs.extend(current_mobile_js)
+    mbcss.extend(current_mobile_css)
+               
     ds ={'js':dsjs,'css':dscss}
-    mb ={'js':[],'css':[]}
-    data = {'app':app,'scope':'ALL','desktop':ds,'mobile':mb}
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/customize.json"
-    print(data)
+    mb ={'js':mbjs,'css':mbcss}
+    data = {'app':app,'scope':'ALL','desktop':ds,'mobile':mb,'revision':customize["revision"]}
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/customize.json"
+    print(json.dumps(data))
     r = httpx.put(url,headers=headers,data=json.dumps(data))
     return r.json()
 
-def createappjs(domainid,app):
+#kintone カスタマイズ情報
+def getappcustomize(app,env:config.KINTONE_ENV):
+    headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
+    url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/customize.json"
+    params = {"app":app}
+    r = httpx.get(url,headers=headers,params=params)
+    return r.json()
+    
+
+def getTempPath(filename):
+    scriptdir = Path(__file__).resolve().parent
+    rootdir = scriptdir.parent.parent.parent.parent
+    fpath = os.path.join(rootdir,"Temp",filename)
+    return fpath
+
+def createappjs(domain_url,app):
     db = SessionLocal()
-    flows = get_flows_by_app(db,domainid,app)
+    flows = get_flows_by_app(db,domain_url,app)
     db.close()
     content={}
     for flow in flows:
         content[flow.eventid] = {'flowid':flow.flowid,'name':flow.name,'content':flow.content}
     js = 'const alcflow=' + json.dumps(content)
-    scriptdir = Path(__file__).resolve().parent
-    rootdir = scriptdir.parent.parent.parent.parent
-    fpath = os.path.join(rootdir,"Temp",f"alc_setting_{app}.js")
-    print(rootdir)
+    # scriptdir = Path(__file__).resolve().parent
+    # rootdir = scriptdir.parent.parent.parent.parent
+    # fpath = os.path.join(rootdir,"Temp",f"alc_setting_{app}.js")
+    fpath = getTempPath(f"alc_setting_{app}.js")
     print(fpath)
     with open(fpath,'w') as file:
         file.write(js)
@@ -434,7 +522,7 @@ async def upload(request:Request,files:t.List[UploadFile] = File(...)):
     return {"files": [file.filename for file in files]}  
 
 @r.post("/updatejscss")
-async def jscss(request:Request,app:str,files:t.List[UploadFile] = File(...),env = Depends(getkintoneenv)):
+async def jscss(request:Request,app:str,files:t.List[UploadFile] = File(...),env:config.KINTONE_ENV = Depends(getkintoneenv)):
     try:
         jscs=[]
         for file in files:
@@ -455,66 +543,87 @@ async def jscss(request:Request,app:str,files:t.List[UploadFile] = File(...),env
         raise APIException('kintone:updatejscss',request.url._url, f"Error occurred while update js/css {file.filename} is not an Excel file",e)
 
 @r.get("/app")
-async def app(request:Request,app:str,c:config.KINTONE_ENV=Depends(getkintoneenv)):
+async def app(request:Request,app:str,env:config.KINTONE_ENV=Depends(getkintoneenv)):
     try:
-        headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
-        url = f"{c.BASE_URL}{config.API_V1_STR}/app.json"
+        headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
+        url = f"{env.BASE_URL}{config.API_V1_STR}/app.json"
         params ={"id":app}
         r = httpx.get(url,headers=headers,params=params)
         return r.json()
     except Exception as e:
-        raise APIException('kintone:app',request.url._url, f"Error occurred while get app({c.DOMAIN_NAM}->{app}):",e)   
+        raise APIException('kintone:app',request.url._url, f"Error occurred while get app({env.DOMAIN_NAME}->{app}):",e)   
 
 @r.get("/allapps")
-async def allapps(request:Request,c:config.KINTONE_ENV=Depends(getkintoneenv)):
+async def allapps(request:Request,env:config.KINTONE_ENV=Depends(getkintoneenv)):
     try:
-        headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
-        url = f"{c.BASE_URL}{config.API_V1_STR}/apps.json"
-        r = httpx.get(url,headers=headers)
-        return r.json()
+        headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
+        url = f"{env.BASE_URL}{config.API_V1_STR}/apps.json"
+        offset = 0
+        limit = 100
+        all_apps = [] 
+
+        while True:
+            r = httpx.get(f"{url}?limit={limit}&offset={offset}", headers=headers)
+            json_data = r.json()
+            apps = json_data.get("apps",[])
+            all_apps.extend(apps)
+            if len(apps)<limit:
+                break
+            offset += limit
+        return {"apps": all_apps}
+
     except Exception as e:
-       raise APIException('kintone:allapps',request.url._url, f"Error occurred while get allapps({c.DOMAIN_NAM}):",e)   
+        raise APIException('kintone:allapps', request.url._url, f"Error occurred while get allapps({env.DOMAIN_NAME}):", e)
 
 @r.get("/appfields")
-async def appfields(request:Request,app:str,env = Depends(getkintoneenv)):
+async def appfields(request:Request,app:str,env:config.KINTONE_ENV = Depends(getkintoneenv)):
     try:
         return getfieldsfromkintone(app,env)
     except Exception as e:
-       raise APIException('kintone:appfields',request.url._url, f"Error occurred while get app fileds({env.DOMAIN_NAM}->{app}):",e) 
+       raise APIException('kintone:appfields',request.url._url, f"Error occurred while get app fileds({env.DOMAIN_NAME}->{app}):",e) 
+
+@r.get("/allfields")
+async def allfields(request:Request,app:str,env:config.KINTONE_ENV = Depends(getkintoneenv)):
+    try:
+        field_resp = getfieldsfromkintone(app,env)
+        form_resp = getformfromkintone(app,env)
+        return merge_kintone_fields(field_resp,form_resp)
+    except Exception as e:
+       raise APIException('kintone:allfields',request.url._url, f"Error occurred while get form fileds({env.DOMAIN_NAME}->{app}):",e) 
 
 @r.get("/appprocess")
-async def appprocess(request:Request,app:str,env = Depends(getkintoneenv)):
+async def appprocess(request:Request,app:str,env:config.KINTONE_ENV = Depends(getkintoneenv)):
     try:
         return getprocessfromkintone(app,env)
     except Exception as e:
-       raise APIException('kintone:appprocess',request.url._url, f"Error occurred while get app process({env.DOMAIN_NAM}->{app}):",e) 
+       raise APIException('kintone:appprocess',request.url._url, f"Error occurred while get app process({env.DOMAIN_NAME}->{app}):",e) 
 
 @r.get("/alljscss")
-async def alljscs(request:Request,app:str,c:config.KINTONE_ENV=Depends(getkintoneenv)):
+async def alljscs(request:Request,app:str,env:config.KINTONE_ENV=Depends(getkintoneenv)):
     try:
-        headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
-        url = f"{c.BASE_URL}{config.API_V1_STR}/app/customize.json"
+        headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE}
+        url = f"{env.BASE_URL}{config.API_V1_STR}/app/customize.json"
         params = {"app":app}
         r = httpx.get(url,headers=headers,params=params)
         return r.json()
     except Exception as e:
-       raise APIException('kintone:alljscss',request.url._url, f"Error occurred while get app js/css({c.DOMAIN_NAM}->{app}):",e) 
+       raise APIException('kintone:alljscss',request.url._url, f"Error occurred while get app js/css({env.DOMAIN_NAME}->{app}):",e) 
 
 @r.post("/createapp",)
-async def createapp(request:Request,name:str,c:config.KINTONE_ENV=Depends(getkintoneenv)):
+async def createapp(request:Request,name:str,env:config.KINTONE_ENV=Depends(getkintoneenv)):
     try:
-        headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
+        headers={config.API_V1_AUTH_KEY:env.API_V1_AUTH_VALUE,"Content-Type": "application/json"}
         data = {"name":name}
-        url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app.json"
+        url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app.json"
         r = httpx.post(url,headers=headers,data=json.dumps(data))
         result = r.json()
         if result.get("app") != None:
-            url = f"{c.BASE_URL}{config.API_V1_STR}/preview/app/deploy.json"
+            url = f"{env.BASE_URL}{config.API_V1_STR}/preview/app/deploy.json"
             data = {"apps":[result],"revert": False}
             r = httpx.post(url,headers=headers,data=json.dumps(data))
         return r.json
     except Exception as e:
-        raise APIException('kintone:createapp',request.url._url, f"Error occurred while create app({c.DOMAIN_NAM}->{name}):",e) 
+        raise APIException('kintone:createapp',request.url._url, f"Error occurred while create app({env.DOMAIN_NAME}->{name}):",e) 
 
 
 @r.post("/createappfromexcel",)
@@ -643,7 +752,7 @@ async def updateprocessfromexcel(request:Request,app:str,env = Depends(getkinton
         if deploy:
             result = deoployappfromkintone(app,revision,env)
     except Exception as e:
-        raise APIException('kintone:updateprocessfromexcel',request.url._url, f"Error occurred while update process ({env.DOMAIN_NAM}->{app}):",e)
+        raise APIException('kintone:updateprocessfromexcel',request.url._url, f"Error occurred while update process ({env.DOMAIN_NAME}->{app}):",e)
        
     return result
 
@@ -653,15 +762,17 @@ async def createjstokintone(request:Request,app:str,env:config.KINTONE_ENV = Dep
     try:
         jscs=[]
         files=[]
-        files.append(createappjs(env.DOMAIN_ID, app))
-        files.append('Temp\\alc_runtime.js')
+        files.append(createappjs(env.BASE_URL, app))
+        files.append(getTempPath('alc_runtime.js'))
+        files.append(getTempPath('alc_runtime.css'))        
         for file in files:
             upload = uploadkintonefiles(file,env)
             if upload.get('fileKey') != None:
+                print(upload)
                 jscs.append({ file :upload['fileKey']})
         appjscs = updateappjscss(app,jscs,env)
         if appjscs.get("revision") != None:
            deoployappfromkintone(app,appjscs["revision"],env)
            return appjscs
     except Exception as e:
-        raise APIException('kintone:createjstokintone',request.url._url, f"Error occurred while create js ({env.DOMAIN_NAM}->{app}):",e)
+        raise APIException('kintone:createjstokintone',request.url._url, f"Error occurred while create js ({env.DOMAIN_NAME}->{app}):",e)

backend/app/api/api_v1/routers/platform.py

@@ -1,14 +1,105 @@
-from fastapi import Request,Depends, APIRouter, UploadFile,HTTPException,File
+from http import HTTPStatus
+from fastapi import Query, Request,Depends, APIRouter, UploadFile,HTTPException,File
+from fastapi.responses import JSONResponse
+# from app.core.operation import log_operation
 from app.db import Base,engine
 from app.db.session import get_db
 from app.db.crud import *
 from app.db.schemas import *
-from typing import List
+from typing import List, Optional
 from app.core.auth import get_current_active_user,get_current_user
 from app.core.apiexception import APIException
+from app.core.common import ApiReturnModel,ApiReturnPage
+#from fastapi_pagination import Page 
+from app.db.cruddb import dbdomain
+
+import httpx
+import app.core.config as config
 
 platform_router = r = APIRouter()
 
+@r.get(
+    "/test",
+    response_model_exclude_none=True,
+)
+async def test(
+    request: Request,
+    user = Depends(get_current_active_user),
+    db=Depends(get_db),
+):
+    dbdomain.select(db,{"tenantid":1,"name":["b","c"]})
+
+
+@r.get(
+    "/apps",tags=["App"],
+    response_model=ApiReturnModel[List[AppList]|None],
+    response_model_exclude_none=True,
+)
+async def apps_list(
+    request: Request,
+    user = Depends(get_current_active_user),
+    db=Depends(get_db),
+):
+    try:
+     
+        domain = dbdomain.get_default_domain(db,user.id) #get_activedomain(db, user.id)
+        if not domain:
+            return  ApiReturnModel(data = None)
+        filtered_apps = []
+        platformapps = get_apps(db,domain.url)
+        kintoneevn = config.KINTONE_ENV(domain)
+        headers={config.API_V1_AUTH_KEY:kintoneevn.API_V1_AUTH_VALUE}
+        url = f"{kintoneevn.BASE_URL}{config.API_V1_STR}/apps.json"
+        offset = 0
+        limit = 100
+        all_apps = [] 
+
+        while True:
+            r = httpx.get(f"{url}?limit={limit}&offset={offset}", headers=headers)
+            json_data = r.json()
+            apps = json_data.get("apps",[])
+            all_apps.extend(apps)
+            if len(apps)<limit:
+                break
+            offset += limit
+        
+        kintone_apps_dict = {app['appId']: app for app in all_apps}
+        for papp in platformapps:
+            if papp.appid in kintone_apps_dict:
+                papp.appname = kintone_apps_dict[papp.appid]["name"]
+                filtered_apps.append(papp)
+        return ApiReturnModel(data = filtered_apps)
+    except Exception as e:
+        raise APIException('platform:apps',request.url._url,f"Error occurred while get apps:",e)
+
+
+@r.post("/apps", response_model=AppList, response_model_exclude_none=True)
+async def apps_update(
+    request: Request,
+    app: AppVersion,
+    user=Depends(get_current_active_user),
+    db=Depends(get_db),
+):
+    try:
+        return update_appversion(db, app,user.id)
+    except Exception as e:
+        raise APIException('platform:apps',request.url._url,f"Error occurred while get create app :",e)
+    
+@r.delete(
+    "/apps/{domainurl}/{appid}", response_model_exclude_none=True
+)
+async def apps_delete(
+    request: Request,
+    domainurl:str,
+    appid: str,
+    user=Depends(get_current_active_user),
+    db=Depends(get_db),
+):
+    try:
+        return delete_apps(db, domainurl,appid)
+    except Exception as e:
+        raise APIException('platform:apps',request.url._url,f"Error occurred while delete apps({domainurl}:{appid}):",e)
+        
 @r.get(
     "/appsettings/{id}",
     response_model=App,
@@ -117,48 +208,57 @@ async def flow_details(
 
 @r.get(
     "/flows/{appid}",
-    response_model=List[Flow],
+    response_model=List[Flow|None],
     response_model_exclude_none=True,
 )
 async def flow_list(
     request: Request,
     appid: str,
-    user=Depends(get_current_user),
+    user=Depends(get_current_active_user),
     db=Depends(get_db),
 ):
     try:
-        domain = get_activedomain(db, user.id)
+        domain = dbdomain.get_default_domain(db, user.id) #get_activedomain(db, user.id)
+        if not domain:
+            return []
         print("domain=>",domain)
-        flows = get_flows_by_app(db, domain.id, appid)
+        flows = get_flows_by_app(db, domain.url, appid)
         return flows
     except Exception as e:
         raise APIException('platform:flow',request.url._url,f"Error occurred while get flow by appid:",e)
     
 
-@r.post("/flow", response_model=Flow, response_model_exclude_none=True)
+@r.post("/flow", response_model=Flow|None, response_model_exclude_none=True)
 async def flow_create(
     request: Request,
-    flow: FlowBase,
-    user=Depends(get_current_user),
+    flow: FlowIn,
+    user=Depends(get_current_active_user),
     db=Depends(get_db),
 ):
     try:
-        domain = get_activedomain(db, user.id)
-        return create_flow(db, domain.id, flow)
+        domain = dbdomain.get_default_domain(db, user.id) #get_activedomain(db, user.id)
+        if not domain:
+            return None
+        return create_flow(db, domain.url, flow)
     except Exception as e:
         raise APIException('platform:flow',request.url._url,f"Error occurred while create flow:",e)
 
 
 @r.put(
-    "/flow/{flowid}", response_model=Flow, response_model_exclude_none=True
+    "/flow/{flowid}", response_model=Flow|None, response_model_exclude_none=True
 )
 async def flow_edit(
     request: Request,
-    flow: FlowBase,
+    flowid: str, 
+    flow: FlowIn,
+    user=Depends(get_current_active_user),
     db=Depends(get_db),
 ):
     try:
-        return edit_flow(db, flow)
+        domain = dbdomain.get_default_domain(db, user.id) #get_activedomain(db, user.id)
+        if not domain:
+            return None
+        return edit_flow(db,domain.url, flow,user.id)
     except Exception as e:
         raise APIException('platform:flow',request.url._url,f"Error occurred while edit flow:",e)
 
@@ -177,49 +277,60 @@ async def flow_delete(
         raise APIException('platform:flow',request.url._url,f"Error occurred while delete flow:",e)
 
 @r.get(
-    "/domains/{tenantid}",
-    response_model=List[Domain],
+    "/domains",tags=["Domain"],
+    response_model=ApiReturnPage[Domain],
     response_model_exclude_none=True,
 )
 async def domain_details(
     request: Request,
-    tenantid:str,
+    user=Depends(get_current_active_user),
     db=Depends(get_db),
 ):
     try:
-        domains = get_domains(db,tenantid)
-        return domains
+        if user.is_superuser:
+            domains = dbdomain.get_domains(db)
+        else:
+            domains = dbdomain.get_domains_by_owner(db,user.id)
+        return  domains
     except Exception as e:
         raise APIException('platform:domains',request.url._url,f"Error occurred while get domains:",e)
 
-@r.post("/domain", response_model=Domain, response_model_exclude_none=True)
+@r.post("/domain", tags=["Domain"],
+        response_model=ApiReturnModel[Domain], 
+        response_model_exclude_none=True)
 async def domain_create(
     request: Request,
-    domain: DomainBase,
+    domain: DomainIn,
+    user=Depends(get_current_active_user),
     db=Depends(get_db),
 ):
     try:
-        return create_domain(db, domain)
+        return ApiReturnModel(data = dbdomain.create_domain(db, domain,user.id))
     except Exception as e:
         raise APIException('platform:domain',request.url._url,f"Error occurred while create domain:",e)
 
 
 @r.put(
-    "/domain", response_model=Domain, response_model_exclude_none=True
+    "/domain", tags=["Domain"],
+    response_model=ApiReturnModel[Domain|None], 
+    response_model_exclude_none=True
 )
 async def domain_edit(
     request: Request,
-    domain: DomainBase,
+    domain: DomainIn,
+    user=Depends(get_current_active_user),
     db=Depends(get_db),
 ):
     try:
-        return edit_domain(db, domain)
+        return ApiReturnModel(data = dbdomain.edit_domain(db, domain,user.id))
     except Exception as e:
         raise APIException('platform:domain',request.url._url,f"Error occurred while edit domain:",e)
 
 
 @r.delete(
-    "/domain/{id}", response_model=Domain, response_model_exclude_none=True
+    "/domain/{id}",tags=["Domain"],
+    response_model=ApiReturnModel[DomainOut|None], 
+    response_model_exclude_none=True,
 )
 async def domain_delete(
     request: Request,
@@ -227,7 +338,7 @@ async def domain_delete(
     db=Depends(get_db),
 ):
     try:
-        return delete_domain(db,id)
+        return ApiReturnModel(data = dbdomain.delete_domain(db,id))
     except Exception as e:
         raise APIException('platform:domain',request.url._url,f"Error occurred while delete domain:",e)
 
@@ -238,77 +349,104 @@ async def domain_delete(
 )
 async def userdomain_details(
     request: Request,
-    user=Depends(get_current_user),
+    userId: Optional[int] = Query(None, alias="userId"),
+    user=Depends(get_current_active_user),
     db=Depends(get_db),
 ):
     try:
-        domains = get_domain(db, user.id)
+        domains = get_domain(db, userId if userId is not None else user.id)
         return domains
     except Exception as e:
         raise APIException('platform:domain',request.url._url,f"Error occurred while get user({user.id}) domain:",e)
 
 @r.post(
-    "/domain/{userid}",
+    "/domain/{userid}",tags=["Domain"],
+    response_model=ApiReturnModel[DomainOut|None],
     response_model_exclude_none=True,
 )
 async def create_userdomain(
     request: Request,
     userid: int,
-    domainids:list,
+    domainid:int ,
+    user=Depends(get_current_active_user),
     db=Depends(get_db),
 ):
     try:
-        domain = add_userdomain(db, userid,domainids)
-        return domain
+        if user.is_superuser:
+            domain = dbdomain.add_userdomain(db,user.id,userid,domainid)
+        else:
+            domain = dbdomain.add_userdomain_by_owner(db,user.id,userid,domainid)
+        return ApiReturnModel(data = domain)
     except Exception as e:
         raise APIException('platform:domain',request.url._url,f"Error occurred while add user({userid}) domain:",e)
 
 @r.delete(
-    "/domain/{domainid}/{userid}", response_model_exclude_none=True
+    "/domain/{domainid}/{userid}",tags=["Domain"],
+    response_model=ApiReturnModel[DomainOut|None],
+    response_model_exclude_none=True,
 )
-async def userdomain_delete(
+async def delete_userdomain(
     request: Request,
     domainid:int,
     userid: int,
+    user=Depends(get_current_active_user),
     db=Depends(get_db),
 ):
     try:
-        return delete_userdomain(db, userid,domainid)
+        return ApiReturnModel(data = dbdomain.delete_userdomain(db,userid,domainid))
     except Exception as e:
         raise APIException('platform:delete',request.url._url,f"Error occurred while delete user({userid}) domain:",e)
 
 
 @r.get(
-    "/activedomain",
-    response_model=Domain,
+    "/defaultdomain",tags=["Domain"],
+    response_model=ApiReturnModel[DomainOut|None],
     response_model_exclude_none=True,
 )
-async def get_useractivedomain(
+async def get_defaultuserdomain(
     request: Request,
-    user=Depends(get_current_user),
+    user=Depends(get_current_active_user),
     db=Depends(get_db),
 ):
     try:
-        domain = get_activedomain(db, user.id)
-        return domain
+        return ApiReturnModel(data =dbdomain.get_default_domain(db, user.id))
     except Exception as e:
-        raise APIException('platform:activedomain',request.url._url,f"Error occurred while get user({user.id}) activedomain:",e)
-
+        raise APIException('platform:defaultdomain',request.url._url,f"Error occurred while get user({user.id}) defaultdomain:",e)
+    
 @r.put(
-    "/activedomain/{domainid}",
+    "/defaultdomain/{domainid}",tags=["Domain"],
+    response_model=ApiReturnModel[DomainOut|None],
     response_model_exclude_none=True,
 )
 async def update_activeuserdomain(
     request: Request,
     domainid:int,
-    user=Depends(get_current_user),
+    user=Depends(get_current_active_user),
     db=Depends(get_db),
 ):
     try:
-        domain = active_userdomain(db, user.id,domainid)
-        return domain
+        domain = dbdomain.set_default_domain(db,user.id,domainid)
+        return ApiReturnModel(data= domain)
     except Exception as e:
-        raise APIException('platform:activedomain',request.url._url,f"Error occurred while update user({user.id}) activedomain:",e)
+        raise APIException('platform:defaultdomain',request.url._url,f"Error occurred while update user({user.id}) defaultdomain:",e)
+
+
+@r.get(
+    "/domainshareduser/{domainid}",tags=["Domain"],
+    response_model=ApiReturnPage[UserOut|None],
+    response_model_exclude_none=True,
+)
+async def get_domainshareduser(
+    request: Request,
+    domainid:int,
+    user=Depends(get_current_active_user),
+    db=Depends(get_db),
+):
+    try:
+        return dbdomain.get_shareddomain_users(db,user.id,domainid)
+    except Exception as e:
+        raise APIException('platform:sharedomain',request.url._url,f"Error occurred while get user({user.id}) sharedomain:",e)
+
 
 @r.get(
     "/events",

backend/app/api/api_v1/routers/users.py

@@ -1,107 +1,186 @@
-from fastapi import APIRouter, Request, Depends, Response, encoders
+from fastapi import APIRouter, Request, Depends, Response, Security, encoders
 import typing as t
-
+from app.core.common import ApiReturnModel,ApiReturnPage
+from app.core.apiexception import APIException
 from app.db.session import get_db
 from app.db.crud import (
+    get_allusers,
     get_users,
     get_user,
     create_user,
     delete_user,
     edit_user,
+    assign_userrole,
+    get_roles,
 )
-from app.db.schemas import UserCreate, UserEdit, User, UserOut
-from app.core.auth import get_current_active_user, get_current_active_superuser
+from app.db.schemas import UserCreate, UserEdit, User, UserOut,RoleBase,Permission
+from app.core.auth import get_current_user,get_current_active_user, get_current_active_superuser
+from app.db.cruddb import dbuser
 
 users_router = r = APIRouter()
 
 
 @r.get(
-    "/users",
-    response_model=t.List[User],
+    "/users",tags=["User"],
+    response_model=ApiReturnPage[User],
     response_model_exclude_none=True,
 )
 async def users_list(
-    response: Response,
+    request: Request,
     db=Depends(get_db),
-    current_user=Depends(get_current_active_superuser),
+    current_user=Depends(get_current_active_user),
 ):
-    """
-    Get all users
-    """
-    users = get_users(db)
-    # This is necessary for react-admin to work
-    response.headers["Content-Range"] = f"0-9/{len(users)}"
-    return users
+    try:
+        if current_user.is_superuser:
+            users = dbuser.get_users(db)
+        else:
+            users = dbuser.get_users_not_admin(db)
+        return users
+    except Exception as e:
+        raise APIException('user:users',request.url._url,f"Error occurred while get user list",e)
 
-
-@r.get("/users/me", response_model=User, response_model_exclude_none=True)
+@r.get("/users/me", tags=["User"],
+       response_model=ApiReturnModel[User], 
+       response_model_exclude_none=True,
+)
 async def user_me(current_user=Depends(get_current_active_user)):
-    """
-    Get own user
-    """
-    return current_user
+    return ApiReturnModel(data = current_user)
 
 
 @r.get(
-    "/users/{user_id}",
-    response_model=User,
+    "/users/{user_id}",tags=["User"],
+    response_model=ApiReturnModel[User|None],
     response_model_exclude_none=True,
 )
 async def user_details(
     request: Request,
     user_id: int,
     db=Depends(get_db),
-    current_user=Depends(get_current_active_superuser),
+    current_user=Depends(get_current_active_user),
 ):
-    """
-    Get any user details
-    """
-    user = get_user(db, user_id)
-    return user
-    # return encoders.jsonable_encoder(
-    #     user, skip_defaults=True, exclude_none=True,
-    # )
+    try:
+        user = dbuser.get(db, user_id)
+        if user:
+            if user.is_superuser and not current_user.is_superuser:
+                user = None
+        return ApiReturnModel(data = user)
+    except Exception as e:
+        raise APIException('user:users',request.url._url,f"Error occurred while get user({user_id}) detail:",e)
 
 
-@r.post("/users", response_model=User, response_model_exclude_none=True)
+@r.post("/users", tags=["User"],
+        response_model=ApiReturnModel[User|None], 
+        response_model_exclude_none=True,
+)
 async def user_create(
     request: Request,
     user: UserCreate,
     db=Depends(get_db),
-    current_user=Depends(get_current_active_superuser),
+    current_user=Depends(get_current_active_user),
 ):
-    """
-    Create a new user
-    """
-    return create_user(db, user)
+    try:
+        if user.is_superuser and not current_user.is_superuser:
+            return ApiReturnModel(data = None)
+        return ApiReturnModel(data =dbuser.create_user(db, user,current_user.id))
+    except Exception as e:
+        raise APIException('user:users',request.url._url,f"Error occurred while create user({user.email}):",e)
 
 
 @r.put(
-    "/users/{user_id}", response_model=User, response_model_exclude_none=True
+    "/users/{user_id}", tags=["User"],
+    response_model=ApiReturnModel[User|None],
+    response_model_exclude_none=True,
 )
 async def user_edit(
     request: Request,
     user_id: int,
     user: UserEdit,
     db=Depends(get_db),
-    current_user=Depends(get_current_active_superuser),
+    current_user=Depends(get_current_active_user),
 ):
-    """
-    Update existing user
-    """
-    return edit_user(db, user_id, user)
-
+    try:
+        if user.is_superuser and not current_user.is_superuser:
+            return ApiReturnModel(data = None)
+        return ApiReturnModel(data = dbuser.edit_user(db,user_id,user,current_user.id))
+    except Exception as e:
+        raise APIException('user:users',request.url._url,f"Error occurred while edit user({user_id}):",e)
 
 @r.delete(
-    "/users/{user_id}", response_model=User, response_model_exclude_none=True
+    "/users/{user_id}", tags=["User"],
+    response_model=ApiReturnModel[UserOut|None], 
+    response_model_exclude_none=True
 )
 async def user_delete(
     request: Request,
     user_id: int,
     db=Depends(get_db),
-    current_user=Depends(get_current_active_superuser),
+    current_user=Depends(get_current_active_user),
 ):
-    """
-    Delete existing user
-    """
-    return delete_user(db, user_id)
+    try:
+        user = dbuser.get(db,user_id)
+        if user.is_superuser and not current_user.is_superuser:
+            return ApiReturnModel(data = None)
+        return ApiReturnModel(data = dbuser.delete_user(db, user_id))
+    except Exception as e:
+        raise APIException('user:users',request.url._url,f"Error occurred while delete user({user_id}):",e)
+
+
+@r.post("/userrole",tags=["User"],
+    response_model=ApiReturnModel[User],
+    response_model_exclude_none=True,)
+async def assign_role(
+    request: Request,
+    user_id:int,
+    roles:t.List[int],
+    db=Depends(get_db)
+):
+    try:
+        return ApiReturnModel(data = dbuser.assign_userrole(db,user_id,roles))
+    except Exception as e:
+        raise APIException('user:userrole',request.url._url,f"Error occurred while assign user({user_id}) roles({roles}):",e)
+
+@r.get(
+    "/roles",tags=["User"],
+    response_model=ApiReturnModel[t.List[RoleBase]|None],
+    response_model_exclude_none=True,
+)
+async def roles_list(
+    request: Request,
+    db=Depends(get_db),
+    current_user=Depends(get_current_active_user),
+    #current_user=Security(get_current_active_user, scopes=["role_list"]),
+):
+    try:
+        if current_user.is_superuser:
+            roles = dbuser.get_roles(db)
+        else:
+            if len(current_user.roles)>0:
+                roles = dbuser.get_roles_by_level(db,current_user.roles[0].level)
+            else:
+                roles = []
+        return ApiReturnModel(data = roles)
+    except Exception as e:
+        raise APIException('user:roles',request.url._url,f"Error occurred while get roles:",e)
+
+@r.get(
+    "/userpermssions",tags=["User"],
+    response_model=ApiReturnModel[t.List[Permission]|None],
+    response_model_exclude_none=True,
+)
+async def permssions_list(
+    request: Request,
+    db=Depends(get_db),
+    current_user=Depends(get_current_active_user),
+    #current_user=Security(get_current_active_user, scopes=["role_list"]),
+):
+    try:
+        if current_user.is_superuser:
+            permissions = dbuser.get_permissions(db)
+        else:
+            if len(current_user.roles)>0:
+                permissions = dbuser.get_user_permissions(db,current_user.id)
+            else:
+                permissions = []
+        return ApiReturnModel(data = permissions)
+    except Exception as e:
+        raise APIException('user:userpermssions',request.url._url,f"Error occurred while get user({current_user.id}) permissions:",e)

backend/app/core/apiexception.py

@@ -1,22 +1,35 @@
 from fastapi import HTTPException, status
+import httpx
 from app.db.schemas import ErrorCreate
 from app.db.session import SessionLocal
 from app.db.crud import create_log
 
 class APIException(Exception):
-
-    def __init__(self,location:str,title:str,content:str,e:Exception):
-      if(str(e) == ''):
-          content += e.detail
-          self.detail = e.detail
-          self.status_code = e.status_code
-      else:
-          self.detail = str(e)
-          content += str(e)
-          self.status_code = 500
-      if(len(content) > 5000):
-         content =content[0:5000]
-      self.error = ErrorCreate(location=location,title=title,content=content)
+    def __init__(self, location: str, title: str, content: str, e: Exception):
+        self.detail = str(e)
+        self.status_code = 500
+        if isinstance(e,httpx.HTTPStatusError):
+            try:
+                error_response = e.response.json()
+                self.detail = error_response.get('message', self.detail)
+                self.status_code = e.response.status_code
+                content += self.detail
+            except ValueError:
+                pass
+        elif hasattr(e, 'detail'):
+            self.detail = e.detail
+            self.status_code = e.status_code if hasattr(e, 'status_code') else 500
+            content += str(e.detail)
+        else:
+            self.detail = str(e)
+            self.status_code = 500
+            content += str(e)
+        
+        if len(content) > 5000:
+            content = content[:5000]
+        
+        self.error = ErrorCreate(location=location, title=title, content=content)
+        super().__init__(self.error)
 
 def writedblog(exc: APIException):
     db = SessionLocal()

backend/app/core/auth.py

@@ -1,13 +1,14 @@
+from fastapi.security import SecurityScopes
 import jwt
-from fastapi import Depends, HTTPException, status
+from fastapi import Depends, HTTPException, Request, Security, status
 from jwt import PyJWTError
 
 from app.db import models, schemas, session
 from app.db.crud import get_user_by_email, create_user,get_user
 from app.core import security
+from app.db.cruddb import dbuser
 
-
-async def get_current_user(
+async def get_current_user(security_scopes: SecurityScopes,
     db=Depends(session.get_db), token: str = Depends(security.oauth2_scheme)
 ):
     credentials_exception = HTTPException(
@@ -16,17 +17,25 @@ async def get_current_user(
         headers={"WWW-Authenticate": "Bearer"},
     )
     try:
+
         payload = jwt.decode(
             token, security.SECRET_KEY, algorithms=[security.ALGORITHM]
         )
         id: int = payload.get("sub")
         if id is None:
             raise credentials_exception
+
         permissions: str = payload.get("permissions")
+        if not permissions =="ALL":
+            for scope in security_scopes.scopes:
+                if scope not in permissions.split(";"):
+                    raise HTTPException(
+                        status_code=403, detail="The user doesn't have enough privileges"
+                    )
         token_data = schemas.TokenData(id = id, permissions=permissions)
     except PyJWTError:
         raise credentials_exception
-    user = get_user(db, token_data.id)
+    user = dbuser.get_user(db, token_data.id)
     if user is None:
         raise credentials_exception
     return user

backend/app/core/common.py

@@ -0,0 +1,49 @@
+
+import math
+from fastapi import Query
+from fastapi_pagination.bases import  AbstractPage,AbstractParams,RawParams
+from pydantic import BaseModel
+from typing import Any, Generic, List, Type,TypeVar,Generic,Sequence
+from fastapi_pagination import  Page,utils
+
+T = TypeVar('T')
+
+class ApiReturnModel(BaseModel,Generic[T]):
+    code:int = 0
+    msg:str ="OK"
+    data:T
+
+class ApiReturnError(BaseModel):
+    code:int = -1
+    msg:str =""
+
+
+class Params(BaseModel, AbstractParams):
+    page:int = Query(1,get=1, description="Page number")
+    size:int = Query(20,get=0, le=100,description="Page size")
+
+    def to_raw_params(self) -> RawParams:
+        return RawParams(
+            limit=self.size,
+            offset=self.size*(self.page-1)
+            )
+    
+class ApiReturnPage(AbstractPage[T],Generic[T]):
+    code:int =0
+    msg:str ="OK"
+    data:Sequence[T]
+    total:int
+    page:int
+    size:int
+    # next:str
+    # previous:str
+    total_pages:int
+
+    __params_type__ =Params
+
+    @classmethod
+    def create(cls,items:Sequence[T],params:Params,**kwargs: Any) -> Type[Page[T]]:
+        total =  kwargs.get('total', 0)
+        total_pages = math.ceil(total/params.size)
+    
+        return utils.create_pydantic_model(cls,data=items,total=total,page=params.page,size=params.size,total_pages=total_pages)

backend/app/core/config.py

@@ -1,26 +1,29 @@
 import os
 import base64
 
+
 PROJECT_NAME = "KintoneAppBuilder"
 
-#SQLALCHEMY_DATABASE_URI = "postgres://maxz64:m@xz1205@alicornkintone.postgres.database.azure.com/postgres"
-SQLALCHEMY_DATABASE_URI = "postgres://kabAdmin:P@ssw0rd!@kintonetooldb.postgres.database.azure.com/postgres"
-
+#SQLALCHEMY_DATABASE_URI = "postgres://kabAdmin:P@ssw0rd!@kintonetooldb.postgres.database.azure.com/dev"
+SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://kabAdmin:P%40ssw0rd!@kintonetooldb.postgres.database.azure.com/dev_v2"
+#SQLALCHEMY_DATABASE_URI = "postgres://kabAdmin:P@ssw0rd!@kintonetooldb.postgres.database.azure.com/test"
+#SQLALCHEMY_DATABASE_URI = "postgres://kabAdmin:P@ssw0rd!@ktune-prod-db.postgres.database.azure.com/postgres"
 API_V1_STR = "/k/v1"
 
 API_V1_AUTH_KEY = "X-Cybozu-Authorization"
 
-DEPLOY_MODE = "DEV" #DEV,PROD
+DEPLOY_MODE = "PROD" #DEV,PROD
 
-#DEPLOY_JS_URL = "https://ka-addin.azurewebsites.net/alc_runtime.js"
-DEPLOY_JS_URL = "https://92dc-133-139-109-57.ngrok-free.app/alc_runtime.js"
+DEPLOY_JS_URL = "https://ka-addin.azurewebsites.net/alc_runtime.js"
 
 KINTONE_FIELD_TYPE=["GROUP","GROUP_SELECT","CHECK_BOX","SUBTABLE","DROP_DOWN","USER_SELECT","RADIO_BUTTON","RICH_TEXT","LINK","REFERENCE_TABLE","CALC","TIME","NUMBER","ORGANIZATION_SELECT","FILE","DATETIME","DATE","MULTI_SELECT","SINGLE_LINE_TEXT","MULTI_LINE_TEXT"]
 
 KINTONE_FIELD_PROPERTY=['label','code','type','required','unique','maxValue','minValue','maxLength','minLength','defaultValue','defaultNowValue','options','expression','hideExpression','digit','protocol','displayScale','unit','unitPosition']
 
+KINTONE_PSW_CRYPTO_KEY=bytes.fromhex("53 6c 93 bd 48 ad b5 c0 93 df a1 27 25 a1 a3 32 a2 03 3b a0 27 1f 51 dc 20 0e 6c d7 be fc fb ea")
+
 class KINTONE_ENV:
-    
+
     BASE_URL = ""
 
     API_V1_AUTH_VALUE = ""
@@ -36,4 +39,4 @@ class KINTONE_ENV:
         self.DOMAIN_ID=domain.id
         self.BASE_URL = domain.url
         self.KINTONE_USER = domain.kintoneuser
-        self.API_V1_AUTH_VALUE = base64.b64encode(bytes(f"{domain.kintoneuser}:{domain.kintonepwd}","utf-8"))
+        self.API_V1_AUTH_VALUE = base64.b64encode(bytes(f"{domain.kintoneuser}:{domain.decrypt_kintonepwd()}","utf-8"))

backend/app/core/security.py

@@ -2,6 +2,10 @@ import jwt
 from fastapi.security import OAuth2PasswordBearer
 from passlib.context import CryptContext
 from datetime import datetime, timedelta
+from cryptography.hazmat.primitives.ciphers import Cipher, algorithms
+import os
+import base64
+from app.core import config
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/token")
 
@@ -29,3 +33,32 @@ def create_access_token(*, data: dict, expires_delta: timedelta = None):
     to_encode.update({"exp": expire})
     encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
     return encoded_jwt
+
+def chacha20Encrypt(plaintext:str, key=config.KINTONE_PSW_CRYPTO_KEY):
+    if plaintext is None or plaintext == '':
+        return None
+    nonce = os.urandom(16)
+    algorithm = algorithms.ChaCha20(key, nonce)
+    cipher = Cipher(algorithm, mode=None)
+    encryptor = cipher.encryptor()
+    ciphertext = encryptor.update(plaintext.encode('utf-8')) + encryptor.finalize()
+    return base64.b64encode(nonce +'𒀸'.encode('utf-8')+ ciphertext).decode('utf-8')
+
+def chacha20Decrypt(encoded_str:str, key=config.KINTONE_PSW_CRYPTO_KEY):
+    try:
+        decoded_data = base64.b64decode(encoded_str)
+        if len(decoded_data) < 18:
+            return encoded_str
+        special_char = decoded_data[16:20]
+        if special_char != '𒀸'.encode('utf-8'):
+            return encoded_str
+        nonce = decoded_data[:16]
+        ciphertext = decoded_data[20:]
+    except Exception as e:
+        print(f"An error occurred: {e}")
+        return encoded_str
+    algorithm = algorithms.ChaCha20(key, nonce)
+    cipher = Cipher(algorithm, mode=None)
+    decryptor = cipher.decryptor()
+    plaintext_bytes = decryptor.update(ciphertext) + decryptor.finalize()
+    return plaintext_bytes.decode('utf-8')

backend/app/db/crud.py

@@ -1,10 +1,11 @@
+from datetime import datetime
 from fastapi import HTTPException, status
 from sqlalchemy.orm import Session
 from sqlalchemy import and_
 import typing as t
 
 from . import models, schemas
-from app.core.security import get_password_hash
+from app.core.security import chacha20Decrypt, get_password_hash
 
 
 def get_user(db: Session, user_id: int):
@@ -18,10 +19,15 @@ def get_user_by_email(db: Session, email: str) -> schemas.UserBase:
     return db.query(models.User).filter(models.User.email == email).first()
 
 
-def get_users(
-    db: Session, skip: int = 0, limit: int = 100
+def get_allusers(
+    db: Session
 ) -> t.List[schemas.UserOut]:
-    return db.query(models.User).offset(skip).limit(limit).all()
+    return db.query(models.User).all()
+
+def get_users(
+    db: Session
+) -> t.List[schemas.UserOut]:
+    return db.query(models.User).filter(models.User.is_superuser == False)
 
 
 def create_user(db: Session, user: schemas.UserCreate):
@@ -70,6 +76,80 @@ def edit_user(
     return db_user
 
 
+def get_roles(
+    db: Session
+) -> t.List[schemas.RoleBase]:
+    return db.query(models.Role).all()
+
+def assign_userrole( db: Session, user_id: int, roles: t.List[int]):
+    db_user = db.query(models.User).get(user_id)
+    if db_user:
+        for role in db_user.roles:
+            db_user.roles.remove(role)
+        for roleid in roles:
+            role = db.query(models.Role).get(roleid)
+            if role:
+                db_user.roles.append(role)
+    db.commit()
+    db.refresh(db_user)
+    return db_user
+
+def get_apps(
+    db: Session,
+    domainurl:str
+) -> t.List[schemas.AppList]:
+    return db.query(models.App).filter(models.App.domainurl == domainurl).all()
+
+def update_appversion(db: Session, appedit: schemas.AppVersion,userid:int):
+    db_app = db.query(models.App).filter(and_(models.App.domainurl ==  appedit.domainurl,models.App.appid == appedit.appid)).first()
+    if not db_app:
+       raise HTTPException(status.HTTP_404_NOT_FOUND, detail="User not found")
+    
+    db_app.version = db_app.version + 1
+    appversion = models.AppVersion(
+        domainurl = appedit.domainurl,
+        appid=appedit.appid,
+        appname=db_app.appname,
+        version = db_app.version,
+        versionname = appedit.versionname,
+        comment = appedit.comment,
+        updateuserid = userid,
+        createuserid = userid
+    )
+    db.add(appversion)
+    db.add(db_app)
+
+    flows = db.query(models.Flow).filter(and_(models.Flow.domainurl ==  appedit.domainurl,models.App.appid == appedit.appid)) 
+    for flow in flows:
+        db_flowhistory = models.FlowHistory(
+        flowid = flow.flowid,
+        appid = flow.appid,
+        eventid = flow.eventid,
+        domainurl = flow.domainurl,
+        name = flow.name,
+        content = flow.content,
+        createuser = userid,
+        version = db_app.version, 
+        updateuserid = userid,
+        createuserid = userid
+        )
+        db.add(db_flowhistory)
+
+    db.commit()
+    db.refresh(db_app)
+    return db_app
+
+def delete_apps(db: Session, domainurl: str,appid: str ):
+    db_app = db.query(models.App).filter(and_(models.App.domainurl == domainurl,models.App.appid ==appid)).first()
+    if not db_app:
+        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="App not found")
+    db.delete(db_app)
+    db_flows = db.query(models.Flow).filter(and_(models.Flow.domainurl == domainurl,models.Flow.appid ==appid))
+    for flow in db_flows:
+        db.delete(flow)
+    db.commit()
+    return db_app
+
 def get_appsetting(db: Session, id: int):
     app = db.query(models.AppSetting).get(id)
     if not app:
@@ -125,16 +205,28 @@ def get_actions(db: Session):
     return actions
 
 
-def create_flow(db: Session, domainid: int, flow: schemas.FlowBase):
+def create_flow(db: Session, domainurl: str, flow: schemas.FlowIn,userid:int):
     db_flow = models.Flow(
         flowid=flow.flowid,
         appid=flow.appid,
         eventid=flow.eventid,
-        domainid=domainid,
+        domainurl=domainurl,
         name=flow.name,
-        content=flow.content
+        content=flow.content,
+        createuserid = userid,
+        updateuserid = userid
     )
     db.add(db_flow)
+    db_app = db.query(models.App).filter(and_(models.App.domainurl ==  domainurl,models.App.appid == flow.appid)).first()
+    if not db_app:
+        db_app = models.App(
+        domainurl = domainurl,
+        appid=flow.appid,
+        appname=flow.appname,
+        version = 0,
+        createuserid= userid,
+        updateuserid = userid
+        )
     db.commit()
     db.refresh(db_flow)
     return db_flow
@@ -149,16 +241,20 @@ def delete_flow(db: Session, flowid: str):
 
 
 def edit_flow(
-    db: Session, flow: schemas.FlowBase
+    db: Session, domainurl: str, flow: schemas.FlowIn,userid:int
 ) -> schemas.Flow:
     db_flow = get_flow(db, flow.flowid)
     if not db_flow:
-        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Flow not found")
-    update_data = flow.dict(exclude_unset=True)
-
-    for key, value in update_data.items():
-            setattr(db_flow, key, value)
-
+        #見つからない時新規作成
+        return create_flow(db,domainurl,flow,userid)
+    
+    db_flow.appid =flow.appid
+    db_flow.eventid=flow.eventid
+    db_flow.domainurl=domainurl
+    db_flow.name=flow.name
+    db_flow.content=flow.content
+    db_flow.updateuserid = userid
+    
     db.add(db_flow)
     db.commit()
     db.refresh(db_flow)
@@ -173,103 +269,149 @@ def get_flows(db: Session, flowid: str):
 
 def get_flow(db: Session, flowid: str):
     flow = db.query(models.Flow).filter(models.Flow.flowid == flowid).first()
-    if not flow:
-        raise HTTPException(status_code=404, detail="Data not found")
+    # if not flow:
+    #     raise HTTPException(status_code=404, detail="Data not found")
     return flow
 
-def get_flows_by_app(db: Session, domainid: int, appid: str):
-    flows = db.query(models.Flow).filter(and_(models.Flow.domainid ==  domainid,models.Flow.appid == appid)).all()
+def get_flows_by_app(db: Session,domainurl: str, appid: str):
+    flows = db.query(models.Flow).filter(and_(models.Flow.domainurl ==  domainurl,models.Flow.appid == appid)).all()
     if not flows:
         raise Exception("Data not found")
     return flows
 
-def create_domain(db: Session, domain: schemas.DomainBase):
+def create_domain(db: Session, domain: schemas.DomainIn,userid:int):
+    domain.encrypt_kintonepwd()
     db_domain = models.Domain(
         tenantid = domain.tenantid,
         name=domain.name,
         url=domain.url,
+        is_active=domain.is_active,
         kintoneuser=domain.kintoneuser,
-        kintonepwd=domain.kintonepwd
+        kintonepwd=domain.kintonepwd,
+        createuserid = userid,
+        updateuserid = userid,
+        ownerid = domain.ownerid
     )
     db.add(db_domain)
+    #add_userdomain(db,userid,db_domain.id)
     db.commit()
     db.refresh(db_domain)
     return db_domain
 
 def delete_domain(db: Session,id: int):
     db_domain = db.query(models.Domain).get(id)
-    if not db_domain:
-        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
-    db.delete(db_domain)
-    db.commit()
-    return db_domain
+    #if not db_domain:
+    #   raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
+    if db_domain:
+        db.delete(db_domain)
+        db.commit()
+    return True
 
 
 def edit_domain(
-    db: Session, domain: schemas.DomainBase
+    db: Session, domain: schemas.DomainIn,userid:int
 ) -> schemas.Domain:
+    if domain.kintonepwd != "":
+        domain.encrypt_kintonepwd()
     db_domain = db.query(models.Domain).get(domain.id)
     if not db_domain:
-        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
-    update_data = domain.dict(exclude_unset=True)
-
-    for key, value in update_data.items():
-            if(key != "id"):
-                setattr(db_domain, key, value)
-
+       raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
+    db_domain.tenantid = domain.tenantid
+    db_domain.name=domain.name
+    db_domain.url=domain.url
+    if db_domain.is_active == True and domain.is_active == False:
+         db_userdomains = db.query(models.UserDomain).filter(and_(models.UserDomain.domainid == db_domain.id,models.UserDomain.active == True)).all()
+         for userdomain in db_userdomains:
+            userdomain.active = False
+            db.add(userdomain)
+    db_domain.is_active=domain.is_active
+    db_domain.kintoneuser=domain.kintoneuser
+    if domain.kintonepwd != "":
+        db_domain.kintonepwd = domain.kintonepwd
+    db_domain.updateuserid = userid
+    db_domain.ownerid = domain.ownerid
     db.add(db_domain)
     db.commit()
     db.refresh(db_domain)
     return db_domain
 
-def add_userdomain(db: Session, userid:int,domainids:list):
-    for domainid in domainids:
-        db_domain = models.UserDomain(
-            userid = userid,
-            domainid = domainid
-        )
-        db.add(db_domain)
-    db.commit()
-    db.refresh(db_domain)
+
+def add_admindomain(db: Session,userid:int,domainid:int):
+    db_domain = db.query(models.Domain).filter(and_(models.Domain.id == domainid,models.Domain.is_active)).first()
+    if db_domain:
+        user_domain = models.UserDomain(userid = userid, domainid = domainid )
+        db.add(user_domain)
+        db.commit()
     return db_domain
 
+def add_userdomain(db: Session,ownerid:int, userid:int,domainid:int):
+    db_domain = db.query(models.Domain).filter(and_(models.Domain.id == domainid,models.Domain.ownerid == ownerid,models.Domain.is_active)).first()
+    if db_domain:
+        user_domain = models.UserDomain(userid = userid, domainid = domainid )
+        db.add(user_domain)
+        db.commit()
+    return db_domain
+
+def add_userdomains(db: Session, userid:int,domainids:list[str]):
+    dbCommits = list(map(lambda domainid: models.UserDomain(userid = userid, domainid = domainid ), domainids))
+    db.bulk_save_objects(dbCommits)
+    db.commit()
+    return dbCommits
+
 def delete_userdomain(db: Session, userid: int,domainid: int):
     db_domain = db.query(models.UserDomain).filter(and_(models.UserDomain.userid == userid,models.UserDomain.domainid == domainid)).first()
-    if not db_domain:
-        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
-    db.delete(db_domain)
-    db.commit()
-    return db_domain
+    #if not db_domain:
+    #    raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
+    if db_domain:
+        db.delete(db_domain)
+        db.commit()
+    return True
 
 def active_userdomain(db: Session, userid: int,domainid: int):
-    db_userdomains = db.query(models.UserDomain).filter(models.UserDomain.userid == userid).all()
-    if not db_userdomains:
-        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
-    for domain in db_userdomains:
-        if domain.domainid == domainid:
-            domain.active = True
-        else:
-            domain.active = False
-        db.add(domain)
-    db.commit()
-    return db_userdomains
+    db_domain = db.query(models.Domain).filter(and_(models.Domain.id == domainid,models.Domain.is_active)).first()
+    if db_domain:
+        db_userdomains = db.query(models.UserDomain).filter(models.UserDomain.userid == userid).all()
+        # if not db_userdomains:
+        #     raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
+        
+        for domain in db_userdomains:
+            if domain.domainid == domainid:
+                domain.active = True
+            else:
+                domain.active = False
+            db.add(domain)
+        db.commit()
+    return db_domain
 
 def get_activedomain(db: Session, userid: int):
-    db_domain = db.query(models.Domain).join(models.UserDomain,models.UserDomain.domainid == models.Domain.id ).filter(and_(models.UserDomain.userid == userid,models.UserDomain.active == True)).first()
-    if not db_domain:
-        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
+    # user_domains = (db.query(models.Domain,models.UserDomain.active)
+    #              .join(models.UserDomain,models.UserDomain.domainid == models.Domain.id )
+    #              .filter(models.UserDomain.userid == userid)
+    #              .all())
+    db_domain=(db.query(models.Domain).filter(models.Domain.is_active)
+                .join(models.UserDomain,models.UserDomain.domainid == models.Domain.id).filter(and_(models.UserDomain.active,models.UserDomain.userid == userid)).first())
+    # if len(user_domains)==1:
+    #     db_domain = user_domains[0][0];
+    # else:
+    #     db_domain = next((domain for domain,active in user_domains if active),None)
+    # raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Domain not found")
     return db_domain
 
 def get_domain(db: Session, userid: str):
     domains = db.query(models.Domain).join(models.UserDomain,models.UserDomain.domainid == models.Domain.id ).filter(models.UserDomain.userid == userid).all()
-    if not domains:
-        raise HTTPException(status_code=404, detail="Data not found")
+    # if not domains:
+    #     raise HTTPException(status_code=404, detail="Data not found")
+    # for domain in domains:
+    #     decrypted_pwd = chacha20Decrypt(domain.kintonepwd)
+    #     domain.kintonepwd = decrypted_pwd
     return domains
 
-def get_domains(db: Session,tenantid:str):
-    domains = db.query(models.Domain).filter(models.Domain.tenantid == tenantid ).all()
-    if not domains:
-        raise HTTPException(status_code=404, detail="Data not found")
+def get_alldomains(db: Session):
+    domains = db.query(models.Domain).all()
+    return domains
+
+def get_domains(db: Session,userid:int):
+    domains = db.query(models.Domain).filter(models.Domain.ownerid == userid ).all()
     return domains
 
 def get_events(db: Session):
@@ -278,9 +420,35 @@ def get_events(db: Session):
         raise HTTPException(status_code=404, detail="Data not found")
     return events
 
+def get_category(db:Session):
+    categorys=db.query(models.Category).all()
+    return categorys
+
 def get_eventactions(db: Session,eventid: str):
     #eveactions = db.query(models.Action).join(models.EventAction,models.EventAction.actionid == models.Action.id ).join(models.Event,models.Event.id == models.EventAction.eventid).filter(models.Event.eventid == eventid).all()
-    eveactions = db.query(models.Action).join(models.EventAction,models.EventAction.actionid != models.Action.id and models.EventAction.eventid == eventid ).join(models.Event,models.Event.id == models.EventAction.eventid).filter(models.Event.eventid == eventid).all()
+    #category = get_category(db)
+    blackactions = (
+        db.query(models.EventAction.actionid)
+        .filter(models.EventAction.eventid ==  eventid)
+        .subquery()
+    )
+    eveactions = (
+        db.query( 
+            models.Action.id,
+            models.Action.name,
+            models.Action.title,
+            models.Action.subtitle,
+            models.Action.outputpoints,
+            models.Action.property,
+            models.Action.categoryid,
+            models.Action.nosort,
+            models.Category.categoryname)
+        .join(models.Category,models.Category.id == models.Action.categoryid)
+        .filter(models.Action.id.notin_(blackactions))
+        .order_by(models.Category.nosort,models.Action.nosort)
+        .all()
+    )
+    
     if not eveactions:
         raise HTTPException(status_code=404, detail="Data not found")
     return eveactions

backend/app/db/cruddb/__init__.py

@@ -0,0 +1,2 @@
+from app.db.cruddb.dbuser import dbuser
+from app.db.cruddb.dbdomain import dbdomain

backend/app/db/cruddb/crudbase.py

@@ -0,0 +1,104 @@
+from sqlalchemy import asc, desc
+from sqlalchemy.orm import Session
+from sqlalchemy.orm.query import Query
+from typing import Type, List, Optional
+from app.core.common import  ApiReturnPage
+from sqlalchemy import and_ ,or_
+from pydantic import BaseModel
+from app.db import models
+
+class crudbase:
+    def __init__(self, model: Type[models.Base]):
+        self.model = model
+
+    def _apply_filters(self, query: Query, filters: dict) -> Query:
+        and_conditions = [] 
+        or_conditions = []   
+        for column_name, value in filters.items():
+            column = getattr(self.model, column_name, None)
+            if column:
+                if isinstance(value, dict): 
+                    if 'operator' in value:
+                        operator = value['operator']
+                        filter_value = value['value']
+                        if operator == '!=':
+                            and_conditions.append(column != filter_value)
+                        elif operator == 'like':
+                            and_conditions.append(column.like(f"%{filter_value}%"))
+                        elif operator == '=':
+                            and_conditions.append(column == filter_value)
+                        elif operator == '>':
+                            and_conditions.append(column > filter_value)
+                        elif operator == '>=':
+                            and_conditions.append(column >= filter_value)
+                        elif operator == '<':
+                            and_conditions.append(column < filter_value)
+                        elif operator == '<=':
+                            and_conditions.append(column <= filter_value)
+                        elif operator == 'in':
+                            if isinstance(filter_value, list):
+                                or_conditions.append(column.in_(filter_value))
+                            else:
+                                and_conditions.append(column == filter_value)
+                    else:
+                        and_conditions.append(column == value)
+                else:
+                    and_conditions.append(column == value)
+
+        if and_conditions:
+            query = query.filter(*and_conditions)
+        if or_conditions:
+            query = query.filter(or_(*or_conditions))
+        return query
+
+    def _apply_sorting(self, query: Query, sort_by: Optional[str], sort_order: Optional[str]) -> Query:
+        if sort_by:
+            column = getattr(self.model, sort_by, None)
+            if column:
+                if sort_order == "desc":
+                    query = query.order_by(desc(column))
+                else:
+                    query = query.order_by(asc(column))
+        return query
+    
+    def get_all(self, db: Session) -> Query:
+        return db.query(self.model)
+       
+
+    def get(self, db: Session, item_id: int) -> Optional[models.Base]:
+        return db.query(self.model).get(item_id)
+
+    def create(self, db: Session, obj_in: BaseModel) -> models.Base:
+        db_obj = self.model(**obj_in.model_dump())
+        db.add(db_obj)
+        db.commit()
+        db.refresh(db_obj)
+        return db_obj
+
+    def update(self, db: Session, item_id: int, obj_in: BaseModel) -> Optional[models.Base]:
+        db_obj = db.query(self.model).filter(self.model.id == item_id).first()
+        if db_obj:
+            for key, value in obj_in.model_dump(exclude_unset=True).items():
+                setattr(db_obj, key, value)
+            db.commit()
+            db.refresh(db_obj)
+            return db_obj
+        return None
+    
+    def delete(self, db: Session, item_id: int) -> Optional[models.Base]:
+        db_obj = db.query(self.model).get(item_id)
+        if db_obj:
+            db.delete(db_obj)
+            db.commit()
+            return db_obj
+        return None
+   
+    def get_by_conditions(self, db: Session, filters: Optional[dict] = None, sort_by: Optional[str] = None, 
+              sort_order: Optional[str] = "asc") -> Query:
+        query = db.query(self.model) 
+        if filters:
+            query = self._apply_filters(query, filters)
+        if sort_by:
+            query = self._apply_sorting(query, sort_by, sort_order)
+        print(str(query))
+        return query

backend/app/db/cruddb/dbdomain.py

@@ -0,0 +1,139 @@
+from datetime import datetime
+from fastapi import HTTPException, status
+from sqlalchemy.orm import Session
+from sqlalchemy import and_
+import typing as t
+
+from app.db.cruddb.crudbase import crudbase
+from fastapi_pagination.ext.sqlalchemy import paginate
+from app.core.common import  ApiReturnPage
+
+from app.db import models, schemas
+from app.core.security import chacha20Decrypt, get_password_hash
+
+class dbuserdomain(crudbase):
+    def __init__(self):
+        super().__init__(model=models.UserDomain)
+
+    def get_userdomain(self,db: Session,userid:int,domainid:int):
+        return super().get_by_conditions(db,{"userid":userid,"domainid":domainid}).first()
+    
+    def get_userdomain_by_domainid(self,db: Session,ownerid:int,domainid:int):
+        return super().get_by_conditions(db,{"domainid":domainid})
+    
+
+    def get_default_domains(self,db: Session,domainid:int):
+        return super().get_by_conditions(db,{"domainid":domainid,"is_default":True}).all()
+
+    def get_user_default_domain(self,db: Session,userid:int):
+        return super().get_by_conditions(db,{"userid":userid,"is_default":True}).first()
+    
+    
+dbuserdomain = dbuserdomain() 
+
+class dbdomain(crudbase):
+    def __init__(self):
+        super().__init__(model=models.Domain)
+    
+    def get_domains(self,db: Session)-> ApiReturnPage[models.Base]:
+        return paginate(super().get_all(db))
+    
+    def get_domains_by_owner(self,db: Session,ownerid:int)-> ApiReturnPage[models.Base]:
+        return paginate( super().get_by_conditions(db,{"ownerid":ownerid}))
+                  
+    def create_domain(self,db: Session, domain: schemas.DomainIn,userid:int):
+        #db_domain = super().get_by_conditions(db,{"url":domain.url,"kintoneuser":domain.kintoneuser,"onwerid":userid}).first()
+        #if not db_domain:
+        domain.encrypt_kintonepwd()
+        domain.id = None
+        domain.createuserid = userid
+        domain.updateuserid = userid
+        domain.ownerid = userid
+        return super().create(db,domain)
+        #return db_domain
+
+    def delete_domain(self,db: Session,id: int):
+        return super().delete(db,id)
+    
+    def edit_domain(self,db: Session, domain: schemas.DomainIn,userid:int) -> schemas.DomainOut:            
+        db_domain = super().get(db,domain.id)
+        if db_domain: 
+            db_domain.tenantid = domain.tenantid
+            db_domain.name=domain.name
+            db_domain.url=domain.url
+            if db_domain.is_active == True and domain.is_active == False:
+                db_userdomains = dbuserdomain.get_default_domains(db,domain.id)
+                for userdomain in db_userdomains:
+                    userdomain.is_default = False
+                    db.add(userdomain)
+            db_domain.is_active=domain.is_active
+            db_domain.kintoneuser=domain.kintoneuser
+            if domain.kintonepwd != "" and domain.kintonepwd != None:
+                domain.encrypt_kintonepwd()
+                db_domain.kintonepwd = domain.kintonepwd
+            db_domain.updateuserid = userid
+            db.add(db_domain)
+            db.commit()
+            db.refresh(db_domain)
+            return db_domain
+        return None
+
+    def add_userdomain(self,db: Session,ownerid:int,userid:int,domainid:int) -> schemas.DomainOut:
+        db_domain = super().get_by_conditions(db,{"id":domainid,"is_active":True}).first()
+        if db_domain:
+            db_userdomain = dbuserdomain.get_userdomain(db,userid,domainid)
+            if not db_userdomain:
+                user_domain = models.UserDomain(userid = userid, domainid = domainid ,createuserid = ownerid,updateuserid = ownerid)
+                db.add(user_domain)
+                db.commit()
+            return db_domain
+        return None  
+    
+    def add_userdomain_by_owner(self,db: Session,ownerid:int, userid:int,domainid:int) -> schemas.DomainOut:
+        db_domain =  super().get_by_conditions(db,{"id":domainid,"ownerid":ownerid,"is_active":True}).first()
+        if db_domain:
+            db_userdomain = dbuserdomain.get_userdomain(db,userid,domainid)
+            if not db_userdomain:
+                user_domain = models.UserDomain(userid = userid, domainid = domainid ,createuserid =ownerid,updateuserid = ownerid)
+                db.add(user_domain)
+                db.commit()
+            return db_domain
+        return None   
+ 
+    def delete_userdomain(self,db: Session, userid: int,domainid: int) -> schemas.DomainOut:
+        db_userdomain = dbuserdomain.get_userdomain(db,userid,domainid)
+        if db_userdomain:
+            domain = db_userdomain.domain
+            db.delete(db_userdomain)
+            db.commit()
+            return domain
+        return None
+
+    def get_default_domain(self,db: Session, userid: int) -> schemas.DomainOut:
+        userdomain = dbuserdomain.get_user_default_domain(db,userid)
+        if userdomain:
+            return userdomain.domain
+        else:
+            return None
+
+    def set_default_domain(self,db: Session, userid: int,domainid: int):
+        db_domain =super().get_by_conditions(db,{"id":domainid,"is_active":True}).first()
+        if db_domain:
+            db_default_domain = dbuserdomain.get_user_default_domain(db,userid)
+            db_userdomain =dbuserdomain.get_userdomain(db,userid,domainid)
+            if db_default_domain:
+                db_default_domain.is_default = False
+                db_default_domain.updateuserid = userid
+                db.add(db_default_domain)
+            if db_userdomain:
+                db_userdomain.is_default = True
+                db_userdomain.updateuserid = userid
+                db.add(db_userdomain)
+            db.commit()
+        return db_domain
+
+    def get_shareddomain_users(self,db: Session,ownerid:int,domainid: int) -> ApiReturnPage[models.Base]:
+        users = db.query(models.User).join(models.UserDomain,models.UserDomain.userid == models.User.id).filter(models.UserDomain.domainid ==domainid)
+        return paginate(users)
+    
+dbdomain = dbdomain()

backend/app/db/cruddb/dbuser.py

@@ -0,0 +1,92 @@
+from datetime import datetime
+from fastapi import HTTPException, status
+from sqlalchemy.orm import Session
+from sqlalchemy import and_
+import typing as t
+
+from app.db.cruddb.crudbase import crudbase
+from fastapi_pagination.ext.sqlalchemy import paginate
+from app.core.common import  ApiReturnPage
+
+from app.db import models, schemas
+from app.core.security import chacha20Decrypt, get_password_hash
+
+
+class dbpermission(crudbase):
+    def __init__(self):
+        super().__init__(model=models.Permission)
+
+dbpermission = dbpermission()
+
+class dbrole(crudbase):
+    def __init__(self):
+        super().__init__(model=models.Role)
+    
+dbrole = dbrole()
+
+class dbuser(crudbase):
+    def __init__(self):
+        super().__init__(model=models.User)
+
+    def get_user(self,db: Session, user_id: int) -> schemas.User:
+        return super().get(db,user_id)
+
+    def get_user_by_email(self,db: Session, email: str) -> schemas.User:
+        return super().get_by_conditions(db,{"email":email}).first()
+
+    def get_users(self,db: Session) -> ApiReturnPage[models.Base]:
+        return paginate(super().get_all(db))
+
+    def get_users_not_admin(self,db: Session) -> ApiReturnPage[models.Base]:
+        return paginate(super().get_by_conditions(db,{"is_superuser":False}))
+
+    def create_user(self,db: Session, user: schemas.UserCreate,userid:int):
+        hashed_password = get_password_hash(user.password)
+        user.hashed_password = hashed_password
+        user.createuserid = userid
+        user.updateuserid = userid
+        del user.password
+        return super().create(db,user)
+
+    def delete_user(self,db: Session, user_id: int):
+        return super().delete(db,user_id)
+
+
+    def edit_user(self,db: Session, user_id:int,user: schemas.UserEdit,userid: int) -> schemas.User:
+        if not user.password is None and  user.password != "":
+            user.hashed_password = get_password_hash(user.password)
+            del user.password
+        user.updateuserid = userid
+        return super().update(db,user_id,user)
+    
+    def get_roles(self,db: Session) -> t.List[schemas.RoleBase]:
+        return dbrole.get_all(db).all()
+
+    def get_roles_by_level(self,db: Session,level:int) -> t.List[schemas.RoleBase]:
+        return dbrole.get_by_conditions(db,{"level":{"operator":">=","value":level}}).all()
+
+    def assign_userrole(self,db: Session, user_id: int, roles: t.List[int]):
+        db_user = super().get(db,user_id)
+        if db_user:
+            for role in db_user.roles:
+                db_user.roles.remove(role)
+            for roleid in roles:
+                role = dbrole.get(db,roleid)
+                if role:
+                    db_user.roles.append(role)
+        db.commit()
+        db.refresh(db_user)
+        return db_user
+    
+    def get_permissions(self,db: Session,user_id: int) -> t.List[schemas.Permission]:
+        return dbpermission.get_all(db).all()
+
+    def get_user_permissions(self,db: Session,user_id: int) -> t.List[schemas.Permission]:
+        permissions =[]
+        db_user = super().get(db,user_id)
+        if db_user:
+            for role in db_user.roles:
+                permissions += role.permissions
+        return list(set(permissions))
+
+dbuser = dbuser()

backend/app/db/models.py

@@ -1,6 +1,8 @@
-from sqlalchemy import Boolean, Column, Integer, String, DateTime,ForeignKey
-from sqlalchemy.ext.declarative import as_declarative
+from sqlalchemy import Boolean, Column, Integer, String, DateTime,ForeignKey,Table
+from sqlalchemy.orm import relationship,as_declarative
 from datetime import datetime
+from app.db.session import Base
+from app.core.security import chacha20Decrypt
 
 @as_declarative()
 class Base:
@@ -8,6 +10,21 @@ class Base:
     create_time = Column(DateTime, default=datetime.now)
     update_time = Column(DateTime, default=datetime.now, onupdate=datetime.now)
 
+
+userrole = Table(
+    "userrole",
+    Base.metadata,
+    Column("userid",Integer,ForeignKey("user.id")),
+    Column("roleid",Integer,ForeignKey("role.id")),
+)
+
+rolepermission = Table(
+    "rolepermission",
+    Base.metadata,
+    Column("roleid",Integer,ForeignKey("role.id")),
+    Column("permissionid",Integer,ForeignKey("permission.id")),
+)
+
 class User(Base):
     __tablename__ = "user"
 
@@ -17,6 +34,57 @@ class User(Base):
     hashed_password = Column(String(200), nullable=False)
     is_active = Column(Boolean, default=True)
     is_superuser = Column(Boolean, default=False)
+    createuserid = Column(Integer,ForeignKey("user.id"))
+    updateuserid = Column(Integer,ForeignKey("user.id"))
+    createuser = relationship('User',foreign_keys=[createuserid]) 
+    updateuser = relationship('User',foreign_keys=[updateuserid]) 
+    roles = relationship("Role",secondary=userrole,back_populates="users")
+
+
+class Role(Base):
+    __tablename__ = "role"
+
+    name = Column(String(100))
+    description = Column(String(255))
+    level = Column(Integer)
+    users = relationship("User",secondary=userrole,back_populates="roles")
+    permissions = relationship("Permission",secondary=rolepermission,back_populates="roles")
+
+class Permission(Base):
+    __tablename__ = "permission"
+
+    menu = Column(String(100))
+    function = Column(String(255))
+    privilege = Column(String(100))
+    roles = relationship("Role",secondary=rolepermission,back_populates="permissions")
+
+
+class App(Base):
+    __tablename__ = "app"
+
+    domainurl = Column(String(200), nullable=False) 
+    appname = Column(String(200), nullable=False)
+    appid = Column(String(100), index=True, nullable=False)
+    version = Column(Integer)
+    createuserid = Column(Integer,ForeignKey("user.id"))
+    updateuserid = Column(Integer,ForeignKey("user.id"))
+    createuser = relationship('User',foreign_keys=[createuserid]) 
+    updateuser = relationship('User',foreign_keys=[updateuserid]) 
+
+class AppVersion(Base):
+    __tablename__ = "appversion"
+
+    domainurl = Column(String(200), nullable=False) 
+    appname = Column(String(200), nullable=False)
+    appid = Column(String(100), index=True, nullable=False)
+    version = Column(Integer)
+    versionname = Column(String(200), nullable=False)
+    comment = Column(String(200), nullable=False)
+    createuserid = Column(Integer,ForeignKey("user.id"))
+    updateuserid = Column(Integer,ForeignKey("user.id"))
+    createuser = relationship('User',foreign_keys=[createuserid]) 
+    updateuser = relationship('User',foreign_keys=[updateuserid]) 
+
 
 class AppSetting(Base):
     __tablename__ = "appsetting"
@@ -40,6 +108,8 @@ class Action(Base):
     subtitle = Column(String(500))   
     outputpoints = Column(String)
     property =  Column(String)
+    categoryid = Column(Integer,ForeignKey("category.id"))
+    nosort = Column(Integer)
 
 class Flow(Base):
     __tablename__ = "flow"
@@ -47,9 +117,28 @@ class Flow(Base):
     flowid = Column(String(100), index=True, nullable=False)
     appid = Column(String(100), index=True, nullable=False)
     eventid = Column(String(100), index=True, nullable=False)
-    domainid = Column(Integer,ForeignKey("domain.id"))
+    domainurl = Column(String(200)) 
+    name = Column(String(200))   
+    content = Column(String) 
+    createuserid = Column(Integer,ForeignKey("user.id"))
+    updateuserid = Column(Integer,ForeignKey("user.id"))
+    createuser = relationship('User',foreign_keys=[createuserid]) 
+    updateuser = relationship('User',foreign_keys=[updateuserid]) 
+
+class FlowHistory(Base):
+    __tablename__ = "flowhistory"
+
+    flowid = Column(String(100), index=True, nullable=False)
+    appid = Column(String(100), index=True, nullable=False)
+    eventid = Column(String(100), index=True, nullable=False)
+    domainurl = Column(String(200)) 
     name = Column(String(200))   
     content = Column(String)  
+    version = Column(Integer)
+    createuserid = Column(Integer,ForeignKey("user.id"))
+    updateuserid = Column(Integer,ForeignKey("user.id"))
+    createuser = relationship('User',foreign_keys=[createuserid]) 
+    updateuser = relationship('User',foreign_keys=[updateuserid]) 
 
 class Tenant(Base):
     __tablename__ = "tenant"
@@ -60,6 +149,7 @@ class Tenant(Base):
     startdate = Column(DateTime)
     enddate = Column(DateTime) 
 
+
 class Domain(Base):
     __tablename__ = "domain"
 
@@ -68,6 +158,16 @@ class Domain(Base):
     url = Column(String(200), nullable=False)
     kintoneuser = Column(String(100), nullable=False)
     kintonepwd = Column(String(100), nullable=False)
+    is_active = Column(Boolean, default=True)
+    def decrypt_kintonepwd(self):
+        decrypted_pwd = chacha20Decrypt(self.kintonepwd)
+        return decrypted_pwd
+    createuserid = Column(Integer,ForeignKey("user.id"))
+    updateuserid = Column(Integer,ForeignKey("user.id"))
+    ownerid = Column(Integer,ForeignKey("user.id"))
+    createuser = relationship('User',foreign_keys=[createuserid]) 
+    updateuser = relationship('User',foreign_keys=[updateuserid]) 
+    owner = relationship('User',foreign_keys=[ownerid]) 
 
 
 class UserDomain(Base):
@@ -75,7 +175,13 @@ class UserDomain(Base):
 
     userid = Column(Integer,ForeignKey("user.id"))
     domainid = Column(Integer,ForeignKey("domain.id"))
-    active = Column(Boolean, default=False)
+    is_default = Column(Boolean, default=False)
+    createuserid = Column(Integer,ForeignKey("user.id"))
+    updateuserid = Column(Integer,ForeignKey("user.id"))
+    domain = relationship("Domain")
+    user = relationship("User",foreign_keys=[userid])
+    createuser = relationship('User',foreign_keys=[createuserid]) 
+    updateuser = relationship('User',foreign_keys=[updateuserid]) 
 
 class Event(Base):
     __tablename__ = "event"
@@ -90,7 +196,7 @@ class Event(Base):
 class EventAction(Base):
     __tablename__ = "eventaction"
 
-    eventid = Column(Integer,ForeignKey("event.id"))
+    eventid = Column(String(100),ForeignKey("event.eventid"))
     actionid = Column(Integer,ForeignKey("action.id"))
 
 
@@ -101,6 +207,17 @@ class ErrorLog(Base):
        location = Column(String(500))
        content = Column(String(5000))
 
+class OperationLog(Base):
+       __tablename__ = "operationlog"
+
+       tenantid =  Column(String(100))
+       domainurl = Column(String(200))
+       userid = Column(Integer,ForeignKey("user.id"))
+       operation = Column(String(200))
+       function = Column(String(200))
+       detail = Column(String(200))
+       user = relationship('User')
+
 class KintoneFormat(Base):
       __tablename__ = "kintoneformat"
 
@@ -110,4 +227,10 @@ class KintoneFormat(Base):
       typecolumn =Column(Integer)
       codecolumn =Column(Integer)
       field = Column(String(5000))
-      trueformat = Column(String(10))
+      trueformat = Column(String(10))
+
+class Category(Base):
+    __tablename__ = "category"
+
+    categoryname = Column(String(20))
+    nosort = Column(Integer)

backend/app/db/schemas.py

@@ -2,46 +2,75 @@ from pydantic import BaseModel
 from datetime import datetime
 import typing as t
 
+from app.core.security import chacha20Decrypt, chacha20Encrypt
 
 class Base(BaseModel):
     create_time: datetime
     update_time: datetime
 
+
+class Permission(BaseModel):
+    id: int
+    menu:str
+    function:str
+    privilege:str
+
+class RoleBase(BaseModel):
+    id: int
+    name:str
+    description:str
+    level:int
+
+
+class RoleWithPermission(RoleBase):
+    permissions:t.List[Permission] = []
+    
 class UserBase(BaseModel):
     email: str
     is_active: bool = True
     is_superuser: bool = False
     first_name: str = None
     last_name: str = None
+    roles:t.List[RoleBase] = []
+   
+
+class UserOut(BaseModel):
+    id: int
+    email: str
+    is_active: bool = True
+    is_superuser: bool = False
+    first_name: str = None
+    last_name: str = None
 
 
-class UserOut(UserBase):
-    pass
-
-
 class UserCreate(UserBase):
     email:str
     password: str
+    hashed_password :str = None
     first_name: str
     last_name: str
     is_active:bool
     is_superuser:bool
+    createuserid:t.Optional[int] = None
+    updateuserid:t.Optional[int] = None
 
-    class Config:
+    class ConfigDict:
         orm_mode = True
 
 
 class UserEdit(UserBase):
     password: t.Optional[str] = None
+    hashed_password :str = None
+    updateuserid:t.Optional[int] = None
 
-    class Config:
+    class ConfigDict:
         orm_mode = True
 
 
 class User(UserBase):
     id: int
 
-    class Config:
+    class ConfigDict:
         orm_mode = True
 
 
@@ -49,6 +78,20 @@ class Token(BaseModel):
     access_token: str
     token_type: str
 
+class AppList(Base):
+    domainurl: str
+    appname: str
+    appid:str
+    updateuser: UserOut
+    version:int
+    
+class AppVersion(BaseModel):
+    domainurl: str
+    appname: str
+    versionname: str
+    comment:str
+    appid:str
+ 
 
 class TokenData(BaseModel):
     id:int = 0
@@ -67,7 +110,7 @@ class AppBase(BaseModel):
 class App(AppBase):
     id: int
 
-    class Config:
+    class ConfigDict:
         orm_mode = True
 
 
@@ -78,7 +121,7 @@ class Kintone(BaseModel):
     desc: str = None
     content: str = None
 
-    class Config:
+    class ConfigDict:
         orm_mode = True
 
 class Action(BaseModel):
@@ -88,13 +131,17 @@ class Action(BaseModel):
     subtitle: str = None
     outputpoints: str = None
     property: str = None
-
-    class Config:
+    categoryid: int = None
+    nosort: int
+    categoryname : str =None
+    class ConfigDict:
         orm_mode = True
 
-class FlowBase(BaseModel):
+class FlowIn(BaseModel):
     flowid: str 
+    # domainurl:str
     appid: str 
+    appname:str
     eventid: str
     name: str = None
     content: str = None
@@ -104,20 +151,46 @@ class Flow(Base):
     flowid: str 
     appid: str 
     eventid: str
-    domainid: int
+    domainurl: str
     name: str = None
     content: str = None
 
-    class Config:
+    class ConfigDict:
         orm_mode = True
 
-class DomainBase(BaseModel):
+class DomainIn(BaseModel):
     id: int
     tenantid: str
     name: str 
     url: str
     kintoneuser: str 
-    kintonepwd: str 
+    kintonepwd: t.Optional[str] = None 
+    is_active: bool
+    createuserid:t.Optional[int] = None
+    updateuserid:t.Optional[int] = None
+    ownerid:t.Optional[int] = None
+
+    def encrypt_kintonepwd(self):
+        encrypted_pwd = chacha20Encrypt(self.kintonepwd)
+        self.kintonepwd = encrypted_pwd
+
+class DomainOut(BaseModel):
+    id: int
+    tenantid: str
+    name: str 
+    url: str
+    kintoneuser: str
+    is_active: bool
+    ownerid:int
+
+    class ConfigDict:
+        orm_mode = True
+
+class UserDomain(BaseModel):
+    id: int
+    is_default: bool
+    domain:DomainOut
+    user:UserOut
 
 class Domain(Base):
     id: int
@@ -125,11 +198,14 @@ class Domain(Base):
     name: str 
     url: str
     kintoneuser: str 
-    kintonepwd: str 
-
-    class Config:
+    is_active: bool
+    updateuser:UserOut
+    owner:UserOut
+    
+    class ConfigDict:
         orm_mode = True
 
+
 class Event(Base):
     id: int
     category: str
@@ -139,7 +215,7 @@ class Event(Base):
     mobile: bool
     eventgroup: bool
 
-    class Config:
+    class ConfigDict:
         orm_mode = True
 
 class ErrorCreate(BaseModel):

backend/app/db/session.py

@@ -1,6 +1,5 @@
 from sqlalchemy import create_engine
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import sessionmaker,declarative_base
 
 from app.core import config
 

backend/app/main.py

@@ -1,5 +1,6 @@
 import os
 from fastapi import FastAPI, Depends
+from fastapi_pagination import add_pagination
 from starlette.requests import Request
 import uvicorn
 from app.api.api_v1.routers.kintone import kinton_router
@@ -14,14 +15,22 @@ from app import tasks
 from fastapi.middleware.cors import CORSMiddleware
 import logging
 from app.core.apiexception import APIException, writedblog
+from app.core.common import ApiReturnError
 from app.db.crud import create_log
 from fastapi.responses import JSONResponse
 import asyncio
+from contextlib import asynccontextmanager
+
 
 Base.metadata.create_all(bind=engine) 
 
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    startup_event()
+    yield
+
 app = FastAPI(
-    title=config.PROJECT_NAME, docs_url="/api/docs", openapi_url="/api"
+    title=config.PROJECT_NAME, docs_url="/api/docs", openapi_url="/api",lifespan=lifespan
 )
 
 origins = [
@@ -36,6 +45,8 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
+add_pagination(app)
+
 # @app.middleware("http")
 # async def db_session_middleware(request: Request, call_next):
 #     request.state.db = SessionLocal()
@@ -43,12 +54,11 @@ app.add_middleware(
 #     request.state.db.close()
 #     return response
 
-@app.on_event("startup")
-async def startup_event():
+def startup_event():
     log_dir="log"
     if not os.path.exists(log_dir):
         os.makedirs(log_dir)
-        
+    
     logger = logging.getLogger("uvicorn.access")
     handler = logging.handlers.RotatingFileHandler(f"{log_dir}/api.log",mode="a",maxBytes = 100*1024, backupCount = 3)
     handler.setFormatter(logging.Formatter("%(asctime)s - %(levelname)s - %(message)s"))
@@ -60,7 +70,7 @@ async def api_exception_handler(request: Request, exc: APIException):
     loop.run_in_executor(None,writedblog,exc)
     return JSONResponse(
             status_code=exc.status_code,
-            content={"detail": f"{exc.detail}"},
+            content= ApiReturnError(msg = f"{exc.detail}").model_dump(),
     )
 
 @app.get("/api/v1")

backend/app/tests/conftest.py

@@ -0,0 +1,145 @@
+import pytest
+from sqlalchemy import create_engine, event
+from sqlalchemy.orm import sessionmaker
+from fastapi.testclient import TestClient
+import typing as t
+
+from app.core import config, security
+from app.db.session import Base, get_db
+from app.db import models
+from app.main import app
+
+
+def get_test_db_url() -> str:
+    return f"{config.SQLALCHEMY_DATABASE_URI}"
+
+
+@pytest.fixture
+def test_db():
+    """
+    Modify the db session to automatically roll back after each test.
+    This is to avoid tests affecting the database state of other tests.
+    """
+    # Connect to the test database
+    engine = create_engine(
+        get_test_db_url(),
+    )
+
+    connection = engine.connect()
+    trans = connection.begin()
+
+    # Run a parent transaction that can roll back all changes
+    test_session_maker = sessionmaker(
+        autocommit=False, autoflush=False, bind=engine
+    )
+    test_session = test_session_maker()
+    #test_session.begin_nested()
+
+    # @event.listens_for(test_session, "after_transaction_end")
+    # def restart_savepoint(s, transaction):
+    #     if transaction.nested and not transaction._parent.nested:
+    #         s.expire_all()
+    #         s.begin_nested()
+
+    yield test_session
+
+    # Roll back the parent transaction after the test is complete
+    test_session.close()
+    trans.rollback()
+    connection.close()
+
+
+@pytest.fixture(scope="function")
+def test_client(test_db):
+    """
+    Get a TestClient instance that reads/write to the test database.
+    """
+
+    def get_test_db():
+        yield test_db
+
+    app.dependency_overrides[get_db] = get_test_db
+    with TestClient(app) as test_client:
+        yield test_client
+
+
+# @pytest.fixture
+# def test_password() -> str:
+#     return "securepassword"
+
+
+# def get_password_hash() -> str:
+#     """
+#     Password hashing can be expensive so a mock will be much faster
+#     """
+#     return "supersecrethash"
+
+
+# @pytest.fixture
+# def test_user(test_db) -> models.User:
+#     """
+#     Make a test user in the database
+#     """
+
+#     user = models.User(
+#         email="fake@email.com",
+#         hashed_password=get_password_hash(),
+#         is_active=True,
+#     )
+#     test_db.add(user)
+#     test_db.commit()
+#     return user
+
+
+# @pytest.fixture
+# def test_superuser(test_db) -> models.User:
+#     """
+#     Superuser for testing
+#     """
+
+#     user = models.User(
+#         email="fakeadmin@email.com",
+#         hashed_password=get_password_hash(),
+#         is_superuser=True,
+#     )
+#     test_db.add(user)
+#     test_db.commit()
+#     return user
+
+
+# def verify_password_mock(first: str, second: str) -> bool:
+#     return True
+
+
+# @pytest.fixture
+# def user_token_headers(
+#     client: TestClient, test_user, test_password, monkeypatch
+# ) -> t.Dict[str, str]:
+#     monkeypatch.setattr(security, "verify_password", verify_password_mock)
+
+#     login_data = {
+#         "username": test_user.email,
+#         "password": test_password,
+#     }
+#     r = client.post("/api/token", data=login_data)
+#     tokens = r.json()
+#     a_token = tokens["access_token"]
+#     headers = {"Authorization": f"Bearer {a_token}"}
+#     return headers
+
+
+# @pytest.fixture
+# def superuser_token_headers(
+#     client: TestClient, test_superuser, test_password, monkeypatch
+# ) -> t.Dict[str, str]:
+#     monkeypatch.setattr(security, "verify_password", verify_password_mock)
+
+#     login_data = {
+#         "username": test_superuser.email,
+#         "password": test_password,
+#     }
+#     r = client.post("/api/token", data=login_data)
+#     tokens = r.json()
+#     a_token = tokens["access_token"]
+#     headers = {"Authorization": f"Bearer {a_token}"}
+#     return headers

backend/app/tests/test_main.py

@@ -1,4 +1,6 @@
-def test_read_main(client):
-    response = client.get("/api/v1")
+
+
+def test_read_main(test_client):
+    response = test_client.get("/api/v1")
     assert response.status_code == 200
-    assert response.json() == {"message": "Hello World"}
+    assert response.json() == {"message": "success"}

backend/conftest.py

@@ -1,169 +0,0 @@
-import pytest
-from sqlalchemy import create_engine, event
-from sqlalchemy.orm import sessionmaker
-from sqlalchemy_utils import database_exists, create_database, drop_database
-from fastapi.testclient import TestClient
-import typing as t
-
-from app.core import config, security
-from app.db.session import Base, get_db
-from app.db import models
-from app.main import app
-
-
-def get_test_db_url() -> str:
-    return f"{config.SQLALCHEMY_DATABASE_URI}_test"
-
-
-@pytest.fixture
-def test_db():
-    """
-    Modify the db session to automatically roll back after each test.
-    This is to avoid tests affecting the database state of other tests.
-    """
-    # Connect to the test database
-    engine = create_engine(
-        get_test_db_url(),
-    )
-
-    connection = engine.connect()
-    trans = connection.begin()
-
-    # Run a parent transaction that can roll back all changes
-    test_session_maker = sessionmaker(
-        autocommit=False, autoflush=False, bind=engine
-    )
-    test_session = test_session_maker()
-    test_session.begin_nested()
-
-    @event.listens_for(test_session, "after_transaction_end")
-    def restart_savepoint(s, transaction):
-        if transaction.nested and not transaction._parent.nested:
-            s.expire_all()
-            s.begin_nested()
-
-    yield test_session
-
-    # Roll back the parent transaction after the test is complete
-    test_session.close()
-    trans.rollback()
-    connection.close()
-
-
-@pytest.fixture(scope="session", autouse=True)
-def create_test_db():
-    """
-    Create a test database and use it for the whole test session.
-    """
-
-    test_db_url = get_test_db_url()
-
-    # Create the test database
-    assert not database_exists(
-        test_db_url
-    ), "Test database already exists. Aborting tests."
-    create_database(test_db_url)
-    test_engine = create_engine(test_db_url)
-    Base.metadata.create_all(test_engine)
-
-    # Run the tests
-    yield
-
-    # Drop the test database
-    drop_database(test_db_url)
-
-
-@pytest.fixture
-def client(test_db):
-    """
-    Get a TestClient instance that reads/write to the test database.
-    """
-
-    def get_test_db():
-        yield test_db
-
-    app.dependency_overrides[get_db] = get_test_db
-
-    yield TestClient(app)
-
-
-@pytest.fixture
-def test_password() -> str:
-    return "securepassword"
-
-
-def get_password_hash() -> str:
-    """
-    Password hashing can be expensive so a mock will be much faster
-    """
-    return "supersecrethash"
-
-
-@pytest.fixture
-def test_user(test_db) -> models.User:
-    """
-    Make a test user in the database
-    """
-
-    user = models.User(
-        email="fake@email.com",
-        hashed_password=get_password_hash(),
-        is_active=True,
-    )
-    test_db.add(user)
-    test_db.commit()
-    return user
-
-
-@pytest.fixture
-def test_superuser(test_db) -> models.User:
-    """
-    Superuser for testing
-    """
-
-    user = models.User(
-        email="fakeadmin@email.com",
-        hashed_password=get_password_hash(),
-        is_superuser=True,
-    )
-    test_db.add(user)
-    test_db.commit()
-    return user
-
-
-def verify_password_mock(first: str, second: str) -> bool:
-    return True
-
-
-@pytest.fixture
-def user_token_headers(
-    client: TestClient, test_user, test_password, monkeypatch
-) -> t.Dict[str, str]:
-    monkeypatch.setattr(security, "verify_password", verify_password_mock)
-
-    login_data = {
-        "username": test_user.email,
-        "password": test_password,
-    }
-    r = client.post("/api/token", data=login_data)
-    tokens = r.json()
-    a_token = tokens["access_token"]
-    headers = {"Authorization": f"Bearer {a_token}"}
-    return headers
-
-
-@pytest.fixture
-def superuser_token_headers(
-    client: TestClient, test_superuser, test_password, monkeypatch
-) -> t.Dict[str, str]:
-    monkeypatch.setattr(security, "verify_password", verify_password_mock)
-
-    login_data = {
-        "username": test_superuser.email,
-        "password": test_password,
-    }
-    r = client.post("/api/token", data=login_data)
-    tokens = r.json()
-    a_token = tokens["access_token"]
-    headers = {"Authorization": f"Bearer {a_token}"}
-    return headers

backend/readme.md

@@ -24,4 +24,8 @@ python -m venv env
    ```bash
    pip install -r requirements.txt
 
-   ```
+   ```
+4. backend 起動
+   ```bash
+   uvicorn app.main:app --reload
+   ```

document/ナレッジ構成.drawio

@@ -0,0 +1,211 @@
+<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" version="24.9.2">
+  <diagram name="ページ1" id="oKiyF3b1qzm0IX1SNAWJ">
+    <mxGraphModel dx="1395" dy="1078" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+      <root>
+        <mxCell id="0" />
+        <mxCell id="1" parent="0" />
+        <mxCell id="Clf12EPbcqlM1huzJpPN-73" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d0cee2;strokeColor=#56517e;" vertex="1" parent="1">
+          <mxGeometry x="92" y="645" width="720" height="180" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-71" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
+          <mxGeometry x="110" y="605" width="720" height="180" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-53" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#ffcccc;strokeColor=#36393d;" vertex="1" parent="1">
+          <mxGeometry x="140" y="570" width="720" height="180" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-52" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#cdeb8b;strokeColor=#36393d;" vertex="1" parent="1">
+          <mxGeometry x="170" y="530" width="720" height="180" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-51" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#ffcc99;strokeColor=#36393d;" vertex="1" parent="1">
+          <mxGeometry x="210" y="490" width="720" height="180" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-49" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+          <mxGeometry x="90" y="20" width="1080" height="290" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-10" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-1" target="Clf12EPbcqlM1huzJpPN-9">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-1" value="タスク開始" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="120" y="215" width="90" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-45" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;dashed=1;curved=1;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-8" target="Clf12EPbcqlM1huzJpPN-9">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-47" value="DBからクロールのタスクを取得する" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="Clf12EPbcqlM1huzJpPN-45">
+          <mxGeometry x="0.2449" y="53" relative="1" as="geometry">
+            <mxPoint x="17" y="-44" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-79" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-8" target="Clf12EPbcqlM1huzJpPN-78">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-8" value="DB" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;fillColor=#cce5ff;strokeColor=#36393d;" vertex="1" parent="1">
+          <mxGeometry x="570" y="-110" width="100" height="70" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-9" value="&lt;div style=&quot;background-color: rgb(255, 255, 254); font-family: Consolas, &amp;quot;Courier New&amp;quot;, monospace; font-size: 14px; line-height: 19px; white-space: pre;&quot;&gt;&lt;span style=&quot;&quot;&gt;タスクスケジューラ&lt;/span&gt;&lt;/div&gt;" style="whiteSpace=wrap;html=1;rounded=1;fontColor=default;" vertex="1" parent="1">
+          <mxGeometry x="260" y="217.5" width="140" height="45" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;curved=1;startArrow=block;startFill=1;endArrow=none;endFill=0;dashed=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-15" target="Clf12EPbcqlM1huzJpPN-9">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-18" value="タスクの割り当て" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="Clf12EPbcqlM1huzJpPN-17">
+          <mxGeometry x="0.04" relative="1" as="geometry">
+            <mxPoint x="-18" y="30" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.75;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;dashed=1;curved=1;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-15" target="Clf12EPbcqlM1huzJpPN-31">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-15" value="&lt;b&gt;RabbitMQ&lt;/b&gt;" style="whiteSpace=wrap;html=1;rounded=1;fillColor=#1ba1e2;fontColor=#ffffff;strokeColor=#006EAF;" vertex="1" parent="1">
+          <mxGeometry x="510" y="380" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-22" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-19" target="Clf12EPbcqlM1huzJpPN-21">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-19" value="MQコマンドの受信" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="250" y="560" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;curved=1;dashed=1;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-15" target="Clf12EPbcqlM1huzJpPN-19">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-24" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-21" target="Clf12EPbcqlM1huzJpPN-23">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-21" value="データ収集" style="whiteSpace=wrap;html=1;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="490" y="560" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;curved=1;dashed=1;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-23" target="Clf12EPbcqlM1huzJpPN-15">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-23" value="結果をMQメッセージを変換" style="whiteSpace=wrap;html=1;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="740" y="560" width="170" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-33" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;exitPerimeter=0;dashed=1;curved=1;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-26" target="Clf12EPbcqlM1huzJpPN-31">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="980" y="390" />
+              <mxPoint x="980" y="350" />
+              <mxPoint x="745" y="350" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-26" value="データ収集結果&lt;br&gt;一時保存" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;fillColor=#eeeeee;strokeColor=#36393d;" vertex="1" parent="1">
+          <mxGeometry x="970" y="390" width="100" height="70" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-27" value="タスクコマンド" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="1">
+          <mxGeometry x="340" y="450" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-28" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-23" target="Clf12EPbcqlM1huzJpPN-26">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-29" value="コンテンツなど大きい情報を一時保存" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
+          <mxGeometry x="950" y="500" width="230" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-30" value="収集結果通知MQ" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
+          <mxGeometry x="740" y="450" width="110" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-37" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-31" target="Clf12EPbcqlM1huzJpPN-36">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-31" value="メッセージキューから&lt;div&gt;データ受信&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="677" y="212.5" width="150" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-34" value="MQのキーで収集結果を取得" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
+          <mxGeometry x="760" y="350" width="170" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-39" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-36" target="Clf12EPbcqlM1huzJpPN-38">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-36" value="&lt;div style=&quot;background-color: rgb(255, 255, 254); font-family: Consolas, &amp;quot;Courier New&amp;quot;, monospace; line-height: 19px; white-space: pre;&quot;&gt;&lt;span&gt;データクリーニング&lt;br&gt;と重複排除&lt;/span&gt;&lt;/div&gt;" style="whiteSpace=wrap;html=1;rounded=1;fontColor=default;fontSize=11;" vertex="1" parent="1">
+          <mxGeometry x="890" y="207.5" width="148" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-43" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-38" target="Clf12EPbcqlM1huzJpPN-42">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-38" value="データベースに保存" style="whiteSpace=wrap;html=1;fontSize=11;rounded=1;" vertex="1" parent="1">
+          <mxGeometry x="904" y="60" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-44" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-42" target="Clf12EPbcqlM1huzJpPN-31">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-42" value="収集結果からサブ項目を抽出" style="whiteSpace=wrap;html=1;fontSize=11;rounded=1;" vertex="1" parent="1">
+          <mxGeometry x="692" y="60" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-46" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;curved=1;dashed=1;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-38" target="Clf12EPbcqlM1huzJpPN-8">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-48" value="クロール結果をDBに登録する" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="Clf12EPbcqlM1huzJpPN-46">
+          <mxGeometry x="0.1149" y="13" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-50" value="&lt;b&gt;メインプログラム&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="540" y="20" width="130" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-54" value="&lt;b&gt;クローラー　サブプログラム&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="485" y="490" width="185" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-55" value="&lt;b&gt;SharePointクローラー&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="220" y="640" width="130" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-60" value="MQ情報" style="swimlane;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;align=center;fontSize=14;fillColor=#dae8fc;strokeColor=#6c8ebf;gradientColor=#7ea6e0;" vertex="1" parent="1">
+          <mxGeometry x="1024" y="630" width="160" height="236" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-61" value="MQキー" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="Clf12EPbcqlM1huzJpPN-60">
+          <mxGeometry y="26" width="160" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-70" value="クローラーID" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="Clf12EPbcqlM1huzJpPN-60">
+          <mxGeometry y="56" width="160" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-62" value="分類" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="Clf12EPbcqlM1huzJpPN-60">
+          <mxGeometry y="86" width="160" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-63" value="タイトル" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="Clf12EPbcqlM1huzJpPN-60">
+          <mxGeometry y="116" width="160" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-64" value="URL" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="Clf12EPbcqlM1huzJpPN-60">
+          <mxGeometry y="146" width="160" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-65" value="サブ項目" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="Clf12EPbcqlM1huzJpPN-60">
+          <mxGeometry y="176" width="160" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-66" value="コンテンツ" style="text;strokeColor=none;fillColor=none;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontSize=12;whiteSpace=wrap;html=1;" vertex="1" parent="Clf12EPbcqlM1huzJpPN-60">
+          <mxGeometry y="206" width="160" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-67" value="" style="endArrow=none;dashed=1;html=1;dashPattern=1 3;strokeWidth=2;rounded=0;entryX=1;entryY=0.75;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-60" target="Clf12EPbcqlM1huzJpPN-23">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="930" y="840" as="sourcePoint" />
+            <mxPoint x="980" y="790" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-68" value="&lt;b&gt;OneNodeクローラー&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="180" y="680" width="130" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-69" value="&lt;b&gt;EIM　クローラー&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="150" y="720" width="130" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-72" value="&lt;b&gt;Coredasuクローラー&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="120" y="755" width="130" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-74" value="&lt;b&gt;その他クローラー&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="92" y="795" width="130" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-75" value="PostGre SQL" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
+          <mxGeometry x="585" y="-40" width="90" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-76" value="再帰的な処理" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="1030" y="140" width="80" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-77" value="NEO4J" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="1">
+          <mxGeometry x="570" y="-390" width="100" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-78" value="データ抽出" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="560" y="-250" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="Clf12EPbcqlM1huzJpPN-80" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="Clf12EPbcqlM1huzJpPN-78" target="Clf12EPbcqlM1huzJpPN-77">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>

frontend/.env

@@ -1,2 +1,6 @@
-# KAB_BACKEND_URL="https://kab-backend.azurewebsites.net/"
-KAB_BACKEND_URL="http://127.0.0.1:8000/"
+#開発環境
+#KAB_BACKEND_URL="https://kab-backend.azurewebsites.net/"
+#単体テスト環境
+#KAB_BACKEND_URL="https://kab-backend-unittest.azurewebsites.net/"
+#ローカル開発環境
+KAB_BACKEND_URL="http://127.0.0.1:8000/"

frontend/index.html

@@ -2,7 +2,6 @@
 <html lang="ja-jp">
   <head>
     <title><%= productName %></title>
-
     <meta charset="utf-8">
     <meta name="description" content="<%= productDescription %>">
     <meta name="format-detection" content="telephone=no">

frontend/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "kintone-automate",
-  "version": "0.2.0",
+  "name": "k-tune",
+  "version": "2.0.0 Beta",
   "description": "Kintoneアプリの自動生成とデプロイを支援ツールです",
-  "productName": "kintone Automate",
+  "productName": "k-tune | kintoneジェネレーター",
   "author": "maxiaozhe@alicorns.co.jp <maxiaozhe@alicorns.co.jp>",
   "private": true,
   "scripts": {
@@ -12,13 +12,15 @@
     "dev": "quasar dev",
     "dev:local": "set \"LOCAL=true\" && quasar dev",
     "build": "set \"SOURCE_MAP=false\" && quasar build",
-    "build:dev":"set \"SOURCE_MAP=true\" && quasar build"
-
+    "build:dev": "set \"SOURCE_MAP=true\" && quasar build"
   },
   "dependencies": {
     "@quasar/extras": "^1.16.4",
+    "@vueuse/core": "^10.9.0",
     "axios": "^1.4.0",
-    "pinia": "^2.1.6",
+    "jwt-decode": "^4.0.0",
+    "pinia": "^2.1.7",
+    "pinia-plugin-persistedstate": "^3.2.1",
     "quasar": "^2.6.0",
     "uuid": "^9.0.0",
     "vue": "^3.0.0",

frontend/quasar.config.js

@@ -94,6 +94,7 @@ module.exports = configure(function (/* ctx */) {
     // Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#devServer
     devServer: {
       // https: true
+      port:9001,
       open: true, // opens browser window automatically
       env: { ...dotenv },
     },
@@ -114,7 +115,8 @@ module.exports = configure(function (/* ctx */) {
 
       // Quasar plugins
       plugins: [
-        'Notify'
+        'Notify',
+        'Dialog'
       ]
     },
 

frontend/src/boot/axios.ts

@@ -2,6 +2,7 @@ import { boot } from 'quasar/wrappers';
 import axios, { AxiosInstance } from 'axios';
 import {router} from 'src/router';
 
+
 declare module '@vue/runtime-core' {
   interface ComponentCustomProperties {
     $axios: AxiosInstance;
@@ -15,30 +16,10 @@ declare module '@vue/runtime-core' {
 // good idea to move this instance creation inside of the
 // "export default () => {}" function below (which runs individually
 // for each client)
+
 const api:AxiosInstance = axios.create({ baseURL: process.env.KAB_BACKEND_URL });
-const token=localStorage.getItem('token')||'';
-if(token!==''){
-  api.defaults.headers["Authorization"]='Bearer ' + token;
-}
-//axios例外キャプチャー
-api.interceptors.response.use(
-  (response)=>response,
-  (error)=>{
-    if (error.response && error.response.status === 401) {
-      // 認証エラーの場合再ログインする
-      console.error('(; ﾟДﾟ)/認証エラー(401)：', error);
-      localStorage.removeItem('token');
-      router.replace({
-        path:"/login",
-        query:{redirect:router.currentRoute.value.fullPath}
-      });
-    }
-    return Promise.reject(error);
-  }
-)
 export default boot(({ app }) => {
   // for use inside Vue files (Options API) through this.$axios and this.$api
-
   app.config.globalProperties.$axios = axios;
   // ^ ^ ^ this will allow you to use this.$axios (for Vue Options API form)
   //       so you won't necessarily have to import axios in each vue file

frontend/src/boot/error-handler.ts

@@ -4,6 +4,7 @@ import { Router } from 'vue-router';
 import { App } from 'vue';
 
 export default boot(({ app, router }: { app: App<Element>; router: Router }) => {
+  document.documentElement.lang="ja-JP";
   app.config.errorHandler = (err: any, instance: any, info: string) => {
     if (err.response && err.response.status === 401) {
       // 認証エラーの場合再ログインする

frontend/src/components/ActionSelect.vue

@@ -3,20 +3,46 @@
     <div v-if="!isLoaded" class="spinner flex flex-center">
       <q-spinner  color="primary" size="3em" />
     </div>
-    <q-table v-else  row-key="index" :selection="type" v-model:selected="selected" :columns="columns" :rows="rows"
-    class="action-table"
-    flat bordered
-    virtual-scroll
-    :pagination="pagination"
-    :rows-per-page-options="[0]"
-    :filter="filter"
+    <q-splitter
+      v-model="splitterModel"
+      style="height: 100%"
+      before-class="tab"
+      unit="px"
+      v-else
     >
-    </q-table>
+      <template v-slot:before>
+        <q-tabs
+          v-model="tab"
+          vertical
+          active-color="white"
+          indicator-color="primary"
+          active-bg-color="primary"
+          class="bg-grey-2 text-grey-8"
+          dense
+        >
+          <q-tab :name="cate"
+                :label="cate"
+                 v-for="(cate,) in categorys"
+                 :key="cate"
+                 ></q-tab>
+        </q-tabs>
+      </template>
+      <template v-slot:after>
+        <q-table row-key="index" :selection="type" v-model:selected="selected" :columns="columns" :rows="actionForTab"
+        class="action-table"
+        flat bordered
+        virtual-scroll
+        :pagination="pagination"
+        :rows-per-page-options="[0]"
+        :filter="filter"></q-table>
+      </template>
+    </q-splitter>
   </div>
 </template>
 <script>
-import { ref,onMounted,reactive } from 'vue'
+import { ref,onMounted,reactive,watchEffect,computed,watch } from 'vue'
 import { api } from 'boot/axios';
+import { useFlowEditorStore } from 'stores/flowEditor';
 
 export default {
   name: 'actionSelect',
@@ -25,30 +51,74 @@ export default {
     type: String,
     filter:String
   },
-  setup(props) {
+  emits:[
+    "clearFilter"
+  ],
+  setup(props,{emit}) {
     const isLoaded=ref(false);
     const columns = [
     { name: 'name', required: true,label: 'アクション名',align: 'left',field: 'name',sortable: true},
     { name: 'desc', align: 'left', label: '説明', field: 'desc', sortable: true },
     // { name: 'content', label: '内容', field: 'content', sortable: true }
     ];
-    const rows = reactive([])
+    const store = useFlowEditorStore();
+    let actionData =reactive([]);
+    const categorys = ref('');
+    const tab=ref('');
+    const actionForTab=computed(()=>{
+       const rows=[];
+       const actions= props.filter? actionData:actionData.filter(x=>x.categoryname===tab.value);
+       actions.forEach((item,index) =>{
+            rows.push({index,
+                 name:item.name,
+                 desc:item.title,
+                 outputPoints:item.outputpoints,
+                 property:item.property});
+       });
+       return rows;
+    });
     onMounted(async () => {
-        const res =await api.get('api/actions');
-        res.data.forEach((item,index) =>
-        {
-          rows.push({index,name:item.name,desc:item.title,outputPoints:item.outputpoints,property:item.property});
-        });
+        let eventId='';
+        if(store.selectedEvent ){
+          eventId=store.selectedEvent.header!=='DELETABLE'? store.selectedEvent.eventId : store.selectedEvent.parentId;
+        }
+        const res =await api.get(`api/eventactions/${eventId}`);
+        actionData= res.data;
+        const categoryNames = Array.from(new Set(actionData.map(x=>x.categoryname)));
+        categorys.value=categoryNames;
+        tab.value = categoryNames.length>0? categoryNames[0]:'';
         isLoaded.value=true;
       });
+      // watch(props.filter,()=>{
+      //   if(props.filter && props.filter!==''){
+      //     tab.value='';
+      //   }
+      // });
+      watch(tab,()=>{
+        if(tab.value!==''){
+          emit('clearFilter','');
+        }
+      });
+      // watchEffect(()=>{
+      //   if(props.filter && props.filter!==''){
+      //     tab.value='';
+      //   }
+      //   if(tab.value!==''){
+      //     emit('update:filter','');
+      //   }
+      // });
     return {
       columns,
-      rows,
       selected: ref([]),
       pagination:ref({
         rowsPerPage:0
       }),
       isLoaded,
+      tab,
+      actionData,
+      categorys,
+      splitterModel: ref(150),
+      actionForTab
     }
   },
 
@@ -58,5 +128,6 @@ export default {
 .action-table{
   min-height: 10vh;
   max-height: 68vh;
+  min-width: 550px;
 }
 </style>

frontend/src/components/AppFieldSelectBox.vue

@@ -0,0 +1,131 @@
+<template>
+
+    <div class="q-mx-md q-mb-lg">
+        <div class="q-mb-xs q-ml-md text-primary">アプリ選択</div>
+
+        <div class="q-pa-md row" style="border: 1px solid rgba(0, 0, 0, 0.12); border-radius: 4px;">
+            <div v-if="selField?.app && !showSelectApp">{{ selField?.app?.name }}</div>
+            <q-space />
+            <div>
+                <q-btn outline dense label="選 択" padding="none sm" color="primary" @click="() => {
+                    showSelectApp = true;
+                }"></q-btn>
+            </div>
+        </div>
+    </div>
+
+    <div v-if="!showSelectApp && selField?.app?.name">
+        <div>
+            <div class="row q-mb-md">
+                <!-- <div class="col"> -->
+                <div class="q-mb-xs q-ml-md text-primary">フィールド選択</div>
+                <!-- </div> -->
+                <q-space />
+                <!-- <div class="col"> -->
+                <div class="q-mr-md">
+                    <q-input dense debounce="300" v-model="fieldFilter" placeholder="フィールド検索" clearable>
+                        <template v-slot:before>
+                            <q-icon name="search" />
+                        </template>
+                    </q-input>
+                </div>
+            </div>
+            <div class="row">
+                <field-select ref="fieldDlg" name="フィールド" :type="selectType" :updateSelectFields="updateSelectFields"
+                    :appId="selField?.app?.id" not_page :filter="fieldFilter"
+                    :selectedFields="selField.fields" :fieldTypes="fieldTypes"></field-select>
+            </div>
+        </div>
+    </div>
+    <div style="min-width: 45vw;" v-else>
+    </div>
+
+
+    <show-dialog v-model:visible="showSelectApp" name="アプリ選択">
+        <template v-slot:toolbar>
+            <q-input dense debounce="300" v-model="filter" placeholder="検索" clearable>
+                <template v-slot:before>
+                    <q-icon name="search" />
+                </template>
+            </q-input>
+        </template>
+
+        <AppSelectBox ref="appDlg" name="アプリ" type="single" :filter="filter"
+            :updateSelectApp="updateSelectApp"></AppSelectBox>
+    </show-dialog>
+</template>
+
+<script lang="ts">
+import { defineComponent, ref, watchEffect, computed, reactive } from 'vue';
+import ShowDialog from './ShowDialog.vue';
+import FieldSelect from './FieldSelect.vue';
+import AppSelectBox from './AppSelectBox.vue';
+interface IApp {
+    id: string,
+    name: string
+}
+interface IField {
+    name: string,
+    code: string,
+    type: string
+}
+
+interface IAppFields {
+    app?: IApp,
+    fields: IField[]
+}
+
+export default defineComponent({
+    inheritAttrs: false,
+    name: 'AppFieldSelectBox',
+    components: {
+        ShowDialog,
+        FieldSelect,
+        AppSelectBox,
+    },
+    props: {
+        selectedField: {
+            type: Object,
+            required: true
+        },
+        selectType: {
+            type: String,
+            default: 'single'
+        },
+        fieldTypes:{
+            type:Array,
+            default:()=>[]
+        }
+    },
+    setup(props, { emit }) {
+        const showSelectApp = ref(false);
+        const selField = reactive(props.selectedField);
+
+        const isSelected = computed(() => {
+            return selField !== null && typeof selField === 'object' && ('app' in selField)
+        });
+
+        const updateSelectApp = (newAppinfo: IApp) => {
+            selField.app = newAppinfo
+        }
+
+        const updateSelectFields = (newFields: IField[]) => {
+            selField.fields = newFields
+        }
+
+        watchEffect(() => {
+            emit('update:modelValue', selField);
+        });
+
+        return {
+            showSelectApp,
+            isSelected,
+            updateSelectApp,
+            filter: ref(),
+            updateSelectFields,
+            fieldFilter: ref(),
+            selField
+        };
+    }
+});
+</script>

frontend/src/components/AppInfo.vue

@@ -21,7 +21,7 @@
             </div>
           </template>
         </q-field>
-        <q-field  stack-label full-width  label="アプリ説明">
+        <q-field  stack-label full-width  label="アプリの説明">
           <template v-slot:control>
             <div class="self-center full-width no-outline" tabindex="0">
               {{ appinfo?.description }}

frontend/src/components/AppSelect.vue

@@ -1,100 +0,0 @@
-<template>
-  <div class="q-px-xs">
-    <div v-if="!isLoaded" class="spinner flex flex-center">
-      <q-spinner color="primary" size="3em" />
-    </div>
-    <q-table v-else class="app-table" :selection="type" row-key="id" v-model:selected="selected" flat bordered
-      virtual-scroll :columns="columns" :rows="rows" :pagination="pagination" :rows-per-page-options="[0]"
-      :filter="filter" style="max-height: 65vh;">
-      <template v-slot:body-cell-description="props">
-        <q-td :props="props">
-          <q-scroll-area class="description-cell">
-            <div v-html="props.row.description"></div>
-          </q-scroll-area>
-        </q-td>
-      </template>
-    </q-table>
-  </div>
-</template>
-<script lang="ts">
-import { ref, onMounted, reactive, watchEffect } from 'vue'
-import { api } from 'boot/axios';
-
-export default {
-  name: 'AppSelect',
-  props: {
-    name: String,
-    type: String,
-    filter: String,
-    updateExternalSelectAppInfo: {
-      type: Function
-    }
-  },
-  setup(props) {
-    const columns = [
-      { name: 'id', required: true, label: 'ID', align: 'left', field: 'id', sortable: true },
-      { name: 'name', label: 'アプリ名', field: 'name', sortable: true, align: 'left' },
-      { name: 'description', label: '概要', field: 'description', align: 'left', sortable: false },
-      { name: 'createdate', label: '作成日時', field: 'createdate', align: 'left' }
-    ]
-    const isLoaded = ref(false);
-    const rows: any[] = reactive([]);
-    const selected = ref([])
-
-    watchEffect(()=>{
-      if (selected.value && selected.value[0] && props.updateExternalSelectAppInfo) {
-        props.updateExternalSelectAppInfo(selected.value[0])
-      }
-    });
-    onMounted(() => {
-      api.get('api/v1/allapps').then(res => {
-        res.data.apps.forEach((item: any) => {
-          rows.push({
-            id: item.appId,
-            name: item.name,
-            description: item.description,
-            createdate: dateFormat(item.createdAt)
-          });
-        });
-        isLoaded.value = true;
-      });
-    });
-
-    const dateFormat = (dateStr: string) => {
-      const date = new Date(dateStr);
-      const pad = (num: number) => num.toString().padStart(2, '0');
-      const year = date.getFullYear();
-      const month = pad(date.getMonth() + 1);
-      const day = pad(date.getDate());
-      const hours = pad(date.getHours());
-      const minutes = pad(date.getMinutes());
-      const seconds = pad(date.getSeconds());
-      return `${year}/${month}/${day} ${hours}:${minutes}:${seconds}`;
-    }
-    return {
-      columns,
-      rows,
-      selected,
-      isLoaded,
-      pagination: ref({
-        rowsPerPage: 10
-      })
-    }
-  },
-
-}
-</script>
-<style lang="scss">
-.description-cell {
-  height: 60px;
-  width: 300px;
-  max-height: 60px;
-  max-width: 300px;
-  white-space: break-spaces;
-}
-
-.spinner {
-  min-height: 300px;
-  min-width: 400px;
-}
-</style>

frontend/src/components/AppSelectBox.vue

@@ -0,0 +1,76 @@
+<template>
+  <detail-field-table
+    detailField="description"
+    :name="name"
+    :type="type"
+    :filter="filter"
+    :columns="columns"
+    :fetchData="fetchApps"
+    @update:selected="(item) => { selected = item }"
+  />
+</template>
+
+<script lang="ts">
+import { ref, PropType } from 'vue';
+import { api } from 'boot/axios';
+import DetailFieldTable from './dialog/DetailFieldTable.vue';
+
+interface IAppDisplay {
+  id: string;
+  name: string;
+  description: string;
+  createdate: string;
+}
+
+export default {
+  name: 'AppSelectBox',
+  components: {
+    DetailFieldTable
+  },
+  props: {
+    name: String,
+    type: String,
+    filter: String,
+    filterInitRowsFunc: {
+      type: Function as PropType<(app: IAppDisplay) => boolean>,
+    }
+  },
+  setup(props) {
+    const selected = ref<IAppDisplay[]>([]);
+    const columns = [
+      { name: 'id', required: true, label: 'ID', align: 'left', field: 'id', sortable: true, sort: (a: string, b: string) => parseInt(a, 10) - parseInt(b, 10) },
+      { name: 'name', label: 'アプリ名', field: 'name', sortable: true, align: 'left' },
+      { name: 'description', label: '概要', field: 'description', align: 'left', sortable: false },
+      { name: 'createdate', label: '作成日時', field: 'createdate', align: 'left' }
+    ];
+
+    const fetchApps = async () => {
+      const res = await api.get('api/v1/allapps');
+      return res.data.apps.map((item: any) => ({
+        id: item.appId,
+        name: item.name,
+        description: item.description,
+        createdate: dateFormat(item.createdAt)
+      })).filter(app => !props.filterInitRowsFunc || props.filterInitRowsFunc(app));
+    };
+
+    const dateFormat = (dateStr: string) => {
+      const date = new Date(dateStr);
+      const pad = (num: number) => num.toString().padStart(2, '0');
+      const year = date.getFullYear();
+      const month = pad(date.getMonth() + 1);
+      const day = pad(date.getDate());
+      const hours = pad(date.getHours());
+      const minutes = pad(date.getMinutes());
+      const seconds = pad(date.getSeconds());
+      return `${year}/${month}/${day} ${hours}:${minutes}:${seconds}`;
+    };
+
+    return {
+      columns,
+      fetchApps,
+      selected
+    };
+  }
+};
+</script>

frontend/src/components/CascadingDropDownBox.vue

@@ -0,0 +1,271 @@
+<template>
+  <div>
+    <q-stepper v-model="step" ref="stepper" color="primary" animated flat>
+      <q-step :name="1" title="データソースの設定" icon="app_registration" :done="step > 1">
+        <div class="row justify-between items-center">
+          <div>アプリの選択 :</div>
+          <div>
+            <a v-if="data.sourceApp?.name" class="q-mr-xs"
+              :href="data.sourceApp ? `${authStore.currentDomain.kintoneUrl}/k/${data.sourceApp.id}` : ''"
+              target="_blank" title="Kiontoneへ">
+              {{ data.sourceApp?.name }}
+            </a>
+            <div v-else class="text-red">APPを選択してください</div>
+            <q-btn v-if="data.sourceApp?.name" flat color="grey" icon="clear" size="sm" padding="none"
+              @click="clearSelectedApp" />
+          </div>
+          <q-btn outline dense label="変更" padding="xs sm" color="primary" @click="showAppDialog" />
+        </div>
+
+        <!-- フィールド設定部分 -->
+        <template v-if="data.sourceApp?.name">
+          <q-separator class="q-mt-md" />
+          <div class="q-my-md row justify-between items-center">
+            データ階層を設定する :
+            <q-btn icon="add" size="sm" padding="xs" outline color="primary" @click="addRow" />
+          </div>
+          <q-virtual-scroll style="max-height: 13.5rem;" :items="data.fieldList" separator v-slot="{ item, index }">
+            <div class="row justify-between items-center q-my-md">
+              <div>{{ index + 1 }}階層 :</div>
+              <div>{{ item.source?.name }}</div>
+              <q-btn-group outline>
+                <q-btn outline dense label="変更" padding="xs sm" color="primary"
+                  @click="() => showFieldDialog(item, 'source')" />
+                <q-btn outline dense label="削除" padding="xs sm" color="primary" @click="() => delRow(index)" />
+              </q-btn-group>
+            </div>
+          </q-virtual-scroll>
+        </template>
+
+        <!-- アプリ選択ダイアログ -->
+        <ShowDialog v-model:visible="data.sourceApp.showSelectApp" name="アプリ選択" @close="closeAppDialog" min-width="50vw"
+          min-height="50vh">
+          <template v-slot:toolbar>
+            <q-input dense debounce="300" v-model="data.sourceApp.appFilter" placeholder="検索" clearable>
+              <template v-slot:before>
+                <q-icon name="search" />
+              </template>
+            </q-input>
+          </template>
+          <AppSelectBox ref="appDg" name="アプリ" type="single" :filter="data.sourceApp.appFilter" />
+        </ShowDialog>
+      </q-step>
+
+      <q-step :name="2" title="ドロップダウンフィールドの設定" icon="multiple_stop"  :done="step > 2">
+        <div class="row q-pa-sm q-col-gutter-x-sm flex-center">
+          <div class="col-grow row q-col-gutter-x-sm">
+            <div class="col-6">データソース</div>
+            <div class="col-6">ドロップダウンフィールド</div>
+          </div>
+          <div class="col-auto">
+            <div style="width: 88px; height: 1px;"></div>
+          </div>
+        </div>
+        <div v-for="(item) in data.fieldList" :key="item.id" class="row q-pa-sm q-col-gutter-x-sm flex-center">
+          <div class="col-grow row q-col-gutter-x-sm">
+
+            <div class="col-6">{{ item.source.name }}</div>
+            <div class="col-6">{{ item.dropDown?.name }}</div>
+          </div>
+          <div class="col-auto">
+            <div class="row justify-end">
+              <q-btn-group outline>
+                <q-btn outline dense label="設定" padding="xs sm" color="primary"
+                  @click="() => showFieldDialog(item, 'dropDown')" />
+                <q-btn outline dense label="クリア" padding="xs sm" color="primary"
+                  @click="() => item.dropDown = undefined" />
+              </q-btn-group>
+            </div>
+          </div>
+        </div>
+      </q-step>
+
+      <!-- ステップナビゲーション -->
+      <template v-slot:navigation>
+        <q-stepper-navigation>
+          <div class="row justify-end q-mt-md">
+            <q-btn v-if="step > 1"  flat color="primary" @click="$refs.stepper.previous()" label="戻る" class="q-ml-sm" />
+            <q-btn @click="stepperNext"  color="primary" :label="step === 2 ? '確定' : '次へ'"
+              :disable="nextBtnCheck()" />
+          </div>
+        </q-stepper-navigation>
+      </template>
+    </q-stepper>
+
+    <!-- フィールド選択ダイアログ -->
+    <template v-for="(item, index) in data.fieldList" :key="`dg${item.id}`">
+      <show-dialog v-model:visible="item.sourceDg.show" name="フィールド一覧" min-width="400px">
+        <template v-slot:toolbar>
+          <q-input dense debounce="300" v-model="item.sourceDg.filter" placeholder="検索" clearable>
+            <template v-slot:before>
+              <q-icon name="search" />
+            </template>
+          </q-input>
+        </template>
+        <FieldSelect name="フィールド" :appId="data.sourceApp.id" :selectedFields="item.source"
+          :filter="item.sourceDg.filter" :updateSelectFields="(f) => updateSelectField(f, item, index, 'source')"
+          :blackListLabel="blackListLabel" />
+      </show-dialog>
+
+      <show-dialog v-model:visible="item.dropDownDg.show" name="フィールド一覧" min-width="400px">
+        <template v-slot:toolbar>
+          <q-input dense debounce="300" v-model="item.dropDownDg.filter" placeholder="検索" clearable>
+            <template v-slot:before>
+              <q-icon name="search" />
+            </template>
+          </q-input>
+        </template>
+        <FieldSelect name="フィールド" :appId="data.dropDownApp.id" :selectedFields="item.source"
+          :filter="item.dropDownDg.filter" :updateSelectFields="(f) => updateSelectField(f, item, index, 'dropDown')"
+          :blackListLabel="blackListLabel" />
+      </show-dialog>
+    </template>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, reactive, ref, watchEffect,watch } from 'vue';
+import ShowDialog from './ShowDialog.vue';
+import AppSelectBox from './AppSelectBox.vue';
+import FieldSelect from './FieldSelect.vue';
+import { useAuthStore } from 'src/stores/useAuthStore';
+import { useFlowEditorStore } from 'src/stores/flowEditor';
+import { v4 as uuidv4 } from 'uuid';
+import { useQuasar } from 'quasar';
+
+export default defineComponent({
+  name: 'CascadingDropDownBox',
+  inheritAttrs: false,
+  components: { ShowDialog, AppSelectBox, FieldSelect },
+  props: {
+    modelValue: {
+      type: Object,
+      default: () => ({})
+    },
+    finishDialogHandler: Function,
+  },
+  emits: ['update:modelValue'],
+  setup(props, { emit }) {
+    const authStore = useAuthStore();
+    const flowStore = useFlowEditorStore();
+    const $q = useQuasar();
+    const appDg = ref();
+    const stepper = ref();
+    const step = ref(1);
+
+    const data =ref(props.modelValue);
+    // const data = ref({
+    //   sourceApp: props.modelValue.sourceApp ?? { appFilter: '', showSelectApp: false },
+    //   dropDownApp: props.modelValue.dropDownApp,
+    //   fieldList: props.modelValue.fieldList ?? [],
+    // });
+
+    // アプリ関連の関数
+    const showAppDialog = () => data.value.sourceApp.showSelectApp = true;
+
+    const clearSelectedApp = () => {
+      data.value.sourceApp = { appFilter: '', showSelectApp: false };
+      data.value.fieldList = [];
+    };
+
+    const closeAppDialog = (val: 'OK' | 'Cancel') => {
+      data.value.sourceApp.showSelectApp = false;
+      const selected = appDg.value?.selected[0];
+      if (val === 'OK' && selected) {
+        if (flowStore.appInfo?.appId === selected.id) {
+          $q.notify({
+            type: 'negative',
+            caption: "エラー",
+            message: 'データソースを現在のアプリにすることはできません。'
+          });
+        } else if (selected.id !== data.value.sourceApp.id) {
+          clearSelectedApp();
+          Object.assign(data.value.sourceApp, { id: selected.id, name: selected.name });
+        }
+      }
+    };
+
+    // フィールド関連の関数
+    const defaultRow = () => ({
+      id: uuidv4(),
+      source: undefined,
+      dropDown: undefined,
+      sourceDg: { show: false, filter: '' },
+      dropDownDg: { show: false, filter: '' },
+    });
+
+    const addRow = () => data.value.fieldList.push(defaultRow());
+    const delRow = (index: number) => data.value.fieldList.splice(index, 1);
+
+    const showFieldDialog = (item: any, keyName: string) => item[`${keyName}Dg`].show = true;
+
+    const updateSelectField = (f: any, item: any, index: number, keyName: 'source' | 'dropDown') => {
+      const [selected] = f.value;
+      const isDuplicate = data.value.fieldList.some((field, idx) =>
+        idx !== index && (field[keyName]?.code === selected.code || field[keyName]?.label === selected.label)
+      );
+
+      if (isDuplicate) {
+        $q.notify({
+          type: 'negative',
+          caption: "エラー",
+          message: '重複したフィールドは選択できません'
+        });
+      } else {
+        item[keyName] = selected;
+      }
+    };
+
+    // ステッパー関連の関数
+    const nextBtnCheck = () => {
+      const stepNo = step.value
+      if (stepNo === 1) {
+        return !(data.value.sourceApp?.id && data.value.fieldList?.length > 0 && data.value.fieldList?.every(f => f.source?.name));
+      } else if (stepNo === 2) {
+        return !data.value.fieldList?.every(f => f.dropDown?.name);
+      }
+      return true;
+    };
+
+    const stepperNext = () => {
+      if (step.value === 2) {
+        props.finishDialogHandler?.(data.value);
+      } else {
+        data.value.dropDownApp = { name: flowStore.appInfo?.name, id: flowStore.appInfo?.appId };
+        stepper.value?.next();
+      }
+    };
+
+    // // データ変更の監視
+    // watchEffect(() =>{
+    //   emit('update:modelValue', data.value);
+    // });
+
+    return {
+      // 状態と参照
+      authStore,
+      step,
+      stepper,
+      appDg,
+      data,
+      // アプリ関連の関数
+      showAppDialog,
+      closeAppDialog,
+      clearSelectedApp,
+
+      // フィールド関連の関数
+      addRow,
+      delRow,
+      showFieldDialog,
+      updateSelectField,
+
+      // ステッパー関連の関数
+      nextBtnCheck,
+      stepperNext,
+
+      // 定数
+      blackListLabel: ['レコード番号', '作業者', '更新者', '更新日時', '作成日時', '作成者', 'カテゴリー', 'ステータス'],
+    };
+  }
+});
+</script>

frontend/src/components/ConditionEditor/ConditionEditor.vue

@@ -1,5 +1,5 @@
 <template>
-  <show-dialog v-model:visible="showflg" name="条件エディタ" @close="closeDg" min-width="60vw" min-height="60vh">
+  <show-dialog v-model:visible="showflg" name="条件エディタ" @close="closeDg" min-width="50vw" min-height="60vh">
     <template v-slot:toolbar>
       <q-btn flat round dense icon="more_vert" >
       <q-menu  auto-close anchor="bottom start">
@@ -52,12 +52,12 @@ import { useQuasar } from 'quasar';
       const tree = ref(props.conditionTree);
       const closeDg = (val:string) => {
         if (val == 'OK') {
-          if(tree.value.root.children.length===0){
-            $q.notify({
-              type: 'negative',
-              message: `条件式を設定してください。`
-            });
-         }
+        //   if(tree.value.root.children.length===0){
+        //     $q.notify({
+        //       type: 'negative',
+        //       message: `条件式を設定してください。`
+        //     });
+        //  }
           context.emit("update:conditionTree",tree.value);
         }
         showflg.value=false;

frontend/src/components/ConditionEditor/ConditionObject.vue

@@ -1,96 +1,144 @@
 <template>
-  <q-field v-model="selectedObject" labelColor="primary" class="condition-object"
-          :clearable="isSelected" stack-label  :dense="true" :outlined="true" >
-    <template v-slot:control >
-      <q-chip  color="primary" text-color="white" v-if="isSelected && selectedObject.objectType==='field'" :dense="true" class="selected-obj">
-        {{ selectedObject.name }}
-      </q-chip>
-      <q-chip  color="info" text-color="white" v-if="isSelected && selectedObject.objectType==='variable'" :dense="true" class="selected-obj">
-        {{ selectedObject.name }}
-      </q-chip>
-    </template>
-   <template v-slot:append>
-    <q-icon name="search" class="cursor-pointer"  @click="showDg"/>
-    </template>
-  </q-field>
-  <show-dialog v-model:visible="show" name="条件設定項目一覧" @close="closeDg" width="600px">
-    <template v-slot:toolbar>
-        <q-input  dense debounce="200" v-model="filter" placeholder="検索" clearable>
-          <template v-slot:before>
-            <q-icon name="search" />
-          </template>
-        </q-input>
+    <q-field labelColor="primary" class="condition-object" dense outlined :label="label" :disable="disabled"
+      :clearable="isSelected">
+      <template v-slot:control>
+        <q-chip  color="primary" text-color="white" v-if="isSelected && selectedObject.objectType==='field'" :dense="true" class="selected-obj">
+          {{ selectedObject.name }}
+        </q-chip>
+        <q-chip  color="info" text-color="white" v-if="isSelected && selectedObject.objectType==='variable'" :dense="true" class="selected-obj">
+          {{ selectedObject.name.name }}
+        </q-chip>
+        <div v-if="isSelected && selectedObject.objectType==='text'">{{ selectedObject?.sharedText }}</div>
       </template>
-    <condition-objects ref="appDg" name="フィールド" type="single" :filter="filter" :appId="store.appInfo?.appId" :vars="vars"></condition-objects>
+      <template v-slot:append>
+        <q-icon name="search" class="cursor-pointer" @click="showDg" />
+      </template>
+    </q-field>
+    <show-dialog v-model:visible="show" name="設定項目" @close="closeDg" min-width="400px">
+      <!-- <template v-slot:toolbar>
+          <q-input  dense debounce="200" v-model="filter" placeholder="検索" clearable>
+            <template v-slot:before>
+              <q-icon name="search" />
+            </template>
+          </q-input>
+      </template>
+      <condition-objects ref="appDg" name="フィールド" type="single" :filter="filter" :appId="store.appInfo?.appId" :vars="vars"></condition-objects>
+    -->
+      <DynamicItemInput v-model:selectedObject="selectedObject" :canInput="config.canInput"
+        :buttonsConfig="config.buttonsConfig" :appId="store.appInfo?.appId" :options="options" ref="inputRef" />
+
   </show-dialog>
-  </template>
+</template>
 
-  <script lang="ts">
-  import { defineComponent, reactive, ref ,watchEffect,computed} from 'vue';
-  import ShowDialog from '../ShowDialog.vue';
-  import ConditionObjects from '../ConditionObjects.vue';
-  import { useFlowEditorStore } from '../../stores/flowEditor';
-  import {IActionFlow,IActionNode,IActionVariable} from '../../types/ActionTypes';
-  export default defineComponent({
-    name: 'ConditionObject',
-    components: {
-      ShowDialog,
-      ConditionObjects
+<script lang="ts">
+import { defineComponent, reactive, ref, watchEffect, computed ,PropType} from 'vue';
+import ShowDialog from '../ShowDialog.vue';
+// import ConditionObjects from '../ConditionObjects.vue';
+import DynamicItemInput from '../DynamicItemInput/DynamicItemInput.vue';
+import { useFlowEditorStore } from '../../stores/flowEditor';
+import { IActionFlow, IActionNode, IActionVariable } from '../../types/ActionTypes';
+import { IDynamicInputConfig } from 'src/types/ComponentTypes';
+
+
+export default defineComponent({
+  name: 'ConditionObject',
+  components: {
+    ShowDialog,
+    DynamicItemInput,
+    // ConditionObjects
+  },
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false
     },
-    props: {
-      modelValue: {
-        type: Object,
-        default: null
-      },
+    label: {
+      type: String,
+      default: undefined
     },
-    setup(props, { emit }) {
-      const appDg = ref();
-      const show = ref(false);
-      const selectedObject = ref(props.modelValue);
-      const store = useFlowEditorStore();
-      const isSelected = computed(()=>{
-        return selectedObject.value!==null && typeof selectedObject.value === 'object' && ('name' in selectedObject.value)
-      });
-      let vars:IActionVariable[] =[];
-      if(store.currentFlow!==undefined && store.activeNode!==undefined ){
-        vars =store.currentFlow.getVarNames(store.activeNode);
+    config: {
+      type: Object as PropType<IDynamicInputConfig>,
+      default: () => {
+        return {
+          canInput: false,
+          buttonsConfig: [
+            { label: 'フィールド', color: 'primary', type: 'FieldAdd' },
+            { label: '変数', color: 'green', type: 'VariableAdd' },
+          ]
+        };
       }
-      const filter=ref('');
-      const showDg = () => {
-        show.value = true;
-      };
+    },
 
-      const closeDg = (val:string) => {
-        if (val == 'OK') {
-          selectedObject.value = appDg.value.selected[0];
-        }
-      };
-
-      watchEffect(() => {
-        emit('update:modelValue', selectedObject.value);
-      });
-
-      return {
-        store,
-        appDg,
-        show,
-        showDg,
-        closeDg,
-        selectedObject,
-        vars:reactive(vars),
-        isSelected,
-        filter
-      };
+    options:
+    {
+      type:Array as PropType< string[]>,
+      default:()=>[]
+    },
+    modelValue: {
+      type: Object,
+      default: null
+    },
+  },
+  setup(props, { emit }) {
+    // const appDg = ref();
+    const inputRef=ref();
+    const show = ref(false);
+    const selectedObject = ref(props.modelValue);
+    const store = useFlowEditorStore();
+    // const sharedText = ref(''); // 共享的文本状态
+    const isSelected = computed(() => {
+      return selectedObject.value?.sharedText !== '';
+    });
+    // const isSelected = computed(()=>{
+    //   return selectedObject.value!==null && typeof selectedObject.value === 'object' && ('name' in selectedObject.value)
+    // });
+    let vars: IActionVariable[] = [];
+    if (store.currentFlow !== undefined && store.activeNode !== undefined) {
+      vars = store.currentFlow.getVarNames(store.activeNode);
     }
-  });
-  </script>
+    // const filter=ref('');
+    const showDg = () => {
+      show.value = true;
+    };
+
+    const closeDg = (val: string) => {
+      if (val == 'OK') {
+        // selectedObject.value = appDg.value.selected[0];
+        selectedObject.value = inputRef.value.selectedObjectRef
+      }
+    };
+
+    watchEffect(() => {
+      emit('update:modelValue', selectedObject.value);
+    });
+
+    return {
+      inputRef,
+      store,
+      // appDg,
+      show,
+      showDg,
+      closeDg,
+      selectedObject,
+      vars: reactive(vars),
+      isSelected,
+      buttonsConfig: [
+        { label: 'フィールド', color: 'primary', type: 'FieldAdd' },
+        { label: '変数', color: 'green', type: 'VariableAdd' },
+      ]
+      // filter
+    };
+  }
+});
+</script>
 <style lang="scss">
-.condition-object{
+.condition-object {
   min-width: 200px;
   max-height: 40px;
-  padding: 2px;
+  margin: 0 2px;
 }
-.selected-obj{
-  margin: 0px;
+
+.selected-obj {
+  margin: 0 2px;
 }
 </style>

frontend/src/components/ConditionEditor/NodeCondition.vue

@@ -66,18 +66,22 @@
           </div>
           <!-- condition -->
           <div @click.stop @keypress.stop v-else >
-            <div class="row no-wrap items-center">
-              <ConditionObject v-bind="prop.node" v-model="prop.node.object" class="col-4"></ConditionObject>
-              <q-select v-model="prop.node.operator" :options="operators"  class="operator" :outlined="true" :dense="true"></q-select>
-              <q-input v-if="!prop.node.object || !('options' in prop.node.object)"
+            <div class="row no-wrap items-center q-my-xs">
+              <ConditionObject v-bind="prop.node" v-model="prop.node.object" :config="leftDynamicItemConfig" class="col-4"/>
+              <q-select  v-model="prop.node.operator" :options="operators"  class="operator" :outlined="true" :dense="true"></q-select>
+              <ConditionObject v-bind="prop.node" v-model="prop.node.value" :config="rightDynamicItemConfig" class="col-4"
+              :options="objectValueOptions(prop.node?.object?.options)"
+              />
+              <!-- <ConditionObject v-bind="prop.node" v-model="prop.node.object" class="col-4"/> -->
+              <!-- <q-input v-if="!prop.node.object || !('options' in prop.node.object)"
                         v-model="prop.node.value"
-                        class="condition-value" :outlined="true" :dense="true" ></q-input>
-              <q-select v-if="prop.node.object && ('options' in prop.node.object)"
+                        class="condition-value" :outlined="true" :dense="true" ></q-input> -->
+              <!-- <q-select v-if="prop.node.object && ('options' in prop.node.object)"
                         v-model="prop.node.value"
                         :options="objectValueOptions(prop.node.object.options)"
                         clearable
                         value-key="index"
-                        class="condition-value" :outlined="true" :dense="true" ></q-select>
+                        class="condition-value" :outlined="true" :dense="true" ></q-select> -->
               <q-btn flat round dense icon="more_horiz" size="sm" >
               <q-menu  auto-close anchor="top right">
                   <q-list>
@@ -113,9 +117,10 @@ import { finished } from 'stream';
   </div>
 </template>
 <script lang="ts">
-import { defineComponent,ref,reactive, computed } from 'vue';
+import { defineComponent,ref,reactive, computed, inject } from 'vue';
 import { INode,ConditionTree,GroupNode,ConditionNode, LogicalOperator,Operator,NodeType } from '../../types/Conditions';
 import ConditionObject from './ConditionObject.vue';
+import { IDynamicInputConfig } from 'src/types/ComponentTypes';
 export default defineComponent( {
   name: 'NodeCondition',
   components: {
@@ -143,20 +148,18 @@ export default defineComponent( {
       return opts;
     });
 
-    const operators =computed(()=>{
-      const opts=[];
-      for(const op in Operator){
-        opts.push(Operator[op as keyof typeof Operator]);
-      }
-      return opts;
-    });
+    const operatorSet = inject<Array<any>>('Operator')
+    const operators = ref(operatorSet ? operatorSet : Object.values(Operator));
     const tree = reactive(props.conditionTree);
 
     const conditionString = computed(()=>{
         return tree.buildConditionString(tree.root);
     });
 
-    const objectValueOptions=(options:any):any[]=>{
+    const objectValueOptions=(options:any):any[]|null=>{
+      if(!options){
+        return null;
+      }
       const opts:any[] =[];
       Object.keys(options).forEach((key) =>
       {
@@ -223,11 +226,14 @@ export default defineComponent( {
       ticked.value=[];
     }
 
-
     const expanded=computed(()=>tree.getGroups(tree.root));
     // addCondition(tree.root);
+    const leftDynamicItemConfig = inject<IDynamicInputConfig>('leftDynamicItemConfig');
+    const rightDynamicItemConfig = inject<IDynamicInputConfig>('rightDynamicItemConfig');
 
     return {
+      leftDynamicItemConfig,
+      rightDynamicItemConfig,
       showingCondition,
       conditionString,
       tree,
@@ -257,12 +263,14 @@ export default defineComponent( {
 .condition-value{
   min-width: 200px;
   max-height: 40px;
-  padding: 2px;
+  margin: 0 2px;
 }
+
 .operator{
   min-width: 150px;
   max-height: 40px;
-  padding: 2px;
+  margin: 0 2px;
+
   text-align: center;
   font-size: 12pt;
 }

frontend/src/components/ConditionObjects.vue

@@ -19,7 +19,7 @@
 
         <q-tab-panels v-model="tab" animated>
           <q-tab-panel name="fields">
-              <field-list v-model="selected" type="single" :filter="filter" :appId="appId"></field-list>
+              <field-list v-model="selected" type="single" :filter="filter" :appId="sourceApp ? sourceApp :appId " :fields="sourceFields"></field-list>
             </q-tab-panel>
 
           <q-tab-panel name="vars" >
@@ -30,7 +30,7 @@
 </div>
 </template>
 <script lang="ts">
-import { ref, onMounted, reactive } from 'vue'
+import { ref, onMounted, reactive, inject } from 'vue'
 import FieldList from './FieldList.vue';
 import VariableList from './VariableList.vue';
 
@@ -48,10 +48,14 @@ export default {
     filter:String
   },
   setup(props) {
-
+    const selected = ref([]);
+    console.log(selected);
+    
     return {
+      sourceFields : inject('sourceFields'),
+      sourceApp : inject('sourceApp'),
       tab: ref('fields'),
-      selected: ref([])
+      selected
     }
   },
 

frontend/src/components/DocUpload.vue

@@ -5,7 +5,7 @@
         :url="uploadUrl"
         :label="title"
         :headers="headers"
-        accept=".csv,.xlsx"
+        accept=".xlsx"
         v-on:rejected="onRejected"
         v-on:uploaded="onUploadFinished"
         v-on:failed="onFailed"
@@ -15,7 +15,7 @@
 
 </template>
 <script setup lang="ts">
- import { createUploaderComponent, useQuasar } from 'quasar';
+import { createUploaderComponent, useQuasar } from 'quasar';
 import { useAuthStore } from 'src/stores/useAuthStore';
 import { ref } from 'vue';
     const $q=useQuasar();
@@ -30,7 +30,7 @@ import { ref } from 'vue';
       // https://quasar.dev/quasar-plugins/notify#Installation
       $q.notify({
         type: 'negative',
-        message: `CSVおよびExcelファイルを選択してください。`
+        message: `Excelファイルを選択してください。`
       })
     }
 
@@ -40,7 +40,7 @@ import { ref } from 'vue';
     function onUploadFinished({xhr}:{xhr:XMLHttpRequest}){
       let msg="ファイルのアップロードが完了しました。";
       if(xhr && xhr.response){
-          msg=`${msg} (${xhr.responseText})`;
+        msg=`${msg} (${xhr.responseText})`;
       }
       $q.notify({
         type: 'positive',
@@ -52,14 +52,28 @@ import { ref } from 'vue';
       }, 2000);
     }
 
+    /**
+     * 例外発生時、responseからエラー情報を取得する
+     * @param xhr
+     */
+    function getResponseError(xhr:XMLHttpRequest){
+      try{
+        const resp = JSON.parse(xhr.responseText);
+        return 'detail' in resp ? resp.detail:'';
+      }catch(err){
+        return xhr.responseText;
+      }
+    }
+
     /**
      *
      * @param info ファイルアップロード失敗時の処理
      */
-    function onFailed({files,xhr}:{files: readonly any[],xhr:any}){
+    function onFailed({files,xhr}:{files: readonly any[],xhr:XMLHttpRequest}){
       let msg ="ファイルアップロードが失敗しました。";
       if(xhr && xhr.status){
-          msg=`${msg} (${xhr.status }:${xhr.statusText})`
+         const detail = getResponseError(xhr);
+        msg=`${msg} (${xhr.status }:${detail})`
       }
       $q.notify({
         type:"negative",
@@ -74,7 +88,7 @@ import { ref } from 'vue';
 
     const headers = ref([{name:"Authorization",value:'Bearer ' + authStore.token}]);
     const props = withDefaults(defineProps<Props>(), {
-      title:"設計書から導入する(csv or excel)",
+      title:"設計書から導入する(Excel)",
       uploadUrl: `${process.env.KAB_BACKEND_URL}api/v1/createappfromexcel?format=1`
 
     });

frontend/src/components/DomainSelect.vue

@@ -1,37 +1,78 @@
 <template>
   <div class="q-pa-md">
-    <q-table :title="name+'一覧'" :selection="type" v-model:selected="selected" :columns="columns" :rows="rows" />
+    <q-table :loading="loading" :title="name+'一覧'" :selection="type" v-model:selected="selected" :columns="columns" :rows="rows">
+      <template v-slot:body-cell-name="p">
+        <q-td class="content-box flex justify-between items-center" :props="p">
+          {{ p.row.name }}
+          <q-badge v-if="!p.row.domainActive" color="grey">未启用</q-badge>
+          <q-badge v-if="p.row.id == currentDomainId" color="primary">現在</q-badge>
+        </q-td>
+      </template>
+    </q-table>
   </div>
 </template>
 <script>
-import { ref,onMounted,reactive } from 'vue'
+import { ref,onMounted,reactive, computed } from 'vue'
 import { api } from 'boot/axios';
+import { useAuthStore } from 'src/stores/useAuthStore';
 
 export default {
   name: 'DomainSelect',
   props: {
     name: String,
-    type: String
+    type: String,
+    filterInitRowsFunc: {
+      type: Function,
+    },
   },
-  setup() {
-  const columns = [
-  { name: 'id'},
-  { name: 'tenantid', required: true,label: 'テナント',align: 'left',field: 'tenantid',sortable: true},
-  { name: 'name', align: 'center', label: 'ドメイン', field: 'name', sortable: true },
-  { name: 'url', label: 'URL', field: 'url', sortable: true },
-  { name: 'kintoneuser', label: 'アカウント', field: 'kintoneuser' }
-  ]
-  const rows = reactive([])
-    onMounted( () => {
-      api.get(`api/domains/1`).then(res =>{
-         res.data.forEach((item) =>
-        {
-          rows.push({id:item.id,tenantid:item.tenantid,name:item.name,url:item.url,kintoneuser:item.kintoneuser});
-        }
-        )
-      });
+  setup(props) {
+    const authStore = useAuthStore();
+    const currentDomainId = computed(() => authStore.currentDomain.id);
+    const loading = ref(true);
+    const inactiveRowClass = (row) => row.domainActive ? '' : 'inactive-row';
+
+    const columns = [
+      { name: 'id', label: 'ID', field: 'id', align: 'left', sortable: true, classes: inactiveRowClass },
+      { name: 'name', align: 'left', label: 'ドメイン', field: 'name', sortable: true, classes: inactiveRowClass },
+      { name: 'url', label: 'URL', field: 'url',align: 'left', sortable: true, classes: inactiveRowClass },
+      { name: 'user', label: 'アカウント', field: 'user',align: 'left', classes: inactiveRowClass },
+      { name: 'owner', label: '所有者', field: row => row.owner.fullName, align: 'left', classes: inactiveRowClass },
+    ]
+    const rows = reactive([]);
+
+    onMounted(() => {
+      loading.value = true;
+      api.get(`api/domains`).then(res =>{
+         res.data.data.forEach((data) => {
+          const item = {
+            id: data.id,
+            tenantid: data.tenantid,
+            domainActive: data.is_active,
+            name: data.name,
+            url: data.url,
+            user: data.kintoneuser,
+            owner: {
+              id: data.owner.id,
+              firstName: data.owner.first_name,
+              lastName: data.owner.last_name,
+              fullNameSearch: (data.owner.last_name + data.owner.first_name).toLowerCase(),
+              fullName: data.owner.last_name + ' ' + data.owner.first_name,
+              email: data.owner.email,
+              isActive: data.owner.is_active,
+              isSuperuser: data.owner.is_superuser,
+            }
+          }
+          if (props.filterInitRowsFunc && !props.filterInitRowsFunc(item)) {
+            return;
+          }
+          rows.push(item);
+        })
+        loading.value = false;
       });
+    });
     return {
+      loading,
+      currentDomainId,
       columns,
       rows,
       selected: ref([]),
@@ -40,3 +81,11 @@ export default {
 
 }
 </script>
+<style lang="scss">
+.q-table td.inactive-row {
+  color: #aaa;
+}
+.q-table .content-box {
+  box-sizing: content-box;
+}
+</style>

frontend/src/components/DomainSelector.vue

@@ -1,18 +1,21 @@
 <template>
     <q-btn-dropdown
-      color="primay"
+      class="customized-disabled-btn"
       push
       flat
       no-caps
       icon="share"
       size="md"
       :label="userStore.currentDomain.domainName"
+      :disable-dropdown="true"
+      dropdown-icon='none'
+      :disable="true"
     >
       <q-list>
-        <q-item v-for="domain in domains" :key="domain.domainName"
+        <q-item :active="isCurrentDomain(domain)" active-class="active-domain-item" v-for="domain in domains" :key="domain.domainName"
           clickable v-close-popup @click="onItemClick(domain)">
           <q-item-section side>
-            <q-icon name="share" size="sm" color="orange" text-color="white"></q-icon>
+            <q-icon name="share" size="sm" :color="isCurrentDomain(domain) ? 'orange': ''" text-color="white"></q-icon>
           </q-item-section>
           <q-item-section>
             <q-item-label>{{domain.domainName}}</q-item-label>
@@ -24,20 +27,46 @@
 
 </template>
 <script setup lang="ts" >
-import { IDomainInfo } from 'src/types/ActionTypes';
-import { useAuthStore,IUserState } from 'stores/useAuthStore';
-import { ref } from 'vue';
+import { IDomainInfo } from 'src/types/DomainTypes';
+import { useAuthStore } from 'stores/useAuthStore';
+import { useDomainStore } from 'src/stores/useDomainStore';
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+
 const userStore = useAuthStore();
-const domains = ref<IDomainInfo[]>([]);
+const domainStore = useDomainStore();
+const route = useRoute()
+const domains = computed(() => domainStore.userDomains);
+
 (async ()=>{
-  domains.value = await userStore.getUserDomains();
+  await domainStore.loadUserDomains();
 })();
 
+const isUnclickable = computed(()=>{
+  return route.path.startsWith('/FlowChart/') || domains.value === undefined || domains.value.length === 0;
+});
+
+const isCurrentDomain=(domain:IDomainInfo)=>{
+  return domain.id === userStore.currentDomain.id;
+}
+
 const onItemClick=(domain:IDomainInfo)=>{
   console.log(domain);
   userStore.setCurrentDomain(domain);
 }
 </script>
 <style lang="scss">
+.q-btn.disabled.customized-disabled-btn {
+  opacity: 1 !important;
+  cursor: default !important;
+}
 
+.q-item.active-domain-item {
+  color: inherit;
+  background: #eee;
+}
+
+.q-btn.disabled.customized-disabled-btn * {
+  cursor: default !important;
+}
 </style>

frontend/src/components/DynamicItemInput/DynamicItemInput.vue

@@ -0,0 +1,161 @@
+<template>
+    <div class="q-mx-md" style="max-width: 600px;">
+        <!-- <q-card> -->
+        <div class="q-mb-md">
+            <q-input ref="inputRef" v-if="!optionsRef|| optionsRef.length===0"
+                outlined dense debounce="200" @update:model-value="updateSharedText"
+                v-model="sharedText" :readonly="!canInputFlag" autogrow>
+                <template v-slot:append>
+                    <q-btn flat round padding="none" icon="cancel" @click="clearSharedText" color="grey-6" />
+                </template>
+            </q-input>
+            <q-select v-if="optionsRef && optionsRef.length>0"
+                        :model-value="sharedText"
+                        :options="optionsRef"
+                        clearable
+                        value-key="index"
+                        outlined
+                        dense
+                        use-input
+                        hide-selected
+                        input-debounce="10"
+                        fill-input
+                        @input-value="setValue"
+                        @clear="sharedText=null"
+                        hide-dropdown-icon
+                        :readonly="!canInputFlag"
+                        >
+            </q-select>
+        </div>
+
+        <div class="row q-gutter-sm">
+            <q-btn v-for="button in buttonsConfig" :key="button.type" :color="button.color" @mousedown.prevent
+                @click="openDialog(button)" size="sm">
+                {{ button.label }}
+            </q-btn>
+        </div>
+
+        <show-dialog v-model:visible="dialogVisible" :name="currentDialogName" @close="closeDialog" min-width="400px">
+            <template v-slot:toolbar>
+                <q-input dense debounce="200" v-model="filter" clearable>
+                    <template v-slot:before>
+                        <q-icon name="search" />
+                    </template>
+                </q-input>
+            </template>
+            <!-- asdf -->
+            <component :is="currentComponent" @select="handleSelect" :filter="filter" :appId="appId" />
+        </show-dialog>
+        <!-- </q-card> -->
+    </div>
+</template>
+
+<script lang="ts">
+import { ref, inject, watchEffect, defineComponent,PropType } from 'vue';
+import FieldAdd from './FieldAdd.vue';
+import VariableAdd from './VariableAdd.vue';
+// import FunctionAdd from './FunctionAdd.vue';
+import ShowDialog from '../ShowDialog.vue';
+import { IButtonConfig } from 'src/types/ComponentTypes';
+
+export default defineComponent({
+    name: 'DynamicItemInput',
+    components: {
+        FieldAdd,
+        VariableAdd,
+        // FunctionAdd,
+        ShowDialog
+    },
+    props: {
+        canInput: {
+            type: Boolean,
+            default: false
+        },
+        appId: {
+            type: String,
+        },
+        selectedObject: {
+            default: {}
+        },
+        options:{
+          type:Array as PropType< string[]>
+        },
+        buttonsConfig: {
+            type: Array as PropType<IButtonConfig[]>,
+            default: () => [
+                { label: 'フィールド', color: 'primary', type: 'FieldAdd' }
+            ]
+        }
+    },
+    setup(props, { emit }) {
+        const filter = ref('');
+        const dialogVisible = ref(false);
+        const currentDialogName = ref('');
+        const selectedObjectRef = ref(props.selectedObject);
+        const currentComponent = ref('FieldAdd');
+        const sharedText = ref(props.selectedObject?.sharedText ?? '');
+        const inputRef = ref();
+        const canInputFlag = ref(props.canInput);
+        const editable = ref(false);
+
+        const openDialog = (button: IButtonConfig) => {
+            currentDialogName.value = button.label;
+            currentComponent.value = button.type;
+            dialogVisible.value = true;
+            editable.value = canInputFlag.value;
+        };
+
+        const closeDialog = () => {
+            dialogVisible.value = false;
+        };
+
+        const handleSelect = (value:any) => {
+
+            if (value && value._t && (value._t as string).length > 0) {
+              canInputFlag.value = editable.value;
+            }
+            selectedObjectRef.value={ sharedText: value._t, ...value };
+            sharedText.value = `${value._t}`;
+           // emit('update:selectedObject', { sharedText: sharedText.value, ...value });
+            dialogVisible.value = false;
+        };
+
+        const clearSharedText = () => {
+            sharedText.value = '';
+            selectedObjectRef.value={};
+            canInputFlag.value = true;
+            // emit('update:selectedObject', {});
+        }
+        const updateSharedText = (value:string) => {
+            sharedText.value = value;
+            selectedObjectRef.value= { sharedText: value,objectType:'text' }
+            // emit('update:selectedObject', { ...props.selectedObject, sharedText: value,objectType:'text' });
+        }
+        const setValue=(value:string)=>{
+          sharedText.value = value;
+          if(selectedObjectRef.value.sharedText!==value){
+            selectedObjectRef.value= { sharedText: value,objectType:'text' }
+          }
+        }
+        const optionsRef=ref(props.options);
+
+        return {
+            filter,
+            dialogVisible,
+            currentDialogName,
+            currentComponent,
+            canInputFlag,
+            openDialog,
+            closeDialog,
+            handleSelect,
+            clearSharedText,
+            updateSharedText,
+            setValue,
+            sharedText,
+            inputRef,
+            optionsRef,
+            selectedObjectRef
+        };
+    }
+});
+</script>

frontend/src/components/DynamicItemInput/FieldAdd.vue

@@ -0,0 +1,41 @@
+<template>
+    <field-list v-model="selected" type="single" :filter="filter" :appId="sourceApp ? sourceApp : appId"
+        :fields="sourceFields" @update:modelValue="handleSelect" />
+</template>
+<script lang="ts">
+import { computed, inject, ref } from 'vue';
+import FieldList from '../FieldList.vue';
+export default {
+    name: 'FieldAdd',
+    components: {
+        FieldList,
+    },
+    props: {
+        appId: Number,
+        filter: String
+    },
+    setup(props, { emit }) {
+        const sourceFields = inject<Array<unknown>>('sourceFields')
+        const sourceApp = inject<number>('sourceApp')
+        const appId = computed(() => {
+            if (sourceFields || sourceApp) {
+                return sourceApp.value
+            } else {
+                return props.appId
+            }
+        });
+        return {
+            sourceFields,
+            sourceApp,
+            selected: ref([]),
+            handleSelect: (newSelection: any[]) => {
+                
+                if (newSelection.length > 0) {
+                    const v = newSelection[0]
+                    emit('select', { _t: `field(${appId.value},${v.name})`, ...v }); // 假设您只需要选择的第一个字段的名称
+                }
+            }
+        }
+    },
+}
+</script>

frontend/src/components/DynamicItemInput/VariableAdd.vue

@@ -0,0 +1,42 @@
+<template>
+    <variable-list v-model="selected" type="single" :vars="vars" :filter="filter" @update:modelValue="handleSelect" />
+</template>
+<script lang="ts">
+import { ref } from 'vue';
+import VariableList from '../VariableList.vue';
+import { useFlowEditorStore } from 'src/stores/flowEditor';
+import { IActionVariable } from 'src/types/ActionTypes';
+export default {
+    name: 'VariableAdd',
+    components: {
+        VariableList,
+    },
+    props: {
+        appId: Number,
+        filter: String
+    },
+    setup(props, { emit }) {
+        const store = useFlowEditorStore();
+        let vars: IActionVariable[] = [];
+        console.log(store.currentFlow !== undefined && store.activeNode !== undefined);
+        
+        if (store.currentFlow !== undefined && store.activeNode !== undefined) {
+            vars = store.currentFlow.getVarNames(store.activeNode);
+        }
+        return {
+            vars,
+            selected: ref([]),
+            handleSelect: (newSelection: any[]) => {
+                if (newSelection.length > 0) {
+                    const v = newSelection[0];
+                    let name = v.name
+                    if (typeof name === 'object') {
+                        name = name.name
+                    }
+                    emit('select', { _t: `var(${name})`, ...v }); // 假设您只需要选择的第一个字段的名称
+                }
+            }
+        }
+    },
+}
+</script>

frontend/src/components/EssentialLink.vue

@@ -4,6 +4,7 @@
     tag="a"
     :target="target?target:'_blank'"
     :href="link"
+    :disable="disable"
     v-if="!isSeparator"
   >
     <q-item-section
@@ -19,6 +20,7 @@
     </q-item-section>
   </q-item>
   <q-separator
+    class="q-my-sm"
     v-if="isSeparator"
     inset
   />
@@ -32,6 +34,7 @@ export interface EssentialLinkProps {
   icon?: string;
   isSeparator?: boolean;
   target?:string;
+  disable?:boolean;
 }
 withDefaults(defineProps<EssentialLinkProps>(), {
   caption: '',

frontend/src/components/FieldList.vue

@@ -1,56 +1,67 @@
 <template>
   <div class="q-pa-md">
-    <q-table flat bordered :loading="!isLoaded" row-key="name" :selection="type"
-    :selected="modelValue"
-    @update:selected="$emit('update:modelValue', $event)"
-    :filter="filter"
-    :columns="columns" :rows="rows" />
+    <q-table flat bordered :loading="!isLoaded" row-key="name" :selection="type" :selected="modelValue"
+      @update:selected="$emit('update:modelValue', $event)"
+      :filter="filter"
+      :columns="columns"
+      :rows="rows"
+      :pagination="pagination"
+      style="max-height: 55vh;"/>
   </div>
 </template>
-<script>
-import { ref, onMounted, reactive } from 'vue'
+<script lang="ts">
+import { useAsyncState } from '@vueuse/core';
 import { api } from 'boot/axios';
+import { computed ,Prop,PropType,ref} from 'vue';
+import {IField} from 'src/types/ComponentTypes';
 
 export default {
   name: 'FieldList',
   props: {
+    fields: Array as PropType<IField[]>,
     name: String,
     type: String,
     appId: Number,
-    modelValue:Array,
-    filter:String
-   },
-   emits:[
-   'update:modelValue'
-   ],
+    modelValue: Array,
+    filter: String
+  },
+  emits: [
+    'update:modelValue'
+  ],
   setup(props) {
-    const isLoaded = ref(false);
+    // const rows = ref([]);
+    // const isLoaded = ref(false);
     const columns = [
-      { name: 'name', required: true, label: 'フィールド名', align: 'left', field: row => row.name, sortable: true },
+      { name: 'name', required: true, label: 'フィールド名', align: 'left', field: 'name', sortable: true },
       { name: 'code', label: 'フィールドコード', align: 'left', field: 'code', sortable: true },
       { name: 'type', label: 'フィールドタイプ', align: 'left', field: 'type', sortable: true }
     ]
-    const rows = reactive([]);
-    onMounted(async () => {
-      const res = await api.get('api/v1/appfields', {
-        params: {
-          app: props.appId
-        }
-      });
-      let fields = res.data.properties;
-      console.log(fields);
-      Object.keys(fields).forEach((key) => {
-        const fld = fields[key];
-        rows.push({ name: fld.label, objectType: 'field', ...fld });
-      });
-      isLoaded.value = true;
-    });
 
+    const { state : rows, isReady: isLoaded, isLoading } = useAsyncState((args) => {
+      if (props.fields && Object.keys(props.fields).length > 0) {
+        return props.fields.map(f => ({ name: f.label,  ...f ,objectType: 'field'}));
+      } else {
+        return api.get('api/v1/appfields', {
+          params: {
+            app: props.appId
+          }
+        }).then(res => {
+          const fields = res.data.properties;
+          return Object.values(fields).map((f:any) => ({ name: f.label, objectType: 'field', ...f }));
+        });
+      }
+    }, [{ name: '', objectType: '', type: '', code: '', label: '' }])
     return {
       columns,
       rows,
       // selected: ref([]),
-      isLoaded
+      isLoaded,
+      pagination: ref({
+        rowsPerPage: 25,
+        sortBy: 'name',
+        descending: false,
+        page: 1,
+      })
     }
   },
 

frontend/src/components/FieldSelect.vue

@@ -3,7 +3,7 @@
     <div v-if="!isLoaded" class="spinner flex flex-center">
       <q-spinner color="primary" size="3em" />
     </div>
-    <q-table  flat bordered v-else row-key="name" :selection="type" v-model:selected="selected" :columns="columns"
+    <q-table  flat bordered v-else row-key="id" :selection="type" v-model:selected="selected" :columns="columns"
       :rows="rows" :pagination="pageSetting" :filter="filter" style="max-height: 55vh;"/>
   </div>
 </template>
@@ -11,6 +11,7 @@
 import { ref, onMounted, reactive, watchEffect } from 'vue'
 import { api } from 'boot/axios';
 
+
 export default {
   name: 'fieldSelect',
   props: {
@@ -25,13 +26,21 @@ export default {
       default: false,
     },
     selectedFields:{
+      type:Array ,
+      default:()=>[]
+    },
+    fieldTypes:{
       type:Array,
       default:()=>[]
     },
-    updateSelects: {
+    filter: String,
+    updateSelectFields: {
       type: Function
     },
-    filter: String,
+    blackListLabel: {
+      type:Array,
+      default:()=>[]
+    }
   },
   setup(props) {
     const isLoaded = ref(false);
@@ -39,37 +48,52 @@ export default {
       { name: 'name', required: true, label: 'フィールド名', align: 'left', field: row => row.name, sortable: true },
       { name: 'code', label: 'フィールドコード', align: 'left', field: 'code', sortable: true },
       { name: 'type', label: 'フィールドタイプ', align: 'left', field: 'type', sortable: true }
-    ]
+    ];
     const pageSetting = ref({
-      sortBy: 'desc',
+      sortBy: 'name',
       descending: false,
-      page: 2,
-      rowsPerPage: props.not_page ? 0 : 5
+      page: 1,
+      rowsPerPage: props.not_page ? 0 : 25
       // rowsNumber: xx if getting data from a server
     });
     const rows = reactive([]);
-    const selected = ref(props.selectedFields && props.selectedFields.length>0?props.selectedFields:[]);
-
-    watchEffect(() => {
-        props.updateSelects(selected);
-    });
+    const selected = ref((props.selectedFields && props.selectedFields.length>0)?props.selectedFields:[]);
 
     onMounted(async () => {
-      const res = await api.get('api/v1/appfields', {
+      const url = props.fieldTypes.includes('SPACER')?'api/v1/allfields':'api/v1/appfields';
+      const res = await api.get(url, {
         params: {
           app: props.appId
         }
       });
-      let fields = res.data.properties;
-      console.log(fields);
-      Object.keys(fields).forEach((key) => {
-        const fld = fields[key];
-        // rows.push({name:fields[key].label,code:fields[key].code,type:fields[key].type});
-        rows.push({ name: fld.label, ...fld });
-      });
+      let fields = Object.values(res.data.properties);
+      for (const index in fields) {
+        const fld = fields[index]
+        if(props.blackListLabel.length > 0){
+          if(!props.blackListLabel.find(blackListItem => blackListItem === fld.label)){
+            if(props.fieldTypes.length===0 || props.fieldTypes.includes(fld.type)){
+              rows.push({id:index, name: fld.label || fld.code, ...fld });
+            }else if(props.fieldTypes.includes("lookup") && ("lookup" in fld)){
+              rows.push({id:index, name: fld.label || fld.code, ...fld });
+            }
+          }
+        } else {
+          if(props.fieldTypes.length===0 || props.fieldTypes.includes(fld.type)){
+            rows.push({id:index, name: fld.label || fld.code, ...fld });
+          }else if(props.fieldTypes.includes("lookup") && ("lookup" in fld)){
+            rows.push({id:index, name: fld.label || fld.code, ...fld });
+          }
+        }
+      }
       isLoaded.value = true;
     });
 
+    watchEffect(()=>{
+      if (selected.value && selected.value[0] && props.updateSelectFields) {
+        props.updateSelectFields(selected)
+      }
+    });
+
     return {
       columns,
       rows,

frontend/src/components/ShareDomain/ShareDomainDialog.vue

@@ -0,0 +1,191 @@
+<template>
+  <q-dialog :auto-close="false" :model-value="visible" persistent bordered>
+    <q-card class="dialog-content" >
+      <q-toolbar class="bg-grey-4">
+        <q-toolbar-title>「{{domain.name}}」のドメイン利用権限設定</q-toolbar-title>
+        <q-btn flat round dense icon="close" @click="close" />
+      </q-toolbar>
+
+      <q-card-section class="q-mx-md " >
+        <q-select
+          class="q-mt-md"
+          :disable="loading||!domain.domainActive"
+          filled
+          dense
+          v-model="canSharedUserFilter"
+          use-input
+          input-debounce="0"
+          :options="canSharedUserFilteredOptions"
+          clearable
+          :placeholder="canSharedUserFilter ? '' : domain.domainActive ? '権限を付与するユーザーを選択' : 'ドメインが無効なため、権限を付与できません'"
+          @filter="filterFn"
+          :display-value="canSharedUserFilter?`${canSharedUserFilter.fullName} （${canSharedUserFilter.email}）`:''">
+
+          <template v-slot:after>
+            <q-btn :disable="!canSharedUserFilter" :loading="addLoading" label="付与" color="primary" @click="shareTo(canSharedUserFilter as IUserDisplay)" />
+          </template>
+
+          <template v-slot:option="scope">
+            <q-item v-bind="scope.itemProps">
+              <q-item-section avatar>{{scope.opt.id}}</q-item-section>
+              <q-item-section>{{scope.opt.fullName}}</q-item-section>
+              <q-item-section>{{scope.opt.email}}</q-item-section>
+            </q-item>
+          </template>
+        </q-select>
+        <sharing-user-list class="q-mt-md" style="height: 330px" :users="sharedUsers" :loading="loading" title="ドメイン利用権限を持つユーザー">
+          <template v-slot:actions="{ row }">
+            <q-btn title="解除" flat color="primary" padding="xs" size="1em" :loading="row.id == removingUser?.id" icon="person_off" @click="removeShareTo(row)" />
+          </template>
+        </sharing-user-list>
+      </q-card-section>
+
+      <q-card-actions align="right" class="text-primary">
+        <q-btn flat label="確定" @click="close" />
+        <q-btn flat label="キャンセル" @click="close" />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, watch, onMounted } from 'vue';
+import { IDomainOwnerDisplay } from '../../types/DomainTypes';
+import { IUser, IUserDisplay } from '../../types/UserTypes';
+import { api } from 'boot/axios';
+import SharingUserList from 'components/ShareDomain/SharingUserList.vue';
+
+interface Props {
+  modelValue: boolean;
+  domain: IDomainOwnerDisplay;
+}
+
+const props = defineProps<Props>();
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: boolean): void;
+  (e: 'close'): void;
+}>();
+
+const addLoading = ref(false);
+const removingUser = ref<IUserDisplay>();
+const loading = ref(true);
+const visible = ref(props.modelValue);
+
+const allUsers = ref<IUserDisplay[]>([]);
+const sharedUsers = ref<IUserDisplay[]>([]);
+const sharedUsersIdSet = new Set<number>();
+
+const canSharedUsers = ref<IUserDisplay[]>([]);
+const canSharedUserFilter = ref<IUserDisplay>();
+const canSharedUserFilteredOptions = ref<IUserDisplay[]>([]);
+
+const filterFn = (val:string, update: (cb: () => void) => void) => {
+  update(() => {
+    if (val === '') {
+      canSharedUserFilteredOptions.value = canSharedUsers.value;
+      return;
+    }
+    const needle = val.toLowerCase();
+    canSharedUserFilteredOptions.value = canSharedUsers.value.filter(v =>
+      v.email.toLowerCase().indexOf(needle) > -1 || v.fullNameSearch.toLowerCase().indexOf(needle) > -1);
+  })
+}
+
+watch(
+  () => props.modelValue,
+  async (newValue) => {
+    visible.value = newValue;
+    sharedUsers.value = [];
+    canSharedUserFilter.value = undefined
+    if (newValue) {
+      await loadShared();
+    }
+  }
+);
+
+watch(
+  () => visible.value,
+  (newValue) => {
+    emit('update:modelValue', newValue);
+  }
+);
+
+const close = () => {
+  emit('close');
+};
+
+const shareTo = async (user: IUserDisplay) => {
+  addLoading.value = true;
+  loading.value = true;
+  await api.post(`api/domain/${user.id}?domainid=${props.domain.id}`)
+  await loadShared();
+  canSharedUserFilter.value = undefined;
+  loading.value = false;
+  addLoading.value = false;
+}
+
+const removeShareTo = async (user: IUserDisplay) => {
+  removingUser.value = user;
+  loading.value = true;
+  await api.delete(`api/domain/${props.domain.id}/${user.id}`)
+  await loadShared();
+  loading.value = false;
+  removingUser.value = undefined;
+};
+
+const loadShared = async () => {
+  loading.value = true;
+  sharedUsersIdSet.clear();
+
+  const { data } = await api.get(`/api/domainshareduser/${props.domain.id}`);
+  sharedUsers.value = data.data.map((item: IUser) => {
+    const val = itemToDisplay(item);
+    sharedUsersIdSet.add(val.id);
+    return val;
+  });
+
+  canSharedUsers.value = allUsers.value.filter((item) => !sharedUsersIdSet.has(item.id));
+  canSharedUserFilteredOptions.value = canSharedUsers.value;
+
+  loading.value = false;
+}
+
+onMounted(async () => {
+  await getUsers();
+})
+
+const getUsers = async () => {
+  if (Object.keys(allUsers.value).length > 0) {
+    return;
+  }
+  loading.value = true;
+  const result = await api.get(`api/v1/users`);
+  allUsers.value = result.data.data.map(itemToDisplay);
+  loading.value = false;
+}
+
+const itemToDisplay = (item: IUser) => {
+  return {
+    id: item.id,
+    firstName: item.first_name,
+    lastName: item.last_name,
+    fullNameSearch: (item.last_name + item.first_name).toLowerCase(),
+    fullName: item.last_name + ' ' + item.first_name,
+    email: item.email,
+    isSuperuser: item.is_superuser,
+    isActive: item.is_active,
+  } as IUserDisplay
+}
+</script>
+
+<style lang="scss">
+.dialog-content {
+  width: 60vw;
+  max-height: 80vh;
+  .q-select {
+    min-width: 0 !important;
+  }
+}
+
+</style>

frontend/src/components/ShareDomain/SharingUserList.vue

@@ -0,0 +1,45 @@
+<template>
+  <q-table :rows="users" :filter="filter" dense :columns="columns" row-key="id" :loading="loading" :pagination="pagination">
+    <template v-slot:top>
+      <div class="h6 text-weight-bold">{{props.title}}</div>
+      <q-space />
+      <q-input borderless dense filled debounce="300" v-model="filter" placeholder="検索">
+        <template v-slot:append>
+          <q-icon name="search" />
+        </template>
+      </q-input>
+    </template>
+
+    <template v-slot:body-cell-actions="props">
+      <q-td :props="props">
+        <slot name="actions" :row="props.row"></slot>
+      </q-td>
+    </template>
+  </q-table>
+</template>
+<script setup lang="ts">
+import { ref, PropType } from 'vue';
+import { IUserDisplay } from '../../types/UserTypes';
+
+const props = defineProps({
+  users: {
+    type: Array as PropType<IUserDisplay[]>,
+    required: true,
+  },
+  loading: {
+    type: Boolean,
+    default: false,
+  },
+  title: String
+});
+
+const columns = [
+  { name: 'id', label: 'ID', field: 'id', align: 'left', sortable: true },
+  { name: 'fullName', label: '名前', field: 'fullName', align: 'left', sortable: true },
+  { name: 'email', label: '電子メール', field: 'email', align: 'left', sortable: true },
+  { name: 'actions', label: '', field: 'actions', sortable: false },
+];
+
+const filter = ref('');
+const pagination = ref({ sortBy: 'id', descending: true, rowsPerPage: 10 });
+</script>

frontend/src/components/ShowDialog.vue

@@ -1,22 +1,19 @@
 <template>
   <!-- <div class="q-pa-md q-gutter-sm" > -->
     <q-dialog :model-value="visible" persistent bordered >
-      <q-card :style="cardStyle"  style=" min-width: 40vw; max-width: 80vw; max-height: 95vh;">
+      <q-card class="" style="min-width: 40vw; max-width: 80vw; max-height: 95vh;" :style="cardStyle">
         <q-toolbar class="bg-grey-4">
           <q-toolbar-title>{{ name }}</q-toolbar-title>
-          <q-space></q-space>
+          <q-space v-if="$slots.toolbar"></q-space>
           <slot name="toolbar"></slot>
           <q-btn flat round dense icon="close" @click="CloseDialogue('Cancel')" />
         </q-toolbar>
-        <q-card-section>
-          <!-- <div class="text-h6">{{ name }}</div> -->
-        </q-card-section>
-        <q-card-section class="q-pt-none" :style="sectionStyle">
+        <q-card-section class="q-mt-md" :style="sectionStyle">
          <slot></slot>
         </q-card-section>
-        <q-card-actions align="right" class="text-primary q-mt-lg">
-          <q-btn flat label="確定" v-close-popup @click="CloseDialogue('OK')" />
-          <q-btn flat label="キャンセル" v-close-popup @click="CloseDialogue('Cancel')" />
+        <q-card-actions v-if="!disableBtn" align="right" class="text-primary">
+          <q-btn flat label="確定" :loading="okBtnLoading" :v-close-popup="okBtnAutoClose" @click="CloseDialogue('OK')" />
+          <q-btn flat label="キャンセル" :disable="okBtnLoading" v-close-popup @click="CloseDialogue('Cancel')" />
         </q-card-actions>
       </q-card>
     </q-dialog>
@@ -32,10 +29,20 @@ export default {
     width:String,
     height:String,
     minWidth:String,
-    minHeight:String
+    minHeight:String,
+    okBtnLoading:Boolean,
+    okBtnAutoClose:{
+      type: Boolean,
+      default: true
+    },
+    disableBtn:{
+      type: Boolean,
+      default: false
+    }
   },
   emits: [
-    'close'
+    'close',
+    'update:visible'
   ],
   setup(props, context) {
     const CloseDialogue = (val) => {

frontend/src/components/TableActionMenu.vue

@@ -0,0 +1,65 @@
+<template>
+  <q-btn flat padding="xs" round size="1em" icon="more_vert" class="action-menu">
+    <q-menu>
+      <q-list dense :style="'min-width:' + minWidth ">
+        <template v-for="(item, index) in actions" :key="index" >
+          <q-item v-if="isAction(item)" :class="item.class" clickable v-close-popup @click="item.action(row)">
+            <q-item-section side style="color: inherit;">
+              <q-icon size="1.2em" :name="item.icon" />
+            </q-item-section>
+            <q-item-section>{{ item.label }}</q-item-section>
+          </q-item>
+          <q-separator v-else />
+        </template>
+      </q-list>
+    </q-menu>
+  </q-btn>
+</template>
+
+<script lang="ts">
+import { PropType } from 'vue';
+import { IDomainOwnerDisplay } from '../types/DomainTypes';
+
+interface Action {
+  label: string;
+  icon?: string;
+  action: (row: any) => void|Promise<void>;
+  class?: string;
+}
+interface Separator {
+  separator: boolean;
+}
+type MenuItem = Action | Separator;
+
+export default {
+  name: 'TableActionMenu',
+  props: {
+    row: {
+      type: Object as PropType<IDomainOwnerDisplay>,
+      required: true
+    },
+    minWidth: {
+      type: String,
+      default: '100px'
+    },
+    actions: {
+      type: Array as PropType<MenuItem[]>,
+      required: true
+    }
+  },
+  methods: {
+    isAction(item: MenuItem): item is Action {
+      return !('separator' in item);
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.q-table tr > td:last-child .action-menu {
+  opacity: 0.25;
+}
+
+.q-table tr:hover > td:last-child .action-menu {
+  opacity: 1;
+}
+</style>

frontend/src/components/UserDomain/DomainCard.vue

@@ -0,0 +1,69 @@
+<template>
+  <q-card :class="['domain-card', item.id == activeId ? 'default': '']">
+    <q-card-section>
+      <div class="row  no-wrap">
+        <div class="col">
+          <div class="text-h6 ellipsis">{{ item.name }}</div>
+          <div class="text-subtitle2">{{ item.url }}</div>
+        </div>
+        <div v-if="!isOwnerFunc(item.owner.id)" class="col-auto">
+          <!-- <q-badge color="secondary" text-color="white" align="middle" class="q-mb-xs" label="他人の所有" /> -->
+          <q-chip square color="secondary" text-color="white" icon="people" label="他人の所有" size="sm" />
+        </div>
+
+      </div>
+    </q-card-section>
+    <q-card-section>
+      <div class="row items-center no-wrap">
+        <div class="col">
+          <div class="text-grey-7 text-caption text-weight-medium">
+            アカウント
+          </div>
+          <div class="smaller-font-size">{{ item.user }}</div>
+        </div>
+        <div class="col-auto">
+          <div class="text-grey-7 text-caption text-weight-medium">
+            所有者
+          </div>
+          <div class="smaller-font-size">{{ item.owner.fullName }}</div>
+        </div>
+      </div>
+    </q-card-section>
+    <q-separator v-if="$slots.actions" />
+    <slot name="actions" :item="item"></slot>
+  </q-card>
+</template>
+
+<script setup lang="ts">
+import { defineProps, computed } from 'vue';
+import { IDomainOwnerDisplay } from 'src/types/DomainTypes';
+import { useAuthStore } from 'stores/useAuthStore';
+
+const props = defineProps<{
+  item: IDomainOwnerDisplay;
+  activeId: number;
+}>();
+
+const authStore = useAuthStore();
+const isOwnerFunc = computed(() => (ownerId: string) => {
+  return ownerId == authStore.userId;
+});
+
+</script>
+
+<style lang="scss" scoped>
+.domain-card.default {
+  box-shadow: 0 6px 6px -3px rgba(0, 0, 0, 0.2),
+              0 10px 14px 1px rgba(0, 0, 0, 0.14),
+              0 4px 18px 3px rgba(0, 0, 0, 0.12),
+              inset 0 0 0px 2px #1976D2;
+}
+.domain-card {
+  width: 22rem;
+  word-break: break-word;
+
+  .smaller-font-size {
+    font-size: 13px;
+  }
+}
+</style>

frontend/src/components/UserList.vue

@@ -0,0 +1,36 @@
+<template>
+    <q-table :rows="rows" :columns="columns" row-key="id" :filter="props.filter" :loading="loading"
+    :pagination="pagination" selection="single" v-model:selected="selected"></q-table>
+    
+</template>
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { api } from 'boot/axios';
+const props = defineProps<{filter:string}>()
+const columns = [
+  { name: 'id', label: 'ID', field: 'id', align: 'left', sortable: true },
+  { name: 'lastName', label: '氏名', field: 'lastName', align: 'left', sortable: true },
+  { name: 'firstName', label: '苗字', field: 'firstName', align: 'left', sortable: true },
+  { name: 'email', label: '電子メール', field: 'email', align: 'left', sortable: true },
+];
+
+const pagination = ref({ sortBy: 'id', descending: true, rowsPerPage: 10 });
+const rows = ref([]);
+const loading = ref(false);
+const selected = ref([]);
+defineExpose({
+  selected
+})
+const getUsers = async (filter = () => true) => {
+  loading.value = true;
+  const result = await api.get(`api/v1/users`);
+  rows.value = result.data.data.map((item) => {
+    return { id: item.id, firstName: item.first_name, lastName: item.last_name, email: item.email, isSuperuser: item.is_superuser, isActive: item.is_active }
+  }).filter(filter);
+  loading.value = false;
+}
+
+onMounted(async () => {
+  await getUsers();
+})
+</script>

frontend/src/components/VariableList.vue

@@ -1,43 +1,60 @@
 <template>
   <div class="q-pa-md">
-    <q-table flat bordered row-key="name" :selection="type"
-    :selected="modelValue"
-    @update:selected="$emit('update:modelValue', $event)"
-    :columns="columns" :rows="rows" />
+    <q-table flat bordered row-key="id" :selection="type" :selected="modelValue" :filter="filter"
+      @update:selected="$emit('update:modelValue', $event)" :columns="columns" :rows="rows" />
   </div>
 </template>
 <script lang="ts">
-import { ref, reactive, PropType, compile } from 'vue';
-import {IActionNode,IActionVariable} from '../types/ActionTypes';
+import { PropType, reactive } from 'vue';
+import { IActionVariable } from '../types/ActionTypes';
+import { v4 as uuidv4 } from 'uuid';
 
 export default {
   name: 'VariableList',
   props: {
     name: String,
     type: String,
-    vars:{
-      type:Array as PropType<IActionVariable[]>,
-      reqired:true,
-      default:()=>[]
+    vars: {
+      type: Array as PropType<IActionVariable[]>,
+      reqired: true,
+      default: () => []
     },
-    modelValue:Array
+    modelValue: Array,
+    filter: String
   },
-  emits:[
-   'update:modelValue'
-   ],
+  emits: [
+    'update:modelValue'
+  ],
   setup(props) {
-     const columns= [
-    { name: 'actionName', label: 'アクション名',align: 'left',field: 'actionName',sortable: true},
-    { name: 'displayName', label: '変数表示名', align: 'left',field: 'displayName', sortable: true },
-    { name: 'name', label: '変数名', align: 'left',field: 'name',required: true, sortable: true }
+    const variableName = (field) => {
+      const name = field.name;
+      return name.name;
+    }
+    const columns = [
+      { name: 'actionName', label: 'アクション名', align: 'left', field: 'actionName', sortable: true },
+      { name: 'displayName', label: '変数表示名', align: 'left', field: 'displayName', sortable: true },
+      { name: 'name', label: '変数名', align: 'left', field: variableName, required: true, sortable: true }
     ];
-    const rows= props.vars.map((v)=>{
-      return {objectType:'variable',...v};
+
+    const rows = props.vars.flatMap((v) => {
+      if (v.name.vars && v.name.vars.length > 0) {
+        return v.name.vars
+          .filter(o => o.vName && o.logicalOperator && o.field)
+          .map(o => ({
+            id: uuidv4(),
+            objectType: 'variable',
+            name: { name: `${v.name.name}.${o.vName}` },
+            actionName: v.name.actionName,
+            displayName: v.name.displayName
+          }));
+      } else {
+        return [{ objectType: 'variable', ...v }];
+      }
     });
 
     return {
       columns,
-      rows:reactive(rows)
+      rows: reactive(rows)
     }
   }
 }

frontend/src/components/dialog/DetailFieldTable.vue

@@ -0,0 +1,88 @@
+<template>
+  <div class="q-px-xs">
+    <div v-if="!isLoaded" class="spinner flex flex-center">
+      <q-spinner color="primary" size="3em" />
+    </div>
+    <q-table v-else class="app-table" :selection="type" row-key="id" v-model:selected="selected" flat bordered
+      virtual-scroll :columns="columns" :rows="rows" :pagination="pagination" :rows-per-page-options="[0]"
+      :filter="filter" style="max-height: 65vh;" @update:selected="emitSelected">
+      <template v-slot:[`body-cell-${detailField}`]="props">
+        <q-td :props="props">
+          <q-scroll-area class="description-cell">
+            <div v-html="props.row[detailField]"></div>
+          </q-scroll-area>
+        </q-td>
+      </template>
+    </q-table>
+  </div>
+</template>
+
+<script lang="ts">
+import { ref, onMounted, reactive, PropType } from 'vue'
+
+interface IRow {
+  [key: string]: any;
+}
+
+export default {
+  name: 'DetailFieldTable',
+  props: {
+    name: String,
+    type: String,
+    filter: String,
+    detailField: {
+      type: String,
+      required: true
+    },
+    columns: {
+      type: Array as PropType<any[]>,
+      required: true
+    },
+    fetchData: {
+      type: Function as PropType<() => Promise<IRow[]>>,
+      required: true
+    }
+  },
+  emits: ['update:selected'],
+  setup(props, { emit }) {
+    const isLoaded = ref(false);
+    const rows = reactive<IRow[]>([]);
+    const selected = ref([]);
+
+    onMounted(async () => {
+      const data = await props.fetchData();
+      rows.push(...data);
+      isLoaded.value = true;
+    });
+
+    const emitSelected = (selectedItems: any[]) => {
+      emit('update:selected', selectedItems);
+    };
+
+    return {
+      rows,
+      selected,
+      isLoaded,
+      pagination: ref({
+        rowsPerPage: 10
+      }),
+      emitSelected
+    };
+  }
+};
+</script>
+
+<style lang="scss">
+.description-cell {
+  height: 60px;
+  width: 300px;
+  max-height: 60px;
+  max-width: 300px;
+  white-space: break-spaces;
+}
+
+.spinner {
+  min-height: 300px;
+  min-width: 400px;
+}
+</style>

frontend/src/components/dialog/VersionHistory.vue

@@ -0,0 +1,82 @@
+<template>
+  <detail-field-table
+    detailField="comment"
+    type="single"
+    :columns="columns"
+    :fetchData="fetchVersionHistory"
+    @update:selected="(item) => { selected = item }"
+  />
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, ref, watch } from 'vue';
+import { IAppDisplay, IAppVersion } from 'src/types/AppTypes';
+import { date } from 'quasar';
+import { api } from 'boot/axios';
+import DetailFieldTable from './DetailFieldTable.vue';
+import { IUser, IUserDisplay } from 'src/types/UserTypes';
+
+export default defineComponent({
+  name: 'VersionHistory',
+  components: {
+    DetailFieldTable
+  },
+  props: {
+    app: {
+      type: Object as PropType<IAppDisplay>,
+      required: true,
+    },
+  },
+  setup(props, { emit }) {
+    const selected = ref<IAppVersion[]>([]);
+
+    const columns = [
+      { name: 'version', label: 'ID', field: 'version', align: 'left', sortable: true },
+      { name: 'name', label: 'バージョン名', field: 'name', align: 'left', sortable: true },
+      { name: 'comment', label: 'コメント', field: 'comment', align: 'left', sortable: true },
+      { name: 'creator', label: '作成者', field: (row: IAppVersion) => row.creator.fullName, align: 'left', sortable: true },
+      { name: 'createTime', label: '作成日時', field: 'createTime', align: 'left', sortable: true },
+      { name: 'updater', label: '更新者', field: (row: IAppVersion) => row.updater.fullName, align: 'left', sortable: true },
+      { name: 'updateTime', label: '更新日時', field: 'updateTime', align: 'left', sortable: true },
+    ];
+
+    const formatDate = (dateStr: string) => {
+      return date.formatDate(dateStr, 'YYYY/MM/DD HH:mm:ss');
+    };
+
+    const toUserDisaplay = (user: IUser) => {
+      return {
+        id: user.id,
+        firstName: user.first_name,
+        lastName: user.last_name,
+        fullNameSearch: (user.last_name + user.first_name).toLowerCase(),
+        fullName: user.last_name + ' ' + user.first_name,
+        email: user.email,
+        isActive: user.is_active,
+        isSuperuser: user.is_superuser,
+      }
+    }
+
+    const fetchVersionHistory = async () => {
+      const { data } = await api.get(`api/apps/${props.app.id}/versions`);
+      return data.data.map((item: any) => ({
+        id: item.id,
+        version: item.version,
+        appid: item.appid,
+        name: item.name,
+        comment: item.comment,
+        updater: toUserDisaplay(item.updateuser),
+        updateTime: formatDate(item.updatetime),
+        creator: toUserDisaplay(item.createuser),
+        createTime: formatDate(item.createtime),
+      } as IAppVersion));
+    };
+
+    return {
+      fetchVersionHistory,
+      columns,
+      selected
+    };
+  },
+});
+</script>

frontend/src/components/dialog/VersionInput.vue

@@ -0,0 +1,42 @@
+<template>
+  <q-input
+    v-model="versionInfo.name"
+    filled
+    autofocus
+    label="バージョン名"
+    :rules="[(val) => !val || val.length <= 30 || '30字以内で入力ください']"
+  />
+  <q-input
+    v-model="versionInfo.desc"
+    filled
+    type="textarea"
+    :rules="[(val) => !val || val.length <= 80 || '80字以内で入力ください']"
+    label="説明"
+  />
+</template>
+<script setup lang="ts">
+import { ref, watch, defineProps, defineEmits } from 'vue';
+import { QInput } from 'quasar';
+import { IVersionInfo } from 'src/types/AppTypes';
+
+const props = defineProps<{
+  modelValue: IVersionInfo;
+}>();
+
+const defaultTitle = `${new Date().toLocaleString()}`;
+
+const versionInfo = ref({
+  ...props.modelValue,
+  name: props.modelValue.name || defaultTitle,
+ });
+
+const emit = defineEmits(['update:modelValue']);
+
+watch(
+  versionInfo,
+  () => {
+    emit('update:modelValue', { ...versionInfo.value });
+  },
+  { immediate: true, deep: true }
+);
+</script>

frontend/src/components/left/AppSelector.vue

@@ -30,7 +30,7 @@
           </template>
         </q-input>
       </template>
-      <AppSelect ref="appDg" name="アプリ" type="single" :filter="filter"></AppSelect>
+      <AppSelectBox ref="appDg" name="アプリ" type="single" :filter="filter"></AppSelectBox>
   </ShowDialog>
 </template>
 
@@ -38,7 +38,7 @@
 import { defineComponent,ref } from 'vue';
 import {AppInfo} from '../../types/ActionTypes'
 import ShowDialog from '../../components/ShowDialog.vue';
-import AppSelect from '../../components/AppSelect.vue';
+import AppSelectBox from '../../components/AppSelectBox.vue';
 import { useFlowEditorStore } from 'stores/flowEditor';
 import { useAuthStore } from 'src/stores/useAuthStore';
 export default defineComponent({
@@ -47,7 +47,7 @@ export default defineComponent({
     "appSelected"
   ],
   components:{
-    AppSelect,
+    AppSelectBox,
     ShowDialog
   },
   setup(props, context) {

frontend/src/components/left/EventTree.vue

@@ -1,48 +1,47 @@
 <template>
   <!-- <div class="q-pa-md q-gutter-sm"> -->
-    <q-tree
-      :nodes="store.eventTree.screens"
-      node-key="eventId"
-      children-key="events"
-      no-connectors
-      v-model:expanded="store.expandedScreen"
-      :dense="true"
-      :ref="tree"
-    >
-      <template v-slot:header-EVENT="prop">
-        <div class="row col items-start no-wrap event-node" @click="onSelected(prop.node)">
-          <q-icon v-if="prop.node.eventId"
-                  name="play_circle"
-                  :color="prop.node.hasFlow?'green':'grey'"
-                  size="16px" class="q-mr-sm">
-                  </q-icon>
-          <div class="no-wrap" :class="selectedEvent && prop.node.eventId===selectedEvent.eventId?'selected-node':''">{{ prop.node.label }}</div>
+  <q-tree :nodes="store.eventTree.screens" node-key="eventId" children-key="events" no-connectors
+    v-model:expanded="store.expandedScreen" :dense="true" :ref="tree">
+    <template v-slot:header-EVENT="prop">
+      <div :ref="prop.node.eventId" class="row col items-center no-wrap event-node" @click="onSelected(prop.node)">
+        <q-icon v-if="prop.node.eventId" name="play_circle" :color="prop.node.hasFlow ? 'green' : 'grey'" size="16px"
+          class="q-mr-sm">
+        </q-icon>
+        <div class="no-wrap" :class="getSelectedClass(prop.node)">{{ prop.node.label }}</div>
+        <q-space></q-space>
+        <!-- <q-icon v-if="prop.node.hasFlow" name="delete" color="negative" size="16px" class="q-mr-sm"></q-icon> -->
+      </div>
+    </template>
+    <template v-slot:header-CHANGE="prop">
+      <div class="row col items-start no-wrap event-node">
+        <div class="no-wrap" :class="getSelectedClass(prop.node)">{{ prop.node.label }}</div>
+        <q-space></q-space>
+        <q-icon name="add_circle" color="primary" size="16px" class="q-mr-sm"
+          @click="addChangeEvent(prop.node)"></q-icon>
+      </div>
+    </template>
+    <template v-slot:header-DELETABLE="prop">
+      <div class="row col items-start event-node" @click="onSelected(prop.node)">
+          <q-icon v-if="prop.node.eventId" name="play_circle" :color="prop.node.hasFlow ? 'green' : 'grey'" size="16px" class="q-mr-sm" />
+          <div class="no-wrap" :class="getSelectedClass(prop.node)">{{ prop.node.label }}</div>
           <q-space></q-space>
-          <!-- <q-icon v-if="prop.node.hasFlow" name="delete" color="negative" size="16px" class="q-mr-sm"></q-icon> -->
-        </div>
-      </template>
-      <template v-slot:header-CHANGE="prop" >
-        <div class="row col items-start no-wrap event-node" >
-          <div class="no-wrap">{{ prop.node.label }}</div>
-          <q-space></q-space>
-          <q-icon name="add_circle" color="primary" size="16px" class="q-mr-sm" @click="addChangeEvent(prop.node)"></q-icon>
-        </div>
-      </template>
-    </q-tree>
-    <show-dialog v-model:visible="showDialog" name="フィールド選択" @close="closeDg" widht="400px">
-      <field-select ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></field-select>
-    </show-dialog>
+          <q-icon  name="delete_forever"  color="negative" size="16px" @click="deleteEvent(prop.node)"></q-icon>
+      </div>
+    </template>
+  </q-tree>
+  <show-dialog v-model:visible="showDialog" name="フィールド選択" @close="closeDg">
+    <field-select ref="appDg" name="フィールド" type="single" :fieldTypes="fieldTypes" :appId="store.appInfo?.appId"></field-select>
+  </show-dialog>
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, ref } from 'vue';
-import { IKintoneEvent ,IKintoneEventGroup, IKintoneEventNode, kintoneEvent} from '../../types/KintoneEvents';
-import { storeToRefs } from 'pinia';
+import { QTree, useQuasar } from 'quasar';
+import { ActionFlow, RootAction } from 'src/types/ActionTypes';
 import { useFlowEditorStore } from 'stores/flowEditor';
-import { ActionFlow, ActionNode, RootAction } from 'src/types/ActionTypes';
-import ShowDialog from '../ShowDialog.vue';
+import { defineComponent, ref, watchEffect } from 'vue';
+import { IKintoneEvent, IKintoneEventGroup, IKintoneEventNode, kintoneEvent } from '../../types/KintoneEvents';
 import FieldSelect from '../FieldSelect.vue';
-import { QTree } from 'quasar';
+import ShowDialog from '../ShowDialog.vue';
 export default defineComponent({
   name: 'EventTree',
   components: {
@@ -50,71 +49,110 @@ export default defineComponent({
     FieldSelect,
   },
   setup(props, context) {
+    const $q = useQuasar();
     const appDg = ref();
     const store = useFlowEditorStore();
     const showDialog = ref(false);
     const tree = ref<QTree>();
+    const fieldTypes=[
+    'RADIO_BUTTON',
+    'DROP_DOWN',
+    'CHECK_BOX',
+    'MULTI_SELECT',
+    'USER_SELECT',
+    'GROUP_SELECT',
+    'ORGANIZATION_SELECT',
+    'DATE',
+    'DATETIME',
+    'TIME',
+    'SINGLE_LINE_TEXT',
+    'NUMBER'];
     // const eventTree=ref(kintoneEvents);
     // const selectedFlow = store.currentFlow;
 
     // const expanded=ref();
-    const selectedEvent = ref<IKintoneEvent|null>(null);
-    const selectedChangeEvent=ref<IKintoneEventGroup|null>(null);
-    const isFieldChange = (node:IKintoneEventNode)=>{
-      return node.header=='EVENT' && node.eventId.indexOf(".change.")>-1;
+    const selectedEvent = ref<IKintoneEvent | undefined>(store.selectedEvent);
+    const selectedChangeEvent = ref<IKintoneEventGroup | undefined>(undefined);
+    const isFieldChange = (node: IKintoneEventNode) => {
+      return node.header == 'EVENT' && node.eventId.indexOf(".change.") > -1;
     }
+
+    const getSelectedClass = (node: IKintoneEventNode) => {
+      return store.selectedEvent && node.eventId === store.selectedEvent.eventId ? 'selected-node' : '';
+    };
+
     //フィールド値変更イベント追加
-    const closeDg = (val:string) => {
+    const closeDg = (val: string) => {
       if (val == 'OK') {
-        if(!selectedChangeEvent.value){return;}
+        if (!selectedChangeEvent.value) { return; }
         const field = appDg.value.selected[0];
         const eventid = `${selectedChangeEvent.value.eventId}.${field.code}`;
-        if(store.eventTree.findEventById(eventid)){
+        if (store.eventTree.findEventById(eventid)) {
           return;
         }
-        selectedChangeEvent.value?.events.push(
-          new kintoneEvent(
-            field.label,
-            eventid,
-            selectedChangeEvent.value.eventId)
-        );
+        selectedChangeEvent.value?.events.push(new kintoneEvent(
+           field.name,
+           eventid,
+           selectedChangeEvent.value.eventId,
+          'DELETABLE'
+        ));
         tree.value?.expanded?.push(selectedChangeEvent.value.eventId);
         tree.value?.expandAll();
       }
     };
-    const addChangeEvent=(node:IKintoneEventGroup)=>{
-      if(store.appInfo===undefined){
-          return;
+    const addChangeEvent = (node: IKintoneEventGroup) => {
+      if (store.appInfo === undefined) {
+        return;
       }
-      selectedChangeEvent.value=node;
-      showDialog.value=true;
+      selectedChangeEvent.value = node;
+      showDialog.value = true;
     }
-    const onSelected=(node:IKintoneEvent)=>{
-        if(!node.eventId){
-          return;
-        }
-        selectedEvent.value=node;
-        if(store.appInfo===undefined){
-          return;
-        }
-        const screen = store.eventTree.findEventById(node.parentId);
-        let flow =store.findFlowByEventId(node.eventId);
-        let screenName=screen!==null?screen.label:"";
-        let nodeLabel = node.label;
-        // if(isFieldChange(node)){
-        //   screenName=nodeLabel;
-        //   nodeLabel=`${node.label}の値を変更したとき`;
-        // }
-        if(flow!==undefined && flow!==null ){
-          store.selectFlow(flow);
-        }else{
-          const root = new RootAction(node.eventId,screenName,nodeLabel)
-            const flow =new ActionFlow(root);
-            store.flows?.push(flow);
-            store.selectFlow(flow);
-            selectedEvent.value.flowData=flow;
-        }
+
+    const deleteEvent = (node: IKintoneEvent) => {
+      if (!node.eventId) {
+        return;
+      }
+      store.deleteEvent(node);
+      store.selectFlow(undefined)
+
+      $q.notify({
+        type: 'positive',
+        caption: "通知",
+        message: `イベント ${node.label} 削除`
+      })
+    }
+
+    const onSelected = (node: IKintoneEvent) => {
+      if (!node.eventId) {
+        return;
+      }
+      selectedEvent.value = node;
+      if (store.appInfo === undefined) {
+        return;
+      }
+      const screen = store.eventTree.findEventById(node.parentId);
+
+      let flow = store.findFlowByEventId(node.eventId);
+      let screenName = screen !== null ? screen.label : '';
+      let nodeLabel = node.label;
+      // if(isFieldChange(node)){
+      //   screenName=nodeLabel;
+      //   nodeLabel=`${node.label}の値を変更したとき`;
+      // }
+
+      if (flow !== undefined && flow !== null) {
+        store.selectFlow(flow);
+      } else {
+        const root = new RootAction(node.eventId, screenName, nodeLabel)
+        const flow = new ActionFlow(root);
+        store.flows?.push(flow);
+        store.selectFlow(flow);
+        selectedEvent.value.flowData = flow;
+      }
     };
+    watchEffect(()=>{
+       store.setCurrentEvent(selectedEvent.value);
+    });
     return {
       // eventTree,
       // expanded,
@@ -122,30 +160,38 @@ export default defineComponent({
       tree,
       showDialog,
       isFieldChange,
+      getSelectedClass,
       onSelected,
       selectedEvent,
       addChangeEvent,
+      deleteEvent,
       closeDg,
-      store
+      store,
+      fieldTypes
     }
   }
 });
 </script>
 <style lang="scss">
-.nowrap{
-  flex-wrap:nowarp;
-  text-wrap:nowarp;
+.nowrap {
+  flex-wrap: nowarp;
+  text-wrap: nowarp;
 }
-.event-node{
-  cursor:pointer;
+
+.event-node {
+  cursor: pointer;
 }
-.selected-node{
+
+.selected-node {
   color: $primary;
   font-weight: bolder;
 }
-.event-node:hover{
+
+.event-node:hover {
   background-color: $light-blue-1;
 }
 
+.delete-btn {
+  margin-right: 5px;
+}
 </style>
-

frontend/src/components/main/NodeItem.vue

@@ -205,7 +205,7 @@ export default defineComponent({
      */
     const varName =(node:IActionNode)=>{
       const prop = node.actionProps.find((prop) => prop.props.name === "verName");
-      return prop?.props.modelValue;
+      return prop?.props.modelValue.name;
     };
     const copyFlow=()=>{
       context.emit('copyFlow', props.actionNode);

frontend/src/components/main/domainTable.vue

@@ -0,0 +1,33 @@
+<template>
+  <q-table :rows="rows" :columns="columns" row-key="id" :filter="filter" :loading="loading" :pagination="pagination">
+
+    <template v-slot:top>
+      <q-btn color="primary" :disable="loading" label="新規" @click="addRow" />
+      <q-space />
+      <q-input borderless dense filled debounce="300" v-model="filter" placeholder="検索">
+        <template v-slot:append>
+          <q-icon name="search" />
+        </template>
+      </q-input>
+    </template>
+
+    <template v-slot:body-cell-name="p">
+      <q-td class="flex justify-between items-center" :props="p">
+        {{ p.row.name }}
+        <q-badge v-if="!p.row.domainActive" color="grey">未启用</q-badge>
+        <q-badge v-if="p.row.id == currendDomainId" color="primary">現在</q-badge>
+      </q-td>
+    </template>
+
+    <template v-slot:body-cell-actions="p">
+      <q-td :props="p">
+        <q-btn-group flat>
+          <q-btn flat color="primary" padding="xs" size="1em" icon="edit_note" @click="editRow(p.row)" />
+          <q-btn flat color="negative" padding="xs" size="1em" icon="delete_outline" @click="removeRow(p.row)" />
+        </q-btn-group>
+      </q-td>
+    </template>
+
+  </q-table>
+</template>
+

frontend/src/components/right/AppFieldSelect.vue

@@ -1,235 +1,165 @@
 <template>
-    <div class="q-my-md" v-bind="$attrs">
-        <q-card flat>
-            <q-card-section class="q-pa-none q-my-sm q-mr-md">
-                <!-- <div class=" q-my-none ">App Field Select</div> -->
-                <div class="row q-mb-xs">
-                    <div class="text-primary q-mb-xs text-caption">{{ $props.displayName }}</div>
-                </div>
-                <div class="row">
-                    <div class="col">
-                        <div class="q-mb-xs">{{ selectedField.app?.name || '未選択' }}</div>
-                    </div>
-                    <div class="col-1">
-                        <q-btn round flat size="sm" color="primary" icon="search" @click="showDg" />
-                    </div>
-                </div>
-            </q-card-section>
-            <q-separator />
-            <q-card-section class="q-pa-none q-ma-none">
-                <div style="">
-                    <div v-if="selectedField.fields && selectedField.fields.length > 0 ">
-                      <q-list bordered>
-                        <q-virtual-scroll style="max-height: 160px;" :items="selectedField.fields" separator v-slot="{ item, index }">
-                            <q-item :key="index" dense clickable >
-                                <q-item-section>
-                                    <q-item-label>
-                                        {{ item.label }}
-                                    </q-item-label>
-                                </q-item-section>
-                                <q-item-section side>
-                                    <q-btn round flat size="sm" icon="clear" @click="removeField(index)" />
-                                </q-item-section>
-                            </q-item>
-                        </q-virtual-scroll>
-                      </q-list>
-                    </div>
-                    <!-- <div v-else class="row q-mt-lg">
-                    </div> -->
-                </div>
-                <!-- <q-separator /> -->
-            </q-card-section>
-            <q-card-section class="q-px-none q-py-xs" v-if="selectedField.fields && selectedField.fields.length===0">
-                <div class="row">
-                    <div class="text-grey text-caption"> {{ $props.placeholder }}</div>
-                    <!-- <q-btn flat color="grey" label="clear" @click="clear" /> -->
-                </div>
-            </q-card-section>
-        </q-card>
-     </div>
-
-    <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeFieldDialog" ref="fieldDlg">
-
-        <div class="q-mx-md q-mb-lg">
-            <div class="q-mb-xs q-ml-md text-primary">アプリ選択</div>
-
-            <div class="q-pa-md row" style="border: 1px solid rgba(0, 0, 0, 0.12); border-radius: 4px;">
-                <div v-if="!showSelectApp && selectedField.app">{{ selectedField.app?.name }}</div>
-                <q-space />
-                <div>
-                    <q-btn outline dense label="選 択" padding="none sm" color="primary" @click="() => {
-                        showSelectApp = true;
-                    }"></q-btn>
-                </div>
-            </div>
-        </div>
-
-        <div v-if="!showSelectApp && selectedField.app?.name">
-            <div>
-                <div class="row q-mb-md">
-                    <!-- <div class="col"> -->
-                    <div class="q-mb-xs q-ml-md text-primary">フィールド選択</div>
-                    <!-- </div> -->
-                    <q-space />
-                    <!-- <div class="col"> -->
-                    <div class="q-mr-md">
-                      <q-input dense debounce="300" v-model="fieldFilter" placeholder="フィールド検索" clearable>
-                          <template v-slot:before>
-                              <q-icon name="search" />
-                          </template>
-                      </q-input>
-                    </div>
-                </div>
-                <div class="row">
-                    <field-select ref="fieldDlg" name="フィールド" :type="selectType" :updateSelects="updateItems"
-                        :appId="selectedField.app?.id" not_page :filter="fieldFilter" :selectedFields="selectedField.fields"></field-select>
-                </div>
-            </div>
-        </div>
-        <div style="min-width: 45vw;" v-else>
-        </div>
-
-    </show-dialog>
-
-    <show-dialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeAppDlg">
-        <template v-slot:toolbar>
-            <q-input dense debounce="300" v-model="filter" placeholder="検索" clearable>
-                <template v-slot:before>
-                    <q-icon name="search" />
-                </template>
-            </q-input>
-        </template>
-
-        <AppSelect ref="appDlg" name="アプリ" type="single" :filter="filter"
-            :updateExternalSelectAppInfo="updateExternalSelectAppInfo"></AppSelect>
+  <div class="q-my-md" v-bind="$attrs">
+    <q-field v-model="selectedField" :label="displayName" labelColor="primary" :clearable="isSelected" stack-label
+      :rules="rulesExp" lazy-rules="ondemand" @clear="clear" ref="fieldRef">
+      <template v-slot:control>
+        {{ isSelected ? selectedField.app?.name : "(未選択)" }}
+      </template>
+      <template v-slot:hint v-if="!isSelected">
+        {{ placeholder }}
+      </template>
+      <template v-slot:append>
+        <q-icon name="search" class="cursor-pointer" color="primary" @click="showDg" />
+      </template>
+    </q-field>
+    <div v-if="selectedField.fields && selectedField.fields.length > 0">
+      <q-list bordered>
+        <q-virtual-scroll style="max-height: 160px;" :items="selectedField.fields" separator v-slot="{ item, index }">
+          <q-item :key="index" dense clickable>
+            <q-item-section>
+              <q-item-label>
+                {{ item.label }}
+              </q-item-label>
+            </q-item-section>
+            <q-item-section side>
+              <q-btn round flat size="sm" icon="clear" @click="removeField(index)" />
+            </q-item-section>
+          </q-item>
+        </q-virtual-scroll>
+      </q-list>
+    </div>
+    <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeAFBox">
+      <AppFieldSelectBox v-model:selectedField="selectedField" :selectType="selectType" ref="afBox"
+        :fieldTypes="fieldTypes" />
     </show-dialog>
+  </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, watchEffect, computed } from 'vue';
+import { computed, defineComponent, ref, watchEffect } from 'vue';
+import AppFieldSelectBox from '../AppFieldSelectBox.vue';
 import ShowDialog from '../ShowDialog.vue';
-import FieldSelect from '../FieldSelect.vue';
 import { useFlowEditorStore } from 'stores/flowEditor';
-import AppSelect from '../AppSelect.vue';
-interface IApp{
-  id:string,
-  name:string
+
+export interface IApp {
+  id: string,
+  name: string
 }
-interface IField {
-    name: string,
-    code: string,
-    type: string
+export interface IField {
+  name: string,
+  code: string,
+  type: string,
+  label?: string
 }
 
-interface IAppFields{
-   app?:IApp,
-   fields:IField[]
+export interface IAppFields {
+  app?: IApp,
+  fields: IField[]
 }
 
 export default defineComponent({
-    inheritAttrs:false,
-    name: 'FieldInput',
-    components: {
-        ShowDialog,
-        FieldSelect,
-        AppSelect,
+  inheritAttrs: false,
+  name: 'AppFieldSelect2',
+  components: {
+    ShowDialog,
+    AppFieldSelectBox
+  },
+  props: {
+    displayName: {
+      type: String,
+      default: '',
     },
-    props: {
-        displayName: {
-            type: String,
-            default: '',
-        },
-        name: {
-            type: String,
-            default: '',
-        },
-        placeholder: {
-            type: String,
-            default: '',
-        },
-        modelValue: {
-            type: Object,
-            default: null
-        },
-        selectType:{
-            type:String,
-            default:'single'
-        }
+    name: {
+      type: String,
+      default: '',
     },
-    setup(props, { emit }) {
-        const appDlg = ref();
-        const fieldDlg = ref();
-        const show = ref(false);
-        const showSelectApp = ref(false);
-       const selectedField = ref<IAppFields>({
-          app:undefined,
-          fields:[]
-       });
-       if(props.modelValue && "app" in props.modelValue && "fields" in props.modelValue){
-         selectedField.value=props.modelValue as IAppFields;
-       }
-        const store = useFlowEditorStore();
-
-        const isSelected = computed(() => {
-            return selectedField.value !== null && typeof selectedField.value === 'object' && ('app' in selectedField.value)
-        });
-
-        const showDg = () => {
-            show.value = true;
-        };
-
-        const clear = () => {
-            selectedField.value ={
-              fields:[]
-            } ;
-        }
-
-        const closeAppDlg = (val: string) => {
-            if (val == 'OK') {
-                selectedField.value.app = appDlg.value.selected[0];
-                selectedField.value.fields=[];
-                showSelectApp.value=false;
-            }
-        };
-
-        const closeFieldDialog=(val:string)=>{
-          if (val == 'OK') {
-                selectedField.value.fields = fieldDlg.value.selected;
-            }
-        };
-        const updateExternalSelectAppInfo = (newAppinfo:IApp) => {
-          // selectedField.value.app = newAppinfo
-        }
-
-        const updateItems = (newFields:IField[]) => {
-          // selectedField.value.fields = newFields
-        }
-
-        const removeField=(index:number)=>{
-          selectedField.value.fields.splice(index,1);
-        }
-        watchEffect(() => {
-            emit('update:modelValue', selectedField.value);
-        });
-
-        return {
-            store,
-            appDlg,
-            fieldDlg,
-            show,
-            showDg,
-            closeAppDlg,
-            closeFieldDialog,
-            selectedField,
-            showSelectApp,
-            isSelected,
-            updateExternalSelectAppInfo,
-            filter: ref(),
-            updateItems,
-            clear,
-            fieldFilter: ref(),
-            removeField
-        };
+    placeholder: {
+      type: String,
+      default: '',
+    },
+    modelValue: {
+      type: Object,
+      default: null
+    },
+    selectType: {
+      type: String,
+      default: 'single'
+    },
+    fieldTypes: {
+      type: Array,
+      default: () => []
+    },
+    //例：[val=>!!val ||'入力してください']
+    rules: {
+      type: String,
+      default: undefined
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    requiredMessage: {
+      type: String,
+      default: ''
     }
+  },
+  setup(props, { emit }) {
+    const show = ref(false);
+    const afBox = ref();
+    const fieldRef = ref();
+    const selectedField = ref<IAppFields>({
+      app: undefined,
+      fields: []
+    });
+    if (props.modelValue && 'app' in props.modelValue && 'fields' in props.modelValue) {
+      selectedField.value = props.modelValue as IAppFields;
+    }
+    const store = useFlowEditorStore();
+
+    const clear = () => {
+      selectedField.value = {
+        fields: []
+      };
+    }
+
+    const removeField = (index: number) => {
+      selectedField.value.fields.splice(index, 1);
+    }
+
+    const closeAFBox = (val: string) => {
+      if (val == 'OK') {
+        console.log(afBox.value);
+        selectedField.value = afBox.value.selField;
+        fieldRef.value.validate();
+      }
+    };
+
+    const isSelected = computed(() => {
+      return !!selectedField.value.app
+    });
+
+    const customExp = props.rules === undefined ? [] : eval(props.rules);
+    const errmsg = props.requiredMessage?props.requiredMessage:`${props.displayName}が必須です。`;
+    const requiredExp = props.required ? [((val: any) => (val && val.app && val.fields && val.fields.length > 0) || errmsg)] : [];
+    const rulesExp = [...requiredExp, ...customExp];
+
+    watchEffect(() => {
+      emit('update:modelValue', selectedField.value);
+    });
+
+    return {
+      store,
+      afBox,
+      show,
+      showDg: () => { show.value = true },
+      selectedField,
+      clear,
+      removeField,
+      closeAFBox,
+      isSelected,
+      rulesExp,
+      fieldRef
+    };
+  }
 });
 </script>

frontend/src/components/right/AppSelect.vue

@@ -0,0 +1,112 @@
+<template>
+    <div v-bind="$attrs">
+        <q-field :label="displayName" labelColor="primary" stack-label
+        :rules="rulesExp"
+        lazy-rules="ondemand"
+        v-model="selectedApp"
+        ref="fieldRef">
+            <template v-slot:control>
+                <q-card flat class="full-width">
+                    <q-card-actions vertical>
+                        <q-btn color="grey-3" text-color="black" @click="() => { dgIsShow = true }">アプリ選択</q-btn>
+                    </q-card-actions>
+                    <q-card-section class="text-caption">
+                        <div v-if="selectedApp.app.name">
+                            {{ selectedApp.app.name }}
+                        </div>
+                        <div v-else>{{ placeholder }}</div>
+                    </q-card-section>
+                </q-card>
+            </template>
+        </q-field>
+    </div>
+
+    <ShowDialog v-model:visible="dgIsShow" name="アプリ選択" @close="closeDg" min-width="50vw" min-height="50vh">
+        <template v-slot:toolbar>
+            <q-input dense debounce="300" v-model="filter" placeholder="検索" clearable>
+                <template v-slot:before>
+                    <q-icon name="search" />
+                </template>
+            </q-input>
+        </template>
+        <AppSelectBox ref="appDg" name="アプリ" type="single" :filter="filter"></AppSelectBox>
+    </ShowDialog>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, reactive, ref, watchEffect } from 'vue';
+import ShowDialog from '../ShowDialog.vue';
+import AppSelectBox from '../AppSelectBox.vue';
+
+
+export default defineComponent({
+    inheritAttrs: false,
+    name: 'AppSelect',
+    components: {
+        ShowDialog,
+        AppSelectBox
+    },
+    props: {
+        displayName: {
+            type: String,
+            default: '',
+        },
+        name: {
+            type: String,
+            default: '',
+        },
+        placeholder: {
+            type: String,
+            default: '',
+        },
+        modelValue: {
+            type: Object,
+            default: null
+        },
+        //例：[val=>!!val ||'入力してください']
+        rules: {
+          type: String,
+          default: undefined
+        },
+        required: {
+          type: Boolean,
+          default: false
+        },
+        requiredMessage: {
+          type: String,
+          default: ''
+        }
+    },
+    setup(props, { emit }) {
+        const appDg = ref();
+        const fieldRef=ref();
+        const dgIsShow = ref(false)
+        const selectedApp = props.modelValue && props.modelValue.app ? props.modelValue : reactive({app:{}});
+        const closeDg = (state: string) => {
+            dgIsShow.value = false;
+            if (state == 'OK') {
+                selectedApp.app = appDg.value.selected[0];
+                fieldRef.value.validate();
+            }
+        };
+        //ルール設定
+        const customExp = props.rules === undefined ? [] : eval(props.rules);
+        const errmsg = props.requiredMessage?props.requiredMessage:`${props.displayName}を選択してください。`;
+        const requiredExp = props.required ? [((val: any) => (!!val && !!val.app && !!val.app.name) || errmsg)] : [];
+        const rulesExp = [...requiredExp, ...customExp];
+        watchEffect(() => {
+            emit('update:modelValue', selectedApp);
+        });
+
+        return {
+            filter: ref(''),
+            dgIsShow,
+            appDg,
+            fieldRef,
+            closeDg,
+            selectedApp,
+            rulesExp
+        };
+    }
+});
+</script>

frontend/src/components/right/CascadingDropDown.vue

@@ -0,0 +1,133 @@
+<template>
+  <div v-bind="$attrs">
+    <q-field :label="displayName" labelColor="primary" stack-label lazy-rules="ondemand" ref="fieldRef">
+      <template v-slot:control>
+        <q-card flat class="full-width">
+          <q-card-actions vertical>
+            <q-btn color="grey-3" text-color="black" @click="() => { dgIsShow = true }">クリックで設定</q-btn>
+          </q-card-actions>
+          <q-card-section class="text-caption">
+            <div v-if="data.dropDownApp?.name">
+              {{ `${data.sourceApp?.name} -> ${data.dropDownApp?.name}` }}
+            </div>
+            <div v-else>{{ placeholder }}</div>
+          </q-card-section>
+        </q-card>
+      </template>
+    </q-field>
+  </div>
+
+  <ShowDialog v-model:visible="dgIsShow" name="ドロップダウン階層化設定" @close="closeDg" min-width="50vw" min-height="20vh" disableBtn>
+    <template v-slot:toolbar>
+      <q-btn flat round dense icon="more_vert" >
+      <q-menu  auto-close anchor="bottom start">
+        <q-list>
+          <q-item clickable @click="copySetting()">
+            <q-item-section avatar><q-icon name="content_copy" ></q-icon></q-item-section>
+            <q-item-section >コピー</q-item-section>
+          </q-item>
+          <q-item clickable @click="pasteSetting()">
+            <q-item-section avatar><q-icon name="content_paste" ></q-icon></q-item-section>
+            <q-item-section >貼り付け</q-item-section>
+          </q-item>
+        </q-list>
+      </q-menu>
+      </q-btn>
+    </template>
+    <div class="q-mb-md q-ml-md q-mr-md">
+      <CascadingDropDownBox v-model:model-value="data" :finishDialogHandler="finishDialogHandler" />
+    </div>
+  </ShowDialog>
+</template>
+
+<script lang="ts">
+import { defineComponent, ref, watchEffect } from 'vue';
+import ShowDialog from '../ShowDialog.vue';
+import CascadingDropDownBox from '../CascadingDropDownBox.vue';
+
+export default defineComponent({
+  inheritAttrs: false,
+  name: 'CascadingDropDown',
+  components: {
+    ShowDialog,
+    CascadingDropDownBox
+  },
+  props: {
+    displayName: {
+      type: String,
+      default: '',
+    },
+    placeholder: {
+      type: String,
+      default: '',
+    },
+    modelValue: {
+      type: Object,
+      default: () => { ({}) }
+    },
+  },
+  setup(props, { emit }) {
+    const dgIsShow = ref(false);
+    // const data = ref(props.modelValue);
+    const data = ref({
+      sourceApp: props.modelValue.sourceApp ?? { appFilter: '', showSelectApp: false },
+      dropDownApp: props.modelValue.dropDownApp,
+      fieldList: props.modelValue.fieldList ?? [],
+    });
+    const closeDg = (state: string) => {
+      dgIsShow.value = false;
+    };
+
+    const finishDialogHandler = (boxData) => {
+      data.value = boxData
+      dgIsShow.value = false
+      emit('update:modelValue', data.value);
+    }
+
+     //設定をコピーする
+     const copySetting=()=>{
+        if (navigator.clipboard) {
+          const jsonData= JSON.stringify(data.value);
+          navigator.clipboard.writeText(jsonData).then(() => {
+              console.log('Text successfully copied to clipboard');
+          },
+          (err) => {
+            console.error('Error in copying text: ', err);
+          });
+        } else {
+          console.log('Clipboard API not available');
+        }
+      };
+      //設定を貼り付ける
+      const pasteSetting=async ()=>{
+        try {
+          const text = await navigator.clipboard.readText();
+          console.log('Text from clipboard:', text);
+          const jsonData=JSON.parse(text);
+          if('sourceApp' in jsonData && 'dropDownApp' in jsonData && 'fieldList' in jsonData){
+            const {sourceApp,dropDownApp, fieldList}=jsonData;
+            data.value.sourceApp=sourceApp;
+            data.value.dropDownApp=dropDownApp;
+            data.value.fieldList=fieldList;
+          }
+        } catch (err) {
+          console.error('Failed to read text from clipboard: ', err);
+          throw err;
+        }
+      }
+
+    // watchEffect(() => {
+    //   emit('update:modelValue', data.value);
+    // });
+
+    return {
+      dgIsShow,
+      closeDg,
+      data,
+      finishDialogHandler,
+      copySetting,
+      pasteSetting
+    };
+  }
+});
+</script>

frontend/src/components/right/ColorPicker.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="" v-bind="$attrs">
-        <q-field v-model="color" :label="displayName" labelColor="primary"  :clearable="isSelected" stack-label :bottom-slots="!isSelected" >
+        <q-field v-model="color" :label="displayName" labelColor="primary"  :clearable="isSelected" stack-label :bottom-slots="!isSelected" :rules="rulesExp">
             <template v-slot:control>
                 <q-chip text-color="black" color="white" v-if="isSelected">
                     <div class="row">
@@ -57,17 +57,34 @@ export default defineComponent({
             type: String,
             default: null
         },
+        //例：[val=>!!val ||'入力してください']
+        rules: {
+          type: String,
+          default: undefined
+        },
+        required:{
+          type:Boolean,
+          default:false
+        },
+        requiredMessage: {
+          type: String,
+          default: ''
+        }
     },
-
     setup(props, { emit }) {
         const color = ref(props.modelValue??"");
         const isSelected = computed(()=>props.modelValue && props.modelValue!=="");
+        const customExp = props.rules === undefined ? [] : eval(props.rules);
+        const errmsg = props.requiredMessage?props.requiredMessage:`${props.displayName}が必須です。`;
+        const requiredExp = props.required?[((val:any)=>!!val || errmsg ),"anyColor"]:[];
+        const rulesExp=[...requiredExp,...customExp];
         watchEffect(()=>{
           emit('update:modelValue', color.value);
         });
         return {
             color,
-            isSelected
+            isSelected,
+            rulesExp
         };
     }
 });

frontend/src/components/right/ConditionInput.vue

@@ -1,12 +1,13 @@
 <template>
   <div v-bind="$attrs">
-    <q-field v-model="tree" :label="displayName" labelColor="primary" stack-label >
-      <template v-slot:control >
+    <q-field v-model="tree" :label="displayName" labelColor="primary" stack-label>
+      <template v-slot:control>
         <q-card flat class="full-width">
           <q-card-actions vertical>
-            <q-btn color="grey-3" text-color="black" @click="showDg()">クリックで設定：{{ isSetted?'設定済み':'未設定' }}</q-btn>
+            <q-btn color="grey-3" text-color="black" :disable="btnDisable" @click="showDg()">クリックで設定：{{ isSetted ?
+              '設定済み' : '未設定' }}</q-btn>
           </q-card-actions>
-          <q-card-section class="text-caption" >
+          <q-card-section class="text-caption">
             <div v-if="!isSetted">{{ placeholder }}</div>
             <div v-else>{{ conditionString }}</div>
           </q-card-section>
@@ -17,82 +18,157 @@
   </div>
 </template>
 
-  <script lang="ts">
-  import { defineComponent, ref ,watchEffect,computed,reactive} from 'vue';
-  import { ConditionTree,GroupNode,ConditionNode,LogicalOperator,Operator } from 'app/src/types/Conditions';
-  import ConditionEditor from '../ConditionEditor/ConditionEditor.vue'
-  export default defineComponent({
-    name: 'FieldInput',
-    inheritAttrs:false,
-    components: {
-      ConditionEditor
-    },
-    props: {
-      displayName:{
-        type: String,
-        default: '',
-      },
-      name:{
-        type: String,
-        default: '',
-      },
-      placeholder: {
-        type: String,
-        default: '',
-      },
-      hint:{
-        type: String,
-        default: '',
-      },
-      modelValue: {
-        type: String,
-        default: null
-      },
-    },
+<script lang="ts">
+import { ConditionNode, ConditionTree, Operator, OperatorListItem } from 'app/src/types/Conditions';
+import { computed, defineComponent, provide, reactive, ref, watchEffect } from 'vue';
+import ConditionEditor from '../ConditionEditor/ConditionEditor.vue';
+import { IActionProperty } from 'src/types/ActionTypes';
 
-    setup(props, { emit }) {
-      const appDg = ref();
-      const show = ref(false);
-      const tree = reactive(new ConditionTree());
-      if(props.modelValue && props.modelValue!==''){
-        tree.fromJson(props.modelValue);
-      }else{
-        const newNode = new ConditionNode({},Operator.Equal,'',tree.root);
-        tree.addNode(tree.root,newNode);
+export default defineComponent({
+  name: 'FieldInput',
+  inheritAttrs: false,
+  components: {
+    ConditionEditor
+  },
+  props: {
+    context: {
+      type: Array<IActionProperty>,
+      default: '',
+    },
+    displayName: {
+      type: String,
+      default: '',
+    },
+    name: {
+      type: String,
+      default: '',
+    },
+    placeholder: {
+      type: String,
+      default: '',
+    },
+    hint: {
+      type: String,
+      default: '',
+    },
+    modelValue: {
+      type: String,
+      default: null
+    },
+    sourceType: {
+      type: String,
+      default: 'field'
+    },
+    connectProps:{
+      type:Object,
+      default:()=>({})
+    },
+    onlySourceSelect: {
+      type: Boolean,
+      default: false
+    },
+    operatorList: {
+      type: Array,
+    },
+    inputConfig: {
+      type: Object,
+      default: () => ({
+        left: {
+          canInput: false,
+          buttonsConfig: [
+            { label: 'フィールド', color: 'primary', type: 'FieldAdd' },
+            { label: '変数', color: 'green', type: 'VariableAdd' },
+          ]
+        },
+        right: {
+          canInput: true,
+          buttonsConfig: [
+            { label: '変数', color: 'green', type: 'VariableAdd' },
+          ]
+        },
+      })
+    }
+  },
+
+  setup(props, { emit }) {
+    let source = reactive(props.connectProps["source"]);
+    if(!source){
+      source = props.context.find(element => element.props.name === 'sources');
+    }
+
+    if (source) {
+      if (props.sourceType === 'field') {
+        provide('sourceFields', computed(() => source.props?.modelValue?.fields ?? []));
+      } else if (props.sourceType === 'app') {
+        provide('sourceApp', computed(() => source.props?.modelValue?.app?.id));
+      }
+    }
+
+    provide('leftDynamicItemConfig', props.inputConfig.left);
+    provide('rightDynamicItemConfig', props.inputConfig.right);
+    provide('Operator', props.operatorList);
+
+    const btnDisable = computed(() => {
+      const onlySourceSelect = props.onlySourceSelect;
+
+      if (!onlySourceSelect) {
+        return false;
       }
 
-      const isSetted=ref(props.modelValue && props.modelValue!=='');
+      if (props.sourceType === 'field') {
+        return source?.props?.modelValue?.fields?.length ?? 0 > 0;
+      } else if (props.sourceType === 'app') {
+        return source?.props?.modelValue?.app?.id ? false : true
+      }
+      return true;
+    })
 
-      const conditionString = computed(()=>{
-          return tree.buildConditionString(tree.root);
-      });
+    const appDg = ref();
+    const show = ref(false);
+    const tree = reactive(new ConditionTree());
+    if (props.modelValue && props.modelValue !== '') {
+      tree.fromJson(props.modelValue);
+    } else {
+      const newNode = new ConditionNode({}, (props.operatorList && props.operatorList.length > 0) ? props.operatorList[0] as OperatorListItem : Operator.Equal, '', tree.root);
+      tree.addNode(tree.root, newNode);
+    }
 
-      const showDg = () => {
-        show.value = true;
-      };
+    const isSetted = ref(props.modelValue && props.modelValue !== '');
 
-      const onClosed = (val:string) => {
-        if (val == 'OK') {
-          const conditionJson = tree.toJson();
-          isSetted.value=true;
-          emit('update:modelValue', conditionJson);
-        }
-      };
+    const conditionString = computed(() => {
+      const condiStr= tree.buildConditionString(tree.root);
+      return condiStr==='()'?'(条件なし)':condiStr;
+    });
 
-      watchEffect(() => {
+    const showDg = () => {
+      show.value = true;
+    };
+
+    const onClosed = (val: string) => {
+      if (val == 'OK') {
+        isSetted.value = true;
+        tree.setQuery(tree.buildConditionQueryString(tree.root));
         const conditionJson = tree.toJson();
         emit('update:modelValue', conditionJson);
-      });
+      }
+    };
 
-      return {
-        appDg,
-        isSetted,
-        show,
-        showDg,
-        onClosed,
-        tree,
-        conditionString
-      };
-    }
-  });
-  </script>
+    watchEffect(() => {
+      tree.setQuery(tree.buildConditionQueryString(tree.root));
+      const conditionJson = tree.toJson();
+      emit('update:modelValue', conditionJson);
+    });
+
+    return {
+      appDg,
+      isSetted,
+      show,
+      showDg,
+      onClosed,
+      tree,
+      conditionString,
+      btnDisable
+    };
+  }
+});
+</script>

frontend/src/components/right/DataMapping.vue

@@ -0,0 +1,322 @@
+<template>
+    <div class="q-my-md" v-bind="$attrs">
+        <q-field :label="displayName" labelColor="primary" stack-label
+          v-model="mappingProps"
+          :rules="rulesExp"
+          ref="fieldRef"
+        >
+            <template v-slot:control>
+                <q-card flat class="full-width">
+                    <q-card-actions vertical>
+                        <q-btn color="grey-3" text-color="black" :disable="btnDisable"
+                            @click="() => { dgIsShow = true }">クリックで設定</q-btn>
+                    </q-card-actions>
+                    <q-card-section class="text-caption">
+                        <div v-if="mappingObjectsInputDisplay && mappingObjectsInputDisplay.length > 0">
+                            <div v-for="(item) in mappingObjectsInputDisplay" :key="item">{{ item }}</div>
+                        </div>
+                        <div v-else>{{ placeholder }}</div>
+                    </q-card-section>
+                </q-card>
+            </template>
+        </q-field>
+        <show-dialog v-model:visible="dgIsShow" name="データマッピング" @close="closeDg" min-width="55vw" min-height="60vh">
+            <div class="">
+                <div class="row q-col-gutter-x-xs flex-center">
+                    <div class="col-5">
+                        <div class="q-mx-xs">ソース</div>
+                    </div>
+                    <!-- <div class="col-1">
+                    </div> -->
+                    <div class="col-5">
+                        <div class="row justify-between q-mr-md">
+                            <div class="">{{ sourceApp?.name }}</div>
+                            <q-btn outline color="primary" size="xs" label="最新のフィールドを取得する"
+                                @click="() => updateFields(sourceAppId!)" />
+                        </div>
+                    </div>
+                    <div class="col-1 q-pl-sm">
+                        キー
+                    </div>
+                </div>
+                <q-virtual-scroll style="max-height: 60vh;" :items="mappingProps.data" separator v-slot="{ item, index }">
+                    <!-- <div class="q-my-sm" v-for="(item, index) in mappingProps" :key="item.id"> -->
+                    <div class="row q-pa-sm q-col-gutter-x-md flex-center">
+                        <div class="col-5">
+                            <ConditionObject :config="config" v-model="item.from" :disabled="item.disabled"
+                                :label="item.disabled ? '「Lookup」によってロックされる' : undefined" />
+                        </div>
+                        <!-- <div class="col-1">
+                        </div> -->
+                        <div class="col-5">
+                            <q-field v-model="item.vName" type="text" outlined dense :disable="item.disabled" >
+                                <!-- <template v-slot:append>
+                                    <q-icon name="search" class="cursor-pointer"
+                                        @click="() => { mappingProps[index].to.isDialogVisible = true }" />
+                                </template> -->
+                                <template v-slot:control>
+                                     <div class="self-center full-width no-outline" tabindex="0"
+                                        v-if="item.to.app?.name && item.to.fields?.length > 0 && item.to.fields[0].label">
+                                        {{ `${item.to.fields[0].label}` }}
+                                        <span class="text-red" v-if="item.to.fields[0].required">*</span>
+                                        <q-tooltip class="bg-yellow-2 text-black shadow-4" >
+                                            <div>アプリ : {{ item.to.app.name }}</div>
+                                            <div>フィールドのコード : {{ item.to.fields[0].code }}</div>
+                                            <div>フィールドのタイプ : {{ item.to.fields[0].type }}</div>
+                                            <div v-if="item.to.fields[0].required">必須項目</div>
+                                            <!-- <div>フィールド : {{ item.to.fields[0] }}</div>
+                                            <div>フィールド : {{ item.isKey }}</div> -->
+                                        </q-tooltip>
+                                    </div>
+                                </template>
+                            </q-field>
+                        </div>
+                        <div class="col-1">
+                            <q-checkbox size="sm" v-model="item.isKey" :disable="item.disabled" />
+                            <!-- <q-btn flat round dense icon="delete" size="sm" @click="() => deleteMappingObject(index)" /> -->
+                        </div>
+                    </div>
+
+                    <show-dialog v-model:visible="mappingProps.data[index].to.isDialogVisible" name="フィールド一覧"
+                        @close="closeToDg" ref="fieldDlg">
+                        <FieldSelect v-if="onlySourceSelect" ref="fieldDlg" name="フィールド" :appId="sourceAppId" not_page
+                            :selectedFields="mappingProps.data[index].to.fields"
+                            :updateSelects="(fields) => { mappingProps.data[index].to.fields = fields; mappingProps.data[index].to.app = sourceApp }">
+                        </FieldSelect>
+                        <AppFieldSelectBox v-else v-model:selectedField="mappingProps.data[index].to" />
+                    </show-dialog>
+                    <!-- </div> -->
+                </q-virtual-scroll>
+
+                <div class="q-mt-lg q-ml-md row ">
+                    <q-checkbox size="sm" v-model="mappingProps.createWithNull" label="キーが存在しない場合は新規に作成され、存在する場合はデータが更新されます。" />
+                </div>
+            </div>
+        </show-dialog>
+    </div>
+</template>
+
+<script lang="ts">
+import { v4 as uuidv4 } from 'uuid';
+import { computed, defineComponent, watch, isRef, reactive, ref, watchEffect } from 'vue';
+import ConditionObject from '../ConditionEditor/ConditionObject.vue';
+import ShowDialog from '../ShowDialog.vue';
+import AppFieldSelectBox from '../AppFieldSelectBox.vue';
+import FieldSelect from '../FieldSelect.vue';
+import { IApp, IField } from './AppFieldSelect.vue';
+import { api } from 'boot/axios';
+
+type ContextProps = {
+    props?: {
+        name: string;
+        modelValue?: {
+            app: {
+                id: string;
+                name: string;
+            }
+        }
+    }
+};
+
+interface IMappingSetting {
+    data: IMappingValueType[];
+    createWithNull: boolean;
+}
+
+interface IMappingValueType {
+    id: string;
+    from: { sharedText?: string };
+    to: {
+        app?: IApp,
+        fields: IField[],
+        isDialogVisible: boolean;
+    };
+    isKey: boolean;
+    disabled: boolean;
+}
+
+const blackListLabelName = ['レコード番号', '作業者', '更新者', '更新日時', '作成日時', '作成者']
+
+export default defineComponent({
+    name: 'DataMapping',
+    inheritAttrs: false,
+    components: {
+        ShowDialog,
+        ConditionObject,
+        AppFieldSelectBox,
+        FieldSelect
+    },
+    props: {
+        context: {
+            type: Array<ContextProps>,
+            default: '',
+        },
+        displayName: {
+            type: String,
+            default: '',
+        },
+        name: {
+            type: String,
+            default: '',
+        },
+        modelValue: {
+            type: Object as () => IMappingSetting,
+        },
+        placeholder: {
+            type: String,
+            default: '',
+        },
+        onlySourceSelect: {
+            type: Boolean,
+            default: false
+        },
+        fieldTypes:{
+          type:Array,
+          default:()=>[]
+        },
+        //例：[val=>!!val ||'入力してください']
+        rules: {
+          type: String,
+          default: undefined
+        },
+        required: {
+          type: Boolean,
+          default: false
+        },
+        requiredMessage: {
+          type: String,
+          default: ''
+        }
+    },
+    setup(props, { emit }) {
+        const fieldRef=ref();
+        const source = props.context.find(element => element?.props?.name === 'sources')
+
+        const sourceApp = computed(() => source?.props?.modelValue?.app);
+
+        const sourceAppId = computed(() => sourceApp.value?.id);
+
+         //ルール設定
+        const checkMapping = (val:IMappingSetting)=>{
+          if(!val || !val.data){
+            return false;
+          }
+          console.log(val);
+          const mappingDatas = val.data.filter(item=>item.from?.sharedText && item.to.fields?.length > 0);
+          return mappingDatas.length>0;
+        }
+        const customExp = props.rules === undefined ? [] : eval(props.rules);
+        const errmsg = props.requiredMessage?props.requiredMessage:`${props.displayName}を選択してください。`;
+        const requiredExp = props.required ? [((val: any) => checkMapping(val) || errmsg)] : [];
+        const rulesExp = [...requiredExp, ...customExp];
+
+        // const mappingProps = ref(props.modelValue?.data ?? []);
+
+        // const createWithNull = ref(props.modelValue?.createWithNull ?? false);
+
+        const mappingProps = reactive<IMappingSetting>({
+          data:props.modelValue?.data ?? [],
+          createWithNull:props.modelValue?.createWithNull ?? false
+        });
+
+        const closeDg = () => {
+          fieldRef.value.validate();
+          emit('update:modelValue',mappingProps);
+        }
+
+        const closeToDg = () => {
+          emit('update:modelValue',mappingProps);
+        }
+
+        // 外部ソースコンポーネントの appid をリッスンし、変更されたときに現在のコンポーネントを更新します
+        watch(() => sourceAppId.value, async (newId,) => {
+            if (!newId) return;
+            updateFields(newId)
+        })
+
+        const updateFields = async (sourceAppId: string) => {
+            const ktAppFields = await api.get('api/v1/appfields', {
+                params: {
+                    app: sourceAppId
+                }
+            }).then(res => {
+                return Object.values(res.data.properties)
+                    // kintoneのデフォルトの非表示フィールドフィルタリング
+                    .filter(f => !blackListLabelName.find(label => f.label === label))
+                    .map(f => ({ name: f.label, objectType: 'field', ...f }))
+                    .map(f => {
+                        // 更新前の値を求める
+                        const beforeData = mappingProps.data.find(m => m.to.fields[0].code === f.code)
+                        return {
+                            id: uuidv4(),
+                            from: beforeData?.from ?? {}, // 以前のデータを入力します
+                            to: {
+                                app: sourceApp.value,
+                                fields: [f],
+                                isDialogVisible: false
+                            },
+                            isKey: beforeData?.isKey ?? false, // 以前のデータを入力します
+                            disabled: false
+                        }
+                    })
+            })
+
+            // 「ルックアップ」によってロックされているフィールドを検索する
+            const lookupFixedField = ktAppFields
+                .filter(field => field.to.fields[0].lookup !== undefined)
+                .flatMap(field => field.to.fields[0].lookup.fieldMappings.map((m) => m.field))
+
+            // 「ルックアップ」でロックされたビューコンポーネントを非対話型に設定します
+            if (lookupFixedField.length > 0) {
+                ktAppFields.filter(f => lookupFixedField.includes(f.to.fields[0].code)).forEach(f => f.disabled = true)
+            }
+
+            mappingProps.data = ktAppFields
+        }
+
+        const mappingObjectsInputDisplay = computed(() =>
+            (mappingProps.data && Array.isArray(mappingProps.data)) ?
+                mappingProps.data
+                    .filter(item => item.from?.sharedText && item.to.fields?.length > 0)
+                    .map(item => {
+                        return `field(${item.to.app?.id},${item.to.fields[0].label}) = ${item.from.sharedText} `;
+                    })
+                : []
+        );
+
+        const btnDisable = computed(() => props.onlySourceSelect ? !(source?.props?.modelValue?.app?.id) : false);
+
+        watchEffect(() => {
+            emit('update:modelValue', mappingProps);
+        });
+
+        return {
+            uuidv4,
+            dgIsShow: ref(false),
+            fieldRef,
+            closeDg,
+            toDgIsShow: ref(false),
+            closeToDg,
+            mappingProps,
+            updateFields,
+            // addMappingObject: () => mappingProps.push(defaultMappingProp()),
+            // deleteMappingObject,
+            mappingObjectsInputDisplay,
+            sourceApp,
+            sourceAppId,
+            btnDisable,
+            rulesExp,
+            checkMapping,
+            config: {
+                canInput: false,
+                buttonsConfig: [
+                    { label: 'フィールド', color: 'primary', type: 'FieldAdd' },
+                    { label: '変数', color: 'green', type: 'VariableAdd', editable: false },
+                ]
+            }
+        };
+    },
+});
+
+</script>
+<style lang="scss"></style>

frontend/src/components/right/DataProcessing.vue

@@ -0,0 +1,275 @@
+<template>
+  <div>
+    <q-field :label="displayName" labelColor="primary" stack-label
+    v-model="processingProps"
+    :rules="rulesExp"
+    lazy-rules="ondemand"
+    ref="fieldRef"
+    >
+      <template v-slot:control>
+        <q-card flat class="full-width">
+          <q-card-actions vertical>
+            <q-btn color="grey-3" text-color="black" @click="() => { dgIsShow = true }">クリックで設定</q-btn>
+          </q-card-actions>
+          <q-card-section class="text-caption">
+            <div v-if="processingObjectsInputDisplay && processingObjectsInputDisplay.length>0">
+              <div v-for="(item) in processingObjectsInputDisplay" :key="item">{{ item }}</div>
+            </div>
+            <div v-else>{{ placeholder }}</div>
+          </q-card-section>
+        </q-card>
+      </template>
+    </q-field>
+    <show-dialog v-model:visible="dgIsShow" name="集計処理" @close="closeDg" min-width="50vw" min-height="60vh">
+      <div class="q-mx-md q-mb-md">
+        <q-input v-model="processingProps.name" type="text" label-color="primary" label="集計結果の変数名"
+          placeholder="集計結果を格納する変数名を入力してください" stack-label />
+      </div>
+
+      <div class="q-mx-md">
+        <div class="row q-col-gutter-x-xs flex-center">
+          <div class="col-5">
+            <div class="q-mx-xs">データソース</div>
+          </div>
+          <div class="col-2">
+            <div class="q-mx-xs">集計計算</div>
+          </div>
+          <div class="col-4">
+            <div class="q-mx-xs">集計結果変数名</div>
+          </div>
+          <div class="col-1"><q-btn flat round dense icon="add" size="sm" @click="addProcessingObject" />
+          </div>
+        </div>
+        <div class="q-my-sm" v-for="(item, index) in processingObjects" :key="item.id">
+          <div class="row q-col-gutter-x-xs flex-center">
+            <div class="col-5">
+              <ConditionObject v-model="item.field" />
+            </div>
+            <div class="col-2 q-pa-sm">
+              <q-select v-model="item.logicalOperator" :options="logicalOperators"  outlined dense></q-select>
+            </div>
+            <div class="col-4">
+              <q-input v-model="item.vName" type="text"  outlined dense />
+            </div>
+            <div class="col-1">
+              <q-btn flat round dense icon="delete" size="sm" @click="() => deleteProcessingObject(index)" />
+
+            </div>
+          </div>
+        </div>
+      </div>
+    </show-dialog>
+  </div>
+</template>
+
+<script lang="ts">
+import { v4 as uuidv4 } from 'uuid';
+import { computed, defineComponent, provide, reactive, ref, watchEffect } from 'vue';
+import ConditionObject from '../ConditionEditor/ConditionObject.vue';
+import ShowDialog from '../ShowDialog.vue';
+
+type Props = {
+  props?: {
+    name: string;
+    modelValue?: {
+      fields: {
+        type: string;
+        label: string;
+        code: string;
+      }[]
+    } | string
+  }
+};
+
+type ProcessingObjectType = {
+  field?: {
+    sharedText: string;
+    objectType: 'field';
+  };
+  logicalOperator?: string;
+  vName?: string;
+  id: string;
+}
+
+type ValueType = {
+  name: string;
+  actionName: string,
+  displayName: string,
+  vars: ProcessingObjectType[];
+}
+
+export default defineComponent({
+  name: 'DataProcessing',
+  inheritAttrs: false,
+  components: {
+    ShowDialog,
+    ConditionObject,
+  },
+  props: {
+    context: {
+      type: Array<Props>,
+      default: '',
+    },
+    displayName: {
+      type: String,
+      default: '',
+    },
+    name: {
+      type: String,
+      default: '',
+    },
+    modelValue: {
+      type: Object as () => ValueType,
+    },
+    placeholder: {
+      type: String,
+      default: '',
+    },
+    //例：[val=>!!val ||'入力してください']
+    rules: {
+      type: String,
+      default: undefined
+    },
+    required: {
+      type: Boolean,
+      default: false
+    }
+  },
+
+  setup(props, { emit }) {
+    const fieldRef=ref();
+    const source = props.context.find(element => element?.props?.name === 'sources')
+
+    if (source) {
+      provide('sourceFields', computed(() => {
+        const modelValue = source.props?.modelValue;
+        if (modelValue && typeof modelValue !== 'string') {
+          return modelValue.fields;
+        }
+        return null;
+      }));
+      provide('sourceApp', computed(() => source.props?.modelValue?.app?.id));
+    }
+
+    const actionName = props.context.find(element => element?.props?.name === 'displayName')
+
+    const processingProps: ValueType = props.modelValue && props.modelValue.vars
+      ? reactive(props.modelValue)
+      : reactive({
+        name: '',
+        actionName: actionName?.props?.modelValue as string,
+        displayName: '結果（戻り値）',
+        vars: [
+        {
+          id: uuidv4(),
+          field:{
+            objectType:'field',
+            sharedText:''
+          }
+        }]
+      });
+
+    const closeDg = () => {
+      fieldRef.value.validate();
+      emit('update:modelValue', processingProps);
+    }
+
+    const processingObjects = processingProps.vars;
+
+    const deleteProcessingObject = (index: number) => {
+      if(processingObjects.length >0){
+        processingObjects.splice(index, 1);
+      }
+      if(processingObjects.length===0){
+        addProcessingObject();
+      }
+    }
+    const processingObjectsInputDisplay = computed(() =>
+      processingObjects ?
+        processingObjects
+          .filter(item => item.field && item.logicalOperator && item.vName)
+          .map(item => {
+            return`var(${processingProps.name}.${item.vName}) = ${item.field?.sharedText}`
+          })
+        : []
+    );
+
+    const addProcessingObject=()=>{
+      processingObjects.push({
+        id: uuidv4(),
+        field:{
+          objectType:'field',
+          sharedText:''
+        }
+      });
+    }
+    //集計処理方法
+    const logicalOperators = ref([
+      {
+        "operator": "",
+        "label": "なし"
+      },
+      {
+        "operator": "SUM",
+        "label": "合計"
+      },
+      {
+        "operator": "AVG",
+        "label": "平均"
+      },
+      {
+        "operator": "MAX",
+        "label": "最大値"
+      },
+      {
+        "operator": "MIN",
+        "label": "最小値"
+      },
+      {
+        "operator": "COUNT",
+        "label": "カウント"
+      },
+      {
+        "operator": "FIRST",
+        "label": "最初の値"
+      }
+    ]);
+    const checkInput=(val:ValueType)=>{
+      if(!val){
+        return false;
+      }
+      if(!val.name){
+        return "集計結果の変数名を入力してください";
+      }
+      if(!val.vars || val.vars.length==0){
+        return "集計処理を設定してください";
+      }
+      if(val.vars.some((x)=>!x.vName)){
+        return "集計結果変数名を入力してください";
+      }
+      return true;
+    }
+    const customExp = props.rules === undefined ? [] : eval(props.rules);
+    const requiredExp = props.required ? [(val: any) => checkInput(val)] : [];
+    const rulesExp = [...requiredExp, ...customExp];
+
+    watchEffect(() => {
+      emit('update:modelValue', processingProps);
+    });
+    return {
+      uuidv4,
+      dgIsShow: ref(false),
+      closeDg,
+      processingObjects,
+      processingProps,
+      addProcessingObject,
+      deleteProcessingObject,
+      logicalOperators,
+      processingObjectsInputDisplay,
+      rulesExp,
+      fieldRef
+    };
+  },
+});
+</script>
+<style lang="scss"></style>

frontend/src/components/right/DatePicker.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-bind="$attrs">
-    <q-input v-model="selectedDate" :label="displayName" :placeholder="placeholder" label-color="primary" mask="date" :rules="['date']" stack-label>
+    <q-input v-model="selectedDate" :label="displayName" :placeholder="placeholder" label-color="primary" mask="date" :rules="rulesExp" stack-label>
       <template v-slot:append>
         <q-icon name="event" class="cursor-pointer">
           <q-popup-proxy cover transition-show="scale" transition-hide="scale">
@@ -43,16 +43,32 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    //例：[val=>!!val ||'入力してください']
+    rules: {
+      type: String,
+      default: undefined
+    },
+    required:{
+      type:Boolean,
+      default:false
+    },
+    requiredMessage: {
+      type: String,
+      default: ''
+    }
   },
   setup(props, { emit }) {
     const selectedDate = ref(props.modelValue);
-
+    const customExp = props.rules === undefined ? [] : eval(props.rules);
+    const requiredExp = props.required?[((val:any)=>!!val||`${props.displayName}が必須です。`),'date']:['date'];
+    const rulesExp=[...requiredExp,...customExp];
     watchEffect(() => {
       emit('update:modelValue', selectedDate.value);
     });
 
     return {
-      selectedDate
+      selectedDate,
+      rulesExp
     };
   }
 });

frontend/src/components/right/EventSetter.vue

@@ -1,6 +1,9 @@
 <template>
   <div v-bind="$attrs">
-    <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"
+    :rules="rulesExp"
+    stack-label>
       <template v-slot:append>
         <q-btn round dense flat icon="add" @click="addButtonEvent()" />
       </template>
@@ -40,12 +43,29 @@ export default defineComponent({
     connectProps:{
       type:Object,
       default:undefined
+    },
+    //例：[val=>!!val ||'入力してください']
+    rules: {
+      type: String,
+      default: undefined
+    },
+    required:{
+      type:Boolean,
+      default:false
+    },
+    requiredMessage: {
+      type: String,
+      default: ''
     }
   },
 
   setup(props , { emit }) {
     const inputValue = ref(props.modelValue);
     const store = useFlowEditorStore();
+    const customExp = props.rules === undefined ? [] : eval(props.rules);
+    const errmsg = props.requiredMessage?props.requiredMessage:`${props.displayName}を入力してください。`;
+    const requiredExp = props.required ? [((val: any) => !!val || errmsg)] : [];
+    const rulesExp = [...requiredExp, ...customExp];
     const addButtonEvent=()=>{
       const eventId =store.currentFlow?.getRoot()?.name;
       if(eventId===undefined){return;}
@@ -61,22 +81,22 @@ export default defineComponent({
         if(store.eventTree.findEventById(addEventId)){
           return;
         }
-        customEvents.events.push(
-          new kintoneEvent(
-            displayName,
-            addEventId,
-            customButtonId)
-        );
+        customEvents.events.push(new kintoneEvent(
+           displayName,
+          addEventId,
+          customButtonId,
+          'DELETABLE'
+        ));
       }
     }
-
     watchEffect(() => {
       emit('update:modelValue', inputValue.value);
     });
 
     return {
       inputValue,
-      addButtonEvent
+      addButtonEvent,
+      rulesExp
     };
   },
 });

frontend/src/components/right/FieldInput.vue

@@ -1,15 +1,14 @@
 <template>
   <div v-bind="$attrs">
     <q-field v-model="selectedField" :label="displayName" labelColor="primary" :clearable="isSelected" stack-label
-      :bottom-slots="!isSelected">
+      :bottom-slots="!isSelected"
+      :rules="rulesExp"
+    >
       <template v-slot:control>
         <q-chip color="primary" text-color="white" v-if="isSelected">
           {{ selectedField.name }}
         </q-chip>
       </template>
-      <!-- <template v-slot:hint v-if="isSelected">
-        <div> 項目コード：<q-chip  size="sm" outline color="secondary" text-color="white">{{selectedField.code}}</q-chip></div>
-      </template> -->
       <template v-slot:hint v-if="!isSelected">
         {{ placeholder }}
       </template>
@@ -18,8 +17,15 @@
         <q-icon name="search" class="cursor-pointer" color="primary" @click="showDg" />
       </template>
     </q-field>
-    <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeDg" widht="400px">
-      <field-select ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></field-select>
+    <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeDg" min-width="400px">
+      <template v-slot:toolbar>
+            <q-input dense debounce="300" v-model="filter" placeholder="検索" clearable>
+                <template v-slot:before>
+                    <q-icon name="search" />
+                </template>
+            </q-input>
+        </template>
+      <field-select ref="appDg" name="フィールド" :type="selectType" :appId="store.appInfo?.appId" :selectedFields="selectedFields" :fieldTypes="fieldTypes" :filter="filter"></field-select>
     </show-dialog>
   </div>
 </template>
@@ -54,6 +60,14 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    selectType:{
+        type:String,
+        default:'single'
+    },
+    fieldTypes:{
+      type:Array,
+      default:()=>[]
+    },
     hint: {
       type: String,
       default: '',
@@ -62,16 +76,35 @@ export default defineComponent({
       type: Object,
       default: null
     },
+    //例：[val=>!!val ||'入力してください']
+    rules: {
+      type: String,
+      default: undefined
+    },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    requiredMessage: {
+      type: String,
+      default: ''
+    }
   },
 
   setup(props, { emit }) {
     const appDg = ref();
     const show = ref(false);
     const selectedField = ref(props.modelValue);
+    const selectedFields =computed(()=>!selectedField.value?[]: [selectedField.value]);
     const store = useFlowEditorStore();
     const isSelected = computed(() => {
       return selectedField.value !== null && typeof selectedField.value === 'object' && ('name' in selectedField.value)
     });
+    //ルール設定
+    const customExp = props.rules === undefined ? [] : eval(props.rules);
+    const errmsg = props.requiredMessage?props.requiredMessage:`${props.displayName}が必須です。`;
+    const requiredExp = props.required ? [((val: any) => (!!val && typeof val==='object' && !!val.name) || errmsg)] : [];
+    const rulesExp = [...requiredExp, ...customExp];
 
     const showDg = () => {
       show.value = true;
@@ -94,7 +127,10 @@ export default defineComponent({
       showDg,
       closeDg,
       selectedField,
-      isSelected
+      isSelected,
+      filter:ref(''),
+      selectedFields,
+      rulesExp
     };
   }
 });

frontend/src/components/right/InputText.vue

@@ -1,10 +1,7 @@
 <template>
   <div v-bind="$attrs">
-    <q-input :label="displayName" v-model="inputValue" label-color="primary"
-    :placeholder="placeholder" stack-label
-    :rules="rulesExp"
-    :maxlength="maxLength"
-    >
+    <q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label
+      :rules="rulesExp" :maxlength="maxLength">
       <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">
@@ -17,8 +14,7 @@
 </template>
 
 <script lang="ts">
-import { kMaxLength } from 'buffer';
-import { defineComponent, ref, watchEffect } from 'vue';
+import { defineComponent, ref, watchEffect, computed } from 'vue';
 
 export default defineComponent({
   name: 'InputText',
@@ -36,31 +32,69 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    fieldTypes:{
+      type:Array,
+      default:()=>[]
+    },
     hint: {
       type: String,
       default: '',
     },
-    maxLength:{
+    maxLength: {
       type: Number,
-      default:undefined
+      default: undefined
     },
     //例：[val=>!!val ||'入力してください']
-    rules:{
-      type:String,
-      default:undefined
+    rules: {
+      type: String,
+      default: undefined
+    },
+    required:{
+      type:Boolean,
+      default:false
+    },
+    requiredMessage: {
+      type: String,
+      default: ''
     },
     modelValue: {
-      type: String,
+      type: null as any,
       default: '',
     },
   },
 
   setup(props, { emit }) {
-    const inputValue = ref(props.modelValue);
-    const rulesExp = props.rules===undefined?null : eval(props.rules);
-    watchEffect(() => {
-      emit('update:modelValue', inputValue.value);
+    const inputValue = computed({
+      get: () => {
+        if (props.modelValue !== null && typeof props.modelValue === 'object' && 'name' in props.modelValue) {
+          return props.modelValue.name;
+        } else {
+          return props.modelValue;
+        }
+      },
+      set: (val) => {
+        if (props.name === 'verName') {
+          // return props.modelValue.name;
+          emit('update:modelValue', { name: val });
+        } else {
+          emit('update:modelValue', val);
+        }
+      },
     });
+    // const inputValue = ref(props.modelValue);
+
+    const customExp = props.rules === undefined ? [] : eval(props.rules);
+    const errmsg = props.requiredMessage?props.requiredMessage:`${props.displayName}が必須です。`;
+    const requiredExp = props.required?[((val:any)=>!!val || errmsg )]:[];
+    const rulesExp=[...requiredExp,...customExp];
+    // const finalValue = computed(() => {
+    // return props.name !== 'verName' ? inputValue.value : {
+    // name: inputValue.value,
+    // };
+    // });
+    // watchEffect(() => {
+    //   emit('update:modelValue', finalValue);
+    // });
 
     return {
       inputValue,

frontend/src/components/right/MuiltInputText.vue

@@ -1,7 +1,10 @@
 <template>
   <div v-bind="$attrs">
-    <q-input :label="displayName" label-color="primary" v-model="inputValue" :placeholder="placeholder" autogrow
-      stack-label />
+    <q-input :label="displayName" label-color="primary" v-model="inputValue"
+    :placeholder="placeholder"
+    :rules="rulesExp"
+    autogrow
+    stack-label />
   </div>
 </template>
 
@@ -32,17 +35,34 @@ export default defineComponent({
       type: String,
       default: '',
     },
+    //例：[val=>!!val ||'入力してください']
+    rules: {
+      type: String,
+      default: undefined
+    },
+    required:{
+      type:Boolean,
+      default:false
+    },
+    requiredMessage: {
+      type: String,
+      default: ''
+    },
   },
 
   setup(props, { emit }) {
     const inputValue = ref(props.modelValue);
-
+    const customExp = props.rules === undefined ? [] : eval(props.rules);
+    const errmsg = props.requiredMessage?props.requiredMessage:`${props.displayName}が必須です。`;
+    const requiredExp = props.required?[((val:any)=>!!val || errmsg )]:[];
+    const rulesExp=[...requiredExp,...customExp];
     watchEffect(() => {
       emit('update:modelValue', inputValue.value);
     });
 
     return {
       inputValue,
+      rulesExp
     };
   },
 });

frontend/src/components/right/NumInput.vue

@@ -49,6 +49,14 @@ export default defineComponent({
       type:String,
       default:undefined
     },
+    required:{
+      type:Boolean,
+      default:false
+    },
+    requiredMessage: {
+      type: String,
+      default: ''
+    },
     modelValue: {
       type: [Number , String],
       default: undefined
@@ -57,23 +65,10 @@ export default defineComponent({
 
   setup(props, { emit }) {
     const numValue = ref(props.modelValue);
-    const rulesExp = props.rules===undefined?null : eval(props.rules);
-    const isError = computed(()=>{
-      const val = numValue.value;
-      if (val === undefined) {
-        return false;
-      }
-      const numVal = typeof val === "string" ? parseInt(val) : val;
-      // Ensure parsed value is a valid number
-      if (isNaN(numVal)) {
-        return true;
-      }
-      // Check against min and max boundaries, if defined
-      if ((props.min !== undefined && numVal < props.min) || (props.max !== undefined && numVal > props.max)) {
-        return true;
-      }
-      return false;
-    });
+    const customExp = props.rules === undefined ? [] : eval(props.rules);
+    const errmsg = props.requiredMessage?props.requiredMessage:`${props.displayName}が必須です。`;
+    const requiredExp = props.required?[((val:any)=>!!val || errmsg )]:[];
+    const rulesExp=[...requiredExp,...customExp];
 
     watchEffect(()=>{
       emit("update:modelValue",numValue.value);

frontend/src/components/right/PropertyList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div v-for="(item, index) in properties" :key="index" >
-      <component :is="item.component" v-bind="item.props"  :connectProps="connectProps(item.props)" v-model="item.props.modelValue"></component>
+      <component :is="item.component" v-bind="item.props" :context="properties"  :connectProps="connectProps(item.props)" v-model="item.props.modelValue"></component>
     </div>
   </div>
 </template>
@@ -21,6 +21,10 @@ import ConditionInput from '../right/ConditionInput.vue';
 import EventSetter from '../right/EventSetter.vue';
 import ColorPicker from './ColorPicker.vue';
 import NumInput from './NumInput.vue';
+import DataProcessing from './DataProcessing.vue';
+import DataMapping from './DataMapping.vue';
+import AppSelect from './AppSelect.vue';
+import CascadingDropDown from './CascadingDropDown.vue';
 import { IActionNode,IActionProperty,IProp } from 'src/types/ActionTypes';
 
 export default defineComponent({
@@ -35,7 +39,11 @@ export default defineComponent({
     ConditionInput,
     EventSetter,
     ColorPicker,
-    NumInput
+    NumInput,
+    DataProcessing,
+    DataMapping,
+    AppSelect,
+    CascadingDropDown
   },
   props: {
     nodeProps: {
@@ -50,7 +58,7 @@ export default defineComponent({
   setup(props, context) {
     const properties=ref(props.nodeProps);
     const connectProps=(props:IProp)=>{
-       const connProps:any={};
+       const connProps:any={context:properties};
        if(props && "connectProps" in props && props.connectProps!=undefined){
           for(let connProp of props.connectProps){
             let targetProp = properties.value.find((prop)=>prop.props.name===connProp.propName);

frontend/src/components/right/PropertyPanel.vue

@@ -11,6 +11,7 @@
          elevated
          overlay
        >
+       <q-form  @submit="save" autocomplete="off" class="full-height">
         <q-card class="column" style="max-width: 300px;min-height: 100%">
          <q-card-section>
            <div class="text-h6">{{ actionNode?.subTitle }}：設定</div>
@@ -21,16 +22,17 @@
 
          <q-card-actions align="right" class="bg-white text-teal">
             <q-btn flat label="キャンセル" @click="cancel"  outline dense padding="none sm" color="primary"/>
-            <q-btn flat label="更新" @click="save" outline dense padding="none sm" color="primary" />
+            <q-btn flat label="更新" type="submit" outline dense padding="none sm" color="primary" />
          </q-card-actions>
        </q-card>
+      </q-form>
    </q-drawer>
    </div>
  </template>
  <script lang="ts">
- import {  ref,defineComponent, PropType ,watchEffect} from 'vue'
- import PropertyList from 'components/right/PropertyList.vue';
-import { IActionNode } from 'src/types/ActionTypes';
+import {  ref,defineComponent, PropType ,watchEffect} from 'vue'
+import PropertyList from 'components/right/PropertyList.vue';
+import { IActionNode, IActionProperty } from 'src/types/ActionTypes';
  export default defineComponent({
   name: 'PropertyPanel',
   components: {
@@ -47,14 +49,28 @@ import { IActionNode } from 'src/types/ActionTypes';
     }
   },
   emits: [
-    'update:drawerRight'
+    'update:drawerRight',
+    'saveActionProps'
   ],
   setup(props,{emit}) {
-    const showPanel =ref(props.drawerRight);
-    const actionProps =ref(props.actionNode?.actionProps);
+     const showPanel =ref(props.drawerRight);
+
+    const cloneProps = (actionProps:IActionProperty[]):IActionProperty[]|null=>{
+        if(!actionProps){
+          return null;
+        }
+        const json=JSON.stringify(actionProps);
+        return JSON.parse(json);
+    }
+
+    const actionProps =ref(cloneProps(props.actionNode?.actionProps));
+
     watchEffect(() => {
+      if(showPanel.value!==undefined){
+        showPanel.value = props.drawerRight;
+      }
       showPanel.value = props.drawerRight;
-      actionProps.value= props.actionNode?.actionProps;
+      actionProps.value= cloneProps(props.actionNode?.actionProps);
     });
 
     const cancel = async() =>{
@@ -64,7 +80,8 @@ import { IActionNode } from 'src/types/ActionTypes';
 
     const save = async () =>{
       showPanel.value=false;
-      emit('update:drawerRight',false )
+      emit('saveActionProps', actionProps.value);
+      emit('update:drawerRight',false );
     }
 
     return {

frontend/src/components/right/SelectBox.vue

@@ -1,11 +1,15 @@
 <template>
   <div v-bind="$attrs">
-  <q-select v-model="selectedValue" :label="displayName" :options="options"/>
+  <q-select v-model="selectedValue" :use-chips="multiple" :label="displayName" label-color="primary"
+  :options="options"
+  stack-label
+  :rules="rulesExp"
+  :multiple="multiple"/>
 </div>
 </template>
 
 <script lang="ts">
-import { defineComponent,ref,watchEffect } from 'vue';
+import { defineComponent,ref,watchEffect,computed } from 'vue';
 
 export default defineComponent({
   name: 'SelectBox',
@@ -23,20 +27,44 @@ export default defineComponent({
       type: Array,
       required: true,
     },
+    selectType:{
+      type:String,
+      default:'',
+    },
     modelValue: {
+      type: [Array,String],
+      default: null,
+    },
+    //例：[val=>!!val ||'入力してください']
+    rules: {
       type: String,
-      default: '',
+      default: undefined
+    },
+    required:{
+      type:Boolean,
+      default:false
+    },
+    requiredMessage: {
+      type: String,
+      default: ''
     },
   },
   setup(props, { emit }) {
     const selectedValue = ref(props.modelValue);
-
+    const multiple = computed(()=>{
+      return props.selectType==='multiple'
+    });
     watchEffect(() => {
       emit('update:modelValue', selectedValue.value);
     });
-
+    const customExp = props.rules === undefined ? [] : eval(props.rules);
+    const errmsg = props.requiredMessage?props.requiredMessage:`${props.displayName}を選択してください。`;
+    const requiredExp = props.required?[((val:any)=>!!val || errmsg )]:[];
+    const rulesExp=[...requiredExp,...customExp];
     return {
-      selectedValue
+      selectedValue,
+      multiple,
+      rulesExp
     };
   },
 });

frontend/src/control/flowctrl.ts

@@ -1,44 +1,49 @@
 import { api } from 'boot/axios';
 import { ActionFlow } from 'src/types/ActionTypes';
 
-export class FlowCtrl
-{
-
-  async getFlows(appId:string):Promise<ActionFlow[]>
-  {
-      const flows:ActionFlow[]=[];
-      try{
-        const result = await api.get(`api/flows/${appId}`);
-        //console.info(result.data);
-         if(!result.data || !Array.isArray(result.data)){
-           return [];
-         }
-
-         for(const flow of result.data){
-             flows.push(ActionFlow.fromJSON(flow.content));
-         }
-        return flows;
-      }catch(error){
-        console.error(error);
-        return flows;
+export class FlowCtrl {
+  async getFlows(appId: string): Promise<ActionFlow[]> {
+    const flows: ActionFlow[] = [];
+    try {
+      const result = await api.get(`api/flows/${appId}`);
+      //console.info(result.data);
+      if (!result.data || !Array.isArray(result.data)) {
+        return [];
       }
+
+      for (const flow of result.data) {
+        flows.push(ActionFlow.fromJSON(flow.content));
+      }
+      return flows;
+    } catch (error) {
+      console.error(error);
+      return flows;
+    }
   }
 
-  async SaveFlow(jsonData:any):Promise<boolean>
-  {
-       const result = await api.post('api/flow',jsonData);
-       console.info(result.data)
-       return true;
+  async SaveFlow(jsonData: any): Promise<boolean> {
+    const result = await api.post('api/flow', jsonData);
+    console.info(result.data);
+    return true;
   }
   /**
    * フローを更新する
    * @param jsonData
    * @returns
    */
-  async  UpdateFlow(jsonData:any):Promise<boolean>
-  {
-    const result = await api.put('api/flow/' + jsonData.flowid,jsonData);
-    console.info(result.data)
+  async UpdateFlow(jsonData: any): Promise<boolean> {
+    const result = await api.put('api/flow/' + jsonData.flowid, jsonData);
+    console.info(result.data);
+    return true;
+  }
+  /**
+   * フローを消去する
+   * @param flowId
+   * @returns
+   */
+  async DeleteFlow(flowId: string): Promise<boolean> {
+    const result = await api.delete('api/flow/' + flowId);
+    console.info(result.data);
     return true;
   }
   /**
@@ -46,12 +51,9 @@ export class FlowCtrl
    * @param appid
    * @returns
    */
-  async depoly(appid:string):Promise<boolean>
-  {
+  async depoly(appid: string): Promise<boolean> {
     const result = await api.post(`api/v1/createjstokintone?app=${appid}`);
     console.info(result.data);
     return true;
   }
-
 }
-

frontend/src/layouts/MainLayout.vue

@@ -2,40 +2,28 @@
   <q-layout view="lHh Lpr lFf">
     <q-header elevated>
       <q-toolbar>
-        <q-btn
-          flat
-          dense
-          round
-          icon="menu"
-          aria-label="Menu"
-          @click="toggleLeftDrawer"
-        />
+        <q-btn flat dense round icon="menu" aria-label="Menu" @click="toggleLeftDrawer" />
         <q-toolbar-title>
           {{ productName }}
           <q-badge align="top" outline>V{{ version }}</q-badge>
         </q-toolbar-title>
         <domain-selector></domain-selector>
-        <q-btn flat round dense icon="logout" @click="authStore.logout()"/>
+        <q-btn flat round dense icon="logout" @click="authStore.logout()" />
       </q-toolbar>
     </q-header>
 
-    <q-drawer
-      :model-value="authStore.toggleLeftDrawer"
-      :show-if-above="false"
-      bordered
-    >
+    <q-drawer :model-value="authStore.LeftDrawer" :show-if-above="false" bordered>
       <q-list>
-        <q-item-label
-          header
-        >
-          関連リンク
+        <q-item-label header>
+          メニュー
         </q-item-label>
 
-        <EssentialLink
-          v-for="link in essentialLinks"
-          :key="link.title"
-          v-bind="link"
-        />
+        <EssentialLink v-for="link in essentialLinks" :key="link.title" v-bind="link" />
+        <div v-if="isAdmin()">
+          <EssentialLink v-for="link in adminLinks" :key="link.title" v-bind="link" />
+        </div>
+        <EssentialLink v-for="link in domainLinks" :key="link.title" v-bind="link" />
+
       </q-list>
     </q-drawer>
 
@@ -46,115 +34,110 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { computed, onMounted, reactive } from 'vue';
 import EssentialLink, { EssentialLinkProps } from 'components/EssentialLink.vue';
 import DomainSelector from 'components/DomainSelector.vue';
 import { useAuthStore } from 'stores/useAuthStore';
+import { useRoute } from 'vue-router';
 
 const authStore = useAuthStore();
+const route = useRoute()
+const noDomain = computed(() => !authStore.hasDomain);
 
-const essentialLinks: EssentialLinkProps[] = [
-{
+const essentialLinks: EssentialLinkProps[] = reactive([
+  {
     title: 'ホーム',
-    caption: 'home',
+    caption: '設計書から導入する',
     icon: 'home',
     link: '/',
-    target:'_self'
+    target: '_self',
+    disable: noDomain
+  },
+  // {
+  //   title: 'フローエディター',
+  //   caption: 'イベントを設定する',
+  //   icon: 'account_tree',
+  //   link: '/#/FlowChart',
+  //   target: '_self'
+  // },
+  {
+    title: 'アプリ管理',
+    caption: 'アプリを管理する',
+    icon: 'widgets',
+    link: '/#/app',
+    target: '_self',
+    disable: noDomain
+  },
+  // {
+  //   title: '条件エディター',
+  //   caption: 'condition',
+  //   icon: 'tune',
+  //   link: '/#/condition',
+  //   target:'_self'
+  // },
+  {
+    title: '',
+    isSeparator: true
+  },
+  // {
+  //   title:'Kintone ポータル',
+  //   caption:'Kintone',
+  //   icon:'cloud_queue',
+  //   link:'https://mfu07rkgnb7c.cybozu.com/k/#/portal'
+  // },
+  // {
+  //   title:'CUSTOMINE',
+  //   caption:'gusuku',
+  //   link:'https://app-customine.gusuku.io/drive.html',
+  //   icon:'settings_suggest'
+  // },
+  // {
+  //   title:'Kintone API ドキュメント',
+  //   caption:'Kintone API',
+  //   link:'https://cybozu.dev/ja/kintone/docs/',
+  //   icon:'help_outline'
+  // },
+]);
+
+const domainLinks: EssentialLinkProps[] = reactive([
+  {
+    title: 'ドメイン管理',
+    caption: 'kintoneのドメイン設定',
+    icon: 'domain',
+    link: '/#/domain',
+    target: '_self'
   },
   {
-    title: 'フローエディター',
-    caption: 'flowChart',
-    icon: 'account_tree',
-    link: '/#/FlowChart',
-    target:'_self'
+    title: 'ドメイン適用',
+    caption: 'ユーザー使用可能なドメインの設定',
+    icon: 'assignment_ind',
+    link: '/#/userDomain',
+    target: '_self'
   },
+]);
+
+const adminLinks: EssentialLinkProps[] = reactive([
   {
-    title: '条件エディター',
-    caption: 'condition',
-    icon: 'tune',
-    link: '/#/condition',
-    target:'_self'
+    title: 'ユーザー管理',
+    caption: 'ユーザーを管理する',
+    icon: 'manage_accounts',
+    link: '/#/user',
+    target: '_self'
   },
-  {
-    title:'',
-    isSeparator:true
-  },
-  {
-    title:'Kintone ポータル',
-    caption:'Kintone',
-    icon:'cloud_queue',
-    link:'https://mfu07rkgnb7c.cybozu.com/k/#/portal'
-  },
-  {
-    title:'CUSTOMINE',
-    caption:'gusuku',
-    link:'https://app-customine.gusuku.io/drive.html',
-    icon:'settings_suggest'
-  },
-  {
-    title:'Kintone API ドキュメント',
-    caption:'Kintone API',
-    link:'https://cybozu.dev/ja/kintone/docs/',
-    icon:'help_outline'
-  },
-  {
-    title:'',
-    isSeparator:true
-  },
-  {
-    title: 'Docs',
-    caption: 'quasar.dev',
-    icon: 'school',
-    link: 'https://quasar.dev'
-  },
-  {
-    title: 'Icons',
-    caption: 'Material Icons',
-    icon: 'insert_emoticon',
-    link: 'https://fonts.google.com/icons?selected=Material+Icons:insert_emoticon:'
-  },
-  {
-    title: 'Github',
-    caption: 'github.com/quasarframework',
-    icon: 'code',
-    link: 'https://github.com/quasarframework'
-  },
-  {
-    title: 'Discord Chat Channel',
-    caption: 'chat.quasar.dev',
-    icon: 'chat',
-    link: 'https://chat.quasar.dev'
-  },
-  {
-    title: 'Forum',
-    caption: 'forum.quasar.dev',
-    icon: 'record_voice_over',
-    link: 'https://forum.quasar.dev'
-  },
-  {
-    title: 'Twitter',
-    caption: '@quasarframework',
-    icon: 'rss_feed',
-    link: 'https://twitter.quasar.dev'
-  },
-  {
-    title: 'Facebook',
-    caption: '@QuasarFramework',
-    icon: 'public',
-    link: 'https://facebook.quasar.dev'
-  },
-  {
-    title: 'Quasar Awesome',
-    caption: 'Community Quasar projects',
-    icon: 'favorite',
-    link: 'https://awesome.quasar.dev'
-  }
-];
+])
 
 const version = process.env.version;
 const productName = process.env.productName;
 
+onMounted(() => {
+  authStore.setLeftMenu(!route.path.startsWith('/FlowChart/'));
+});
+
 function toggleLeftDrawer() {
   authStore.toggleLeftMenu();
 }
+function isAdmin(){
+  const permission = authStore.permissions;
+  return permission === 'admin'
+}
 </script>

frontend/src/pages/AppManagement.vue

@@ -0,0 +1,203 @@
+<template>
+  <div class="q-pa-md">
+    <div class="q-gutter-sm row items-start">
+        <q-breadcrumbs>
+          <q-breadcrumbs-el icon="widgets" label="アプリ管理" />
+        </q-breadcrumbs>
+    </div>
+    <q-table title="Treats" :rows="rows" :columns="columns" row-key="id" :filter="filter" :loading="loading" :pagination="pagination">
+
+      <template v-slot:top>
+        <q-btn color="primary" :disable="loading" label="新規" @click="showAddAppDialog" />
+        <q-space />
+        <q-input borderless dense filled debounce="300" v-model="filter" placeholder="検索">
+          <template v-slot:append>
+            <q-icon name="search" />
+          </template>
+        </q-input>
+      </template>
+      <template v-slot:body-cell-name="prop">
+        <q-td :props="prop">
+          <q-btn flat dense :label="prop.row.name" @click="toEditFlowPage(prop.row)" ></q-btn>
+        </q-td>
+      </template>
+      <template v-slot:body-cell-url="prop">
+        <q-td :props="prop">
+          <a :href="prop.row.url" target="_blank" :title="prop.row.name" >
+            {{ prop.row.url  }}
+          </a>
+        </q-td>
+      </template>
+      <template v-slot:body-cell-actions="p">
+        <q-td :props="p">
+          <table-action-menu :row="p.row" :actions="actionList" />
+        </q-td>
+      </template>
+    </q-table>
+
+    <show-dialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeSelectAppDialog" min-width="50vw" min-height="50vh" :ok-btn-auto-close="false" :ok-btn-loading="isAdding">
+      <template v-slot:toolbar>
+        <q-input dense debounce="300" v-model="dgFilter" placeholder="検索" clearable>
+          <template v-slot:before>
+            <q-icon name="search" />
+          </template>
+        </q-input>
+      </template>
+      <app-select-box ref="appDialog" name="アプリ" type="single" :filter="dgFilter" :filterInitRowsFunc="filterInitRows" />
+    </show-dialog>
+
+    
+    <show-dialog v-model:visible="showVersionHistory" :name="targetRow?.name + 'のバージョン履歴'" @close="closeHistoryDg" min-width="50vw" min-height="50vh" :ok-btn-auto-close="false" :ok-btn-loading="isAdding">
+      <version-history ref="versionDialog" :app="targetRow as IAppDisplay" />
+    </show-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, watch, reactive } from 'vue';
+import { useQuasar } from 'quasar'
+import { api } from 'boot/axios';
+import { useAuthStore } from 'stores/useAuthStore';
+import { useFlowEditorStore } from 'stores/flowEditor';
+import { router } from 'src/router';
+import { date } from 'quasar'
+import { IManagedApp, IAppDisplay, IAppVersion } from 'src/types/AppTypes';
+import ShowDialog from 'src/components/ShowDialog.vue';
+import AppSelectBox from 'src/components/AppSelectBox.vue';
+import TableActionMenu from 'components/TableActionMenu.vue';
+import VersionHistory from 'components/dialog/VersionHistory.vue';
+
+const authStore = useAuthStore();
+const numberStringSorting = (a: string, b: string) => parseInt(a, 10) - parseInt(b, 10);
+
+const columns = [
+  { name: 'id', label: 'アプリID', field: 'id', align: 'left', sortable: true, sort: numberStringSorting },
+  { name: 'name', label: 'アプリ名', field: 'name', align: 'left', sortable: true },
+  { name: 'url', label: 'URL', field: 'url', align: 'left', sortable: true },
+  { name: 'updateUser', label: '最後更新者', field: (row: IAppDisplay) => row.updateUser.fullName, align: 'left', sortable: true},
+  { name: 'updateTime', label: '最後更新日', field: 'updateTime', align: 'left', sortable: true},
+  { name: 'version', label: 'バージョン', field: 'version', align: 'left', sortable: true, sort: numberStringSorting },
+  { name: 'actions', label: '', field: 'actions' }
+];
+
+const pagination = ref({ sortBy: 'id', descending: true, rowsPerPage: 20 });
+const loading = ref(false);
+const filter = ref('');
+const dgFilter = ref('');
+const rows = ref<IAppDisplay[]>([]);
+const targetRow = ref<IAppDisplay>();
+const rowIds = new Set<string>();
+
+const $q = useQuasar()
+const store = useFlowEditorStore();
+const appDialog = ref();
+const showSelectApp=ref(false);
+const showVersionHistory=ref(false);
+const isAdding = ref(false);
+
+const actionList =  [
+  { label: '設定', icon: 'account_tree', action: toEditFlowPage },
+  { label: '履歴', icon: 'history', action: showHistory },
+  { separator: true },
+  { label: '削除', icon: 'delete_outline', class: 'text-red', action: removeRow },
+];
+
+const getApps = async () => {
+  loading.value = true;
+  rowIds.clear();
+  try {
+    const { data } = await api.get('api/apps');
+    rows.value = data.data.map((item: IManagedApp) => {
+      rowIds.add(item.appid);
+      return appToAppDisplay(item)
+    }).sort((a: IAppDisplay, b: IAppDisplay) => a.sortId - b.sortId); // set default order
+  } catch (error) {
+    $q.notify({
+      icon: 'error',
+      color: 'negative',
+      message: 'アプリ一覧の読み込みに失敗しました'
+    });
+  } finally {
+    loading.value = false;
+  }
+}
+
+onMounted(async () => {
+  await getApps();
+});
+
+watch(() => authStore.currentDomain.id, async () => {
+  await getApps();
+});
+
+const filterInitRows = (row: {id: string}) => {
+  return !rowIds.has(row.id);
+}
+
+const showAddAppDialog = () => {
+  showSelectApp.value = true;
+  dgFilter.value = ''
+}
+
+const closeSelectAppDialog = async (val: 'OK'|'Cancel') => {
+  showSelectApp.value = true;
+  if (val == 'OK' && appDialog.value.selected[0]) {
+      isAdding.value = true;
+      toEditFlowPage(appDialog.value.selected[0]);
+  }
+  showSelectApp.value = false;
+  isAdding.value = false;
+}
+
+function removeRow(app:IAppDisplay) {
+  targetRow.value = app;
+  return
+}
+
+function showHistory(app:IAppDisplay) {
+  targetRow.value = app;
+  showVersionHistory.value = true;
+  dgFilter.value = ''
+}
+
+const closeHistoryDg = async (val: 'OK'|'Cancel') => {
+  showSelectApp.value = true;
+  if (val == 'OK' && appDialog.value.selected[0]) {
+      isAdding.value = true;
+      await getApps();
+  }
+  showSelectApp.value = false;
+  isAdding.value = false;
+}
+
+const appToAppDisplay = (app: IManagedApp) => {
+  const user = app.updateuser;
+  return {
+    id: app.appid,
+    sortId: parseInt(app.appid, 10),
+    name: app.appname,
+    url: `${app.domainurl}/k/${app.appid}`,
+    version: app.version,
+    updateTime:date.formatDate(app.update_time, 'YYYY/MM/DD HH:mm'),
+    updateUser: {
+      id: user.id,
+      firstName: user.first_name,
+      lastName: user.last_name,
+      fullNameSearch: (user.last_name + user.first_name).toLowerCase(),
+      fullName: user.last_name + ' ' + user.first_name,
+      email: user.email,
+      isSuperuser: user.is_superuser,
+      isActive: user.is_active,
+    }
+  } as IAppDisplay
+}
+
+async function toEditFlowPage(app:IAppDisplay) {
+  store.setApp({
+    appId: app.id,
+    name: app.name
+  });
+  store.selectFlow(undefined);
+  await router.push('/FlowChart/' + app.id);
+};
+</script>

frontend/src/pages/FlowChart.vue

@@ -3,11 +3,7 @@
     <q-layout container class="absolute-full shadow-2 rounded-borders">
       <div class="q-pa-sm q-gutter-sm  ">
         <q-drawer side="left" :overlay="true" bordered v-model="drawerLeft" :show-if-above="false" elevated>
-          <div class="flex-center fixed-top app-selector">
-            <AppSelector />
-          </div>
-
-          <div class="flex-center absolute-full" style="padding-top:65px;padding-left:15px;padding-right:15px;">
+          <div class="flex-center absolute-full" style="padding:15px">
             <q-scroll-area class="fit" :horizontal-thumb-style="{ opacity: '0' }">
               <EventTree />
             </q-scroll-area>
@@ -16,14 +12,59 @@
           <div class="flex-center fixed-bottom bg-grey-3 q-pa-md row ">
             <q-btn color="secondary" glossy label="デプロイ" @click="onDeploy" icon="sync" :loading="deployLoading" />
             <q-space></q-space>
-            <q-btn color="primary" label="保存" @click="onSaveFlow" icon="save" :loading="saveLoading" />
+            <q-btn-dropdown color="primary" label="保存" icon="save" :loading="saveLoading" >
+              <q-list>
+                <q-item clickable v-close-popup @click="onSaveVersion">
+                  <q-item-section avatar >
+                    <q-icon name="bookmark_border"></q-icon>
+                  </q-item-section>
+                  <q-item-section>
+                    <q-item-label>新バージョン保存</q-item-label>
+                  </q-item-section>
+                </q-item>
+
+                <q-item clickable v-close-popup @click="onSaveFlow">
+                  <q-item-section avatar >
+                    <q-icon name="save" color="primary"></q-icon>
+                  </q-item-section>
+                  <q-item-section>
+                    <q-item-label>選択中フローの保存</q-item-label>
+                  </q-item-section>
+                </q-item>
+
+                <q-item clickable v-close-popup @click="onSaveAllFlow">
+                  <q-item-section avatar>
+                    <q-icon name="collections_bookmark" color="accent"></q-icon>
+                  </q-item-section>
+                  <q-item-section>
+                    <q-item-label>一括保存</q-item-label>
+                  </q-item-section>
+                </q-item>
+              </q-list>
+            </q-btn-dropdown>
           </div>
         </q-drawer>
       </div>
       <q-btn flat dense round
               :icon="drawerLeft?'keyboard_double_arrow_left':'keyboard_double_arrow_right'"
-              :style="[drawerLeft?{'left':'300px'}:{'left':'0px'}]"
+              :style="{'left': fixedLeftPosition}"
               @click="drawerLeft=!drawerLeft" class="expand" />
+      <q-breadcrumbs v-if="store.appInfo" class="fixed q-pl-md"
+              :style="{'left': fixedLeftPosition}">
+        <q-breadcrumbs-el icon="widgets" label="アプリ管理" to="/app" />
+        <q-breadcrumbs-el>
+          <template v-slot>
+            <a class="full-width" :href="!store.appInfo?'':`${authStore.currentDomain.kintoneUrl}/k/${store.appInfo?.appId}`" target="_blank" title="Kiontoneへ">
+              {{ store.appInfo?.name }}
+              <q-icon
+                class="q-ma-xs"
+                name="open_in_new"
+                color="grey-9"
+              />
+            </a>
+          </template>
+        </q-breadcrumbs-el>
+      </q-breadcrumbs>
       <div class="q-pa-md q-gutter-sm" :style="{minWidth: minPanelWidth}">
         <div class="flowchart" v-if="store.currentFlow" :style="[drawerLeft?{paddingLeft:'300px'}:{}]">
           <node-item v-if="rootNode!==undefined" :key="rootNode.id" :isSelected="rootNode === store.activeNode"
@@ -31,7 +72,7 @@
             @deleteNode="onDeleteNode" @deleteAllNextNodes="onDeleteAllNextNodes" @copyFlow="onCopyFlow"></node-item>
         </div>
       </div>
-      <PropertyPanel :actionNode="store.activeNode" v-model:drawerRight="drawerRight"></PropertyPanel>
+      <PropertyPanel :actionNode="store.activeNode" v-model:drawerRight="drawerRight" @save-action-props="onSaveActionProps"></PropertyPanel>
     </q-layout>
     <ShowDialog v-model:visible="showAddAction" name="アクション" @close="closeDg" min-width="500px" min-height="500px">
       <template v-slot:toolbar>
@@ -41,33 +82,48 @@
           </template>
         </q-input>
       </template>
-      <action-select ref="appDg" name="model" :filter="filter"  type="single"></action-select>
+      <action-select ref="appDg" name="model" :filter="filter"  type="single" @clearFilter="onClearFilter" ></action-select>
     </ShowDialog>
-
+    <!-- save version dialog -->
+    <ShowDialog v-model:visible="saveVersionAction" name="新バージョン保存" @close="closeSaveVersionDg" min-width="500px">
+      <version-input v-model="versionInfo" />
+    </ShowDialog>
+    <q-inner-loading
+      :showing="initLoading"
+      color="primary"
+      label="読み込み中..."
+    />
   </q-page>
 </template>
 
 <script setup lang="ts">
 import { ref, reactive, computed, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
 import { IActionNode, ActionNode, IActionFlow, ActionFlow, RootAction, IActionProperty } from 'src/types/ActionTypes';
+import { IAppDisplay, IManagedApp, IVersionInfo } from 'src/types/AppTypes';
 import { storeToRefs } from 'pinia';
 import { useFlowEditorStore } from 'stores/flowEditor';
 import { useAuthStore } from 'stores/useAuthStore';
+import { api } from 'boot/axios';
 
 import NodeItem from 'src/components/main/NodeItem.vue';
 import ShowDialog from 'components/ShowDialog.vue';
 import ActionSelect from 'components/ActionSelect.vue';
 import PropertyPanel from 'components/right/PropertyPanel.vue';
-import AppSelector from 'components/left/AppSelector.vue';
 import EventTree from 'components/left/EventTree.vue';
+import VersionInput from 'components/dialog/VersionInput.vue';
 import { FlowCtrl } from '../control/flowctrl';
 import { useQuasar } from 'quasar';
+
 const deployLoading = ref(false);
 const saveLoading = ref(false);
+const initLoading = ref(true);
 const drawerLeft = ref(false);
+const versionInfo = ref<IVersionInfo>();
 const $q = useQuasar();
 const store = useFlowEditorStore();
 const authStore = useAuthStore();
+const route = useRoute()
 
 const appDg = ref();
 const prevNodeIfo = ref({
@@ -76,13 +132,11 @@ const prevNodeIfo = ref({
 });
 // const refFlow = ref<ActionFlow|null>(null);
 const showAddAction = ref(false);
+const saveVersionAction = ref(false);
 const drawerRight = ref(false);
 const filter=ref("");
 const model = ref("");
-const addActionNode = (action: IActionNode) => {
-  // refFlow.value?.actionNodes.push(action);
-  store.currentFlow?.actionNodes.push(action);
-}
+
 const rootNode = computed(()=>{
   return store.currentFlow?.getRoot();
 });
@@ -94,6 +148,9 @@ const minPanelWidth=computed(()=>{
     return "300px";
   }
 });
+const fixedLeftPosition = computed(()=>{
+  return drawerLeft.value?"300px":"0px";
+});
 
 const addNode = (node: IActionNode, inputPoint: string) => {
   if (drawerRight.value) {
@@ -136,7 +193,7 @@ const onDeleteAllNextNodes = (node: IActionNode) => {
 }
 const closeDg = (val: any) => {
   console.log("Dialog closed->", val);
-  if (val == 'OK') {
+  if (val == 'OK' && appDg?.value?.selected?.length > 0) {
     const data = appDg.value.selected[0];
     const actionProps = JSON.parse(data.property);
     const outputPoint = JSON.parse(data.outputPoints);
@@ -193,13 +250,38 @@ const onDeploy = async () => {
   return;
 }
 
+const onSaveActionProps=(props:IActionProperty[])=>{
+  if(store.activeNode){
+      store.activeNode.actionProps=props;
+      $q.notify({
+        type: 'positive',
+        caption: "通知",
+        message: `${store.activeNode?.subTitle}の属性を設定しました。（保存はされていません）`
+      });
+  }
+};
+
+const onSaveVersion = async () => {
+  versionInfo.value = {
+    id: '1' // TODO
+  }
+  saveVersionAction.value = true;
+  // await onSaveAllFlow();
+}
+
+const closeSaveVersionDg = (val: 'OK'|'CANCEL') => {
+  if (val == 'OK') {
+    console.log(versionInfo.value);
+  }
+}
+
 const onSaveFlow = async () => {
   const targetFlow = store.selectedFlow;
   if (targetFlow === undefined) {
     $q.notify({
       type: 'negative',
-      caption: "エラー",
-      message: `編集中のフローがありません。`
+      caption: 'エラー',
+      message: `選択中のフローがありません。`
     });
     return;
   }
@@ -221,38 +303,103 @@ const onSaveFlow = async () => {
       message: `${targetFlow.getRoot()?.subTitle}のフローの設定の保存が失敗しました。`
     })
   }
-
+}
+/**
+ * すべてフローの設定を保存する
+ */
+const onSaveAllFlow= async ()=>{
+  try{
+    const targetFlows = store.eventTree.findAllFlows();
+    if (!targetFlows || targetFlows.length === 0 ) {
+      $q.notify({
+        type: 'negative',
+        caption: 'エラー',
+        message: `設定されたフローがありません。`
+      });
+      return;
+    }
+    saveLoading.value = true;
+    for(const flow of targetFlows ){
+      const isNew = flow.id === '';
+      if(isNew && flow.actionNodes.length===1){
+        continue;
+      }
+      await store.saveFlow(flow);
+    }
+    $q.notify({
+        type: 'positive',
+        caption: "通知",
+        message: `すべてのフロー設定を保存しました。`
+      });
+    saveLoading.value = false;
+  }catch (error) {
+    console.error(error);
+    saveLoading.value = false;
+    $q.notify({
+      type: 'negative',
+      caption: "エラー",
+      message: `フローの設定の保存が失敗しました。`
+    });
+  }
 }
 
 const fetchData = async () => {
+  initLoading.value = true;
+  if (store.appInfo === undefined && route?.params?.id !== undefined) {
+    // only for page refreshed
+    const app = await fetchAppById(route.params.id as string);
+    store.setApp(app);
+  };
+  await store.loadFlow();
+  initLoading.value = false
   drawerLeft.value = true;
-  if (store.appInfo === undefined) return;
-  const flowCtrl = new FlowCtrl();
-  const actionFlows = await flowCtrl.getFlows(store.appInfo?.appId);
-  if (actionFlows && actionFlows.length > 0) {
-    store.setFlows(actionFlows);
+}
+
+const fetchAppById = async(id: string) => {
+  let result = await api.get('api/apps');
+  const app = result.data?.data?.find((item: IManagedApp) => item.appid === id ) as IManagedApp;
+  if (app) {
+    return convertManagedAppToAppInfo(app);
   }
-  if (actionFlows && actionFlows.length == 1) {
-    store.selectFlow(actionFlows[0]);
+
+  result = await api.get(`api/v1/app?app=${id}`);
+  const kApp = result?.data as IAppDisplay | KErrorMsg;
+  if (isErrorMsg(kApp)) {
+    $q.notify({
+      type: 'negative',
+      caption: 'エラー',
+      message: kApp.message,
+    });
   }
-  const root = actionFlows[0].getRoot();
-  if (root) {
-    store.setActiveNode(root);
+  return kApp;
+}
+
+type KErrorMsg = {
+  message: string;
+}
+
+const isErrorMsg = (e: IAppDisplay | KErrorMsg): e is KErrorMsg => {
+  return 'message' in e;
+};
+
+const convertManagedAppToAppInfo = (app: IManagedApp): AppInfo => {
+  return {
+    appId: app.appid,
+    name: app.appname
   }
+};
+
+const onClearFilter=()=>{
+  filter.value='';
 }
 
 onMounted(() => {
-  authStore.toggleLeftMenu();
+  authStore.setLeftMenu(false);
   fetchData();
 });
 </script>
 
 <style lang="scss">
-.app-selector {
-  padding: 15px;
-  z-index: 999;
-}
-
 .flowchart {
   padding-top: 10px;
 }