diff --git a/backend/app/api/api_v1/routers/kintone.py b/backend/app/api/api_v1/routers/kintone.py index 3de77be..35a3b99 100644 --- a/backend/app/api/api_v1/routers/kintone.py +++ b/backend/app/api/api_v1/routers/kintone.py @@ -260,9 +260,9 @@ def updateappjscss(app,uploads,c:config.KINTONE_ENV): r = httpx.put(url,headers=headers,data=json.dumps(data)) return r.json() -def createappjs(app): +def createappjs(domainid,app): db = SessionLocal() - flows = get_flows_by_app(db,app) + flows = get_flows_by_app(db,domainid,app) db.close() content={} for flow in flows: @@ -516,12 +516,12 @@ async def updateprocessfromexcel(app:str,env = Depends(getkintoneenv)): @r.post("/createjstokintone",) -async def createjstokintone(app:str,env = Depends(getkintoneenv)): +async def createjstokintone(app:str,env:config.KINTONE_ENV = Depends(getkintoneenv)): try: jscs=[] files=[] - files.append(createappjs(app)) + files.append(createappjs(env.DOMAIN_ID, app)) files.append('Temp\\alc_runtime.js') for file in files: upload = uploadkintonefiles(file,env) diff --git a/backend/app/api/api_v1/routers/platform.py b/backend/app/api/api_v1/routers/platform.py index 274c04e..83e258a 100644 --- a/backend/app/api/api_v1/routers/platform.py +++ b/backend/app/api/api_v1/routers/platform.py @@ -107,6 +107,7 @@ async def flow_list( db=Depends(get_db), ): domain = get_activedomain(db, user.id) + print("domain=>",domain) flows = get_flows_by_app(db, domain.id, appid) return flows diff --git a/backend/app/core/config.py b/backend/app/core/config.py index 256a07e..ba07025 100644 --- a/backend/app/core/config.py +++ b/backend/app/core/config.py @@ -23,8 +23,11 @@ class KINTONE_ENV: API_V1_AUTH_VALUE = "" KINTONE_USER = "" + + DOMAIN_ID = "" def __init__(self,domain) -> None: + 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")) \ No newline at end of file diff --git a/frontend/.env.development b/frontend/.env.development index a5cdcf8..b5b12c7 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -1,2 +1,2 @@ -VUE_BACKEND_URL="http://localhost:8000/api/" - +#KAB_BACKEND_URL="https://kab-backend.azurewebsites.net/" +KAB_BACKEND_URL="http://127.0.0.1:8000/" diff --git a/frontend/package.json b/frontend/package.json index eed35cf..cc05306 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,6 +10,7 @@ "format": "prettier --write \"**/*.{js,ts,vue,scss,html,md,json}\" --ignore-path .gitignore", "test": "echo \"No test specified\" && exit 0", "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" diff --git a/frontend/quasar.config.js b/frontend/quasar.config.js index c592fdc..7cd68bf 100644 --- a/frontend/quasar.config.js +++ b/frontend/quasar.config.js @@ -10,12 +10,14 @@ const { configure } = require('quasar/wrappers'); -const dotenv = require('dotenv').config().parsed; -const package = require('./package.json'); +const envPath = process.env.LOCAL==='true'?'.env.development':'.env'; +const dotenv = require('dotenv').config({path:envPath}).parsed; +console.log('dotenv=>',dotenv); +// const package = require('./package.json'); const { Notify } = require('quasar'); -const version = package.version; -const productName=package.productName; -console.log(process.env); +const version = process.env.npm_package_version; +const productName=process.env.npm_package_productName; +// console.log(process.env); module.exports = configure(function (/* ctx */) { return { eslint: { diff --git a/frontend/src/components/left/EventTree.vue b/frontend/src/components/left/EventTree.vue index 077e03c..ee0b49f 100644 --- a/frontend/src/components/left/EventTree.vue +++ b/frontend/src/components/left/EventTree.vue @@ -28,7 +28,6 @@ import { IKintoneEvent } from '../../types/KintoneEvents'; import { storeToRefs } from 'pinia'; import { useFlowEditorStore } from 'stores/flowEditor'; import { ActionFlow, ActionNode, RootAction } from 'src/types/ActionTypes'; -import { S } from 'app/dist/spa/assets/QTable.50486f7c'; export default defineComponent({ name: 'EventTree', setup(props, context) {