Merge branch 'dev' into feature-auto-lookup
# Conflicts: # frontend/src/components/AppFieldSelectBox.vue # frontend/src/components/right/AppFieldSelect.vue # plugin/kintone-addins/package.json # plugin/kintone-addins/src/actions/auto-lookup.ts # plugin/kintone-addins/src/types/action-process.ts # plugin/kintone-addins/vite.config.js
This commit is contained in:
@@ -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/"
|
||||
|
||||
@@ -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 },
|
||||
},
|
||||
|
||||
@@ -67,7 +67,10 @@ export default {
|
||||
const fld = fields[key];
|
||||
if(props.fieldTypes.length===0 || props.fieldTypes.includes(fld.type)){
|
||||
rows.push({ name: fld.label || fld.code, ...fld });
|
||||
}else if(props.fieldTypes.includes("lookup") && ("lookup" in fld)){
|
||||
rows.push({ name: fld.label || fld.code, ...fld });
|
||||
}
|
||||
|
||||
});
|
||||
isLoaded.value = true;
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user