From 97514916b46ac9929338afc3019fe7797e7ca88f Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Thu, 19 Sep 2024 16:37:00 +0800 Subject: [PATCH] update --- erm.frontend/package.json | 2 +- erm.frontend/public/index.html | 1 + erm.frontend/public/tailwind.css.js | 62 +++ .../webjars/tailwindcss/3.4.5/tailwind.css.js | 62 +++ erm.frontend/webpack.config.common.cjs | 7 - gradle.properties | 2 +- io.sc.engine.mv.frontend/package.json | 2 +- io.sc.engine.mv.frontend/public/index.html | 1 + .../public/tailwind.css.js | 62 +++ .../webjars/tailwindcss/3.4.5/tailwind.css.js | 62 +++ .../webpack.config.common.cjs | 7 - io.sc.engine.rule.frontend/package.json | 2 +- io.sc.engine.rule.frontend/public/index.html | 1 + .../public/tailwind.css.js | 62 +++ .../webjars/tailwindcss/3.4.5/tailwind.css.js | 62 +++ .../designer/ExecutionFlowDialog.vue | 2 +- .../webpack.config.common.cjs | 7 - io.sc.engine.st.frontend/package.json | 2 +- io.sc.engine.st.frontend/public/index.html | 1 + .../public/tailwind.css.js | 62 +++ .../webjars/tailwindcss/3.4.5/tailwind.css.js | 62 +++ .../webpack.config.common.cjs | 7 - io.sc.platform.app/build.gradle | 5 +- io.sc.platform.core.frontend/.bin/util.js | 14 +- io.sc.platform.core.frontend/package.json | 2 +- .../public/index.html | 1 + .../webjars/tailwindcss/3.4.5/tailwind.css.js | 62 +++ io.sc.platform.core.frontend/src/boostrap.ts | 1 - .../src/platform/components/graph/WGraph.vue | 4 +- .../template-project/package.json | 4 +- .../template-project/public/index.html | 1 + .../webjars/tailwindcss/3.4.5/tailwind.css.js | 62 +++ .../template-project/src/boostrap.ts | 1 - .../webpack.config.common.cjs | 7 - .../package.json | 2 +- .../public/index.html | 1 + .../public/tailwind.css.js | 62 +++ .../webjars/tailwindcss/3.4.5/tailwind.css.js | 62 +++ .../webpack.config.common.cjs | 7 - io.sc.platform.lcdp.frontend/package.json | 2 +- .../public/flowable/modeler/index.html | 504 +++++++++--------- .../modeler/libs/angular_1.3.13/angular.js | 4 +- .../public/flowable/modeler/scripts/app.js | 12 +- .../public/index.html | 1 + .../public/tailwind.css.js | 62 +++ .../webjars/tailwindcss/3.4.5/tailwind.css.js | 62 +++ .../src/views/Theme.vue | 1 + .../src/views/bpm/Bpm.vue | 10 +- .../src/views/bpm/ProcessDesigner.vue | 14 +- .../webpack.config.common.cjs | 7 - io.sc.platform.mvc.frontend/package.json | 2 +- io.sc.platform.mvc.frontend/public/index.html | 1 + .../public/tailwind.css.js | 62 +++ .../webjars/tailwindcss/3.4.5/tailwind.css.js | 62 +++ .../webpack.config.common.cjs | 7 - .../package.json | 2 +- .../public/index.html | 1 + .../public/tailwind.css.js | 62 +++ .../webjars/tailwindcss/3.4.5/tailwind.css.js | 62 +++ .../webpack.config.common.cjs | 7 - io.sc.platform.system.frontend/package.json | 2 +- .../public/index.html | 1 + .../public/tailwind.css.js | 62 +++ .../webjars/tailwindcss/3.4.5/tailwind.css.js | 62 +++ .../webpack.config.common.cjs | 7 - io.sc.standard.frontend/package.json | 2 +- io.sc.standard.frontend/public/index.html | 1 + .../public/tailwind.css.js | 62 +++ .../webjars/tailwindcss/3.4.5/tailwind.css.js | 62 +++ .../webpack.config.common.cjs | 7 - .../build.gradle | 23 +- .../2.1.13/assets/iconfont/Anton-Regular.ttf | Bin .../assets/iconfont/HanaleiFill-Regular.ttf | Bin .../assets/iconfont/Pacifico-Regular.ttf | Bin .../2.1.13/assets/iconfont/demo.css | 0 .../2.1.13/assets/iconfont/demo_index.html | 0 .../2.1.13/assets/iconfont/iconfont.css | 0 .../2.1.13/assets/iconfont/iconfont.eot | Bin .../2.1.13/assets/iconfont/iconfont.js | 0 .../2.1.13/assets/iconfont/iconfont.json | 0 .../2.1.13/assets/iconfont/iconfont.svg | 0 .../2.1.13/assets/iconfont/iconfont.ttf | Bin .../2.1.13/assets/iconfont/iconfont.woff | Bin .../2.1.13/assets/iconfont/iconfont.woff2 | Bin .../webjars/luckysheet/2.1.13/css/EwaAntH.gif | Bin .../webjars/luckysheet/2.1.13/css/EwaAntV.gif | Bin .../luckysheet/2.1.13/css/arrow-down.png | Bin .../webjars/luckysheet/2.1.13/css/loading.gif | Bin .../luckysheet/2.1.13/css/luckysheet.css | 0 .../luckysheet/2.1.13/css/menuSprite.svg | 0 .../luckysheet/2.1.13/css/paint_16px.ico | Bin .../luckysheet/2.1.13/css/paint_24px.ico | Bin .../luckysheet/2.1.13/css/paint_32px.ico | Bin .../luckysheet/2.1.13/css/sprite38.svg | 0 .../luckysheet/2.1.13/css/waffle_sprite.png | Bin .../luckysheet/2.1.13/demoData/demoFeature.js | 0 .../luckysheet/2.1.13/demoData/sheetCell.js | 0 .../luckysheet/2.1.13/demoData/sheetChart.js | 0 .../2.1.13/demoData/sheetComment.js | 0 .../2.1.13/demoData/sheetConditionFormat.js | 0 .../2.1.13/demoData/sheetDataVerification.js | 0 .../2.1.13/demoData/sheetFormula.js | 0 .../2.1.13/demoData/sheetPicture.js | 0 .../2.1.13/demoData/sheetPivotTable.js | 0 .../2.1.13/demoData/sheetPivotTableData.js | 0 .../2.1.13/demoData/sheetSparkline.js | 0 .../luckysheet/2.1.13/demoData/sheetTable.js | 0 .../2.1.13/expendPlugins/chart/chartmix.css | 0 .../expendPlugins/chart/chartmix.umd.min.js | 0 .../luckysheet/2.1.13/fonts/FontAwesome.otf | Bin .../2.1.13/fonts/fontawesome-webfont.eot | Bin .../2.1.13/fonts/fontawesome-webfont.svg | 0 .../2.1.13/fonts/fontawesome-webfont.ttf | Bin .../2.1.13/fonts/fontawesome-webfont.woff | Bin .../2.1.13/fonts/fontawesome-webfont.woff2 | Bin .../webjars/luckysheet/2.1.13/index.html | 0 .../luckysheet/2.1.13/luckysheet.umd.js | 0 .../luckysheet/2.1.13/luckysheet.umd.js.map | 0 .../2.1.13/plugins/css/pluginsCss.css | 0 .../plugins/images/CFcolorGradation.png | Bin .../2.1.13/plugins/images/CFdataBar.png | Bin .../2.1.13/plugins/images/CFicons.png | Bin .../2.1.13/plugins/images/icon_dropCell.png | Bin .../luckysheet/2.1.13/plugins/images/js.png | Bin .../images/ui-icons_444444_256x240.png | Bin .../images/ui-icons_555555_256x240.png | Bin .../images/ui-icons_777620_256x240.png | Bin .../images/ui-icons_777777_256x240.png | Bin .../images/ui-icons_cc0000_256x240.png | Bin .../images/ui-icons_ffffff_256x240.png | Bin .../luckysheet/2.1.13/plugins/js/plugin.js | 0 .../luckysheet/2.1.13/plugins/plugins.css | 0 .../webjars/tailwindcss/3.4.5/tailwind.css.js | 62 +++ settings.gradle | 2 +- 134 files changed, 1755 insertions(+), 385 deletions(-) create mode 100644 erm.frontend/public/tailwind.css.js create mode 100644 erm.frontend/public/webjars/tailwindcss/3.4.5/tailwind.css.js create mode 100644 io.sc.engine.mv.frontend/public/tailwind.css.js create mode 100644 io.sc.engine.mv.frontend/public/webjars/tailwindcss/3.4.5/tailwind.css.js create mode 100644 io.sc.engine.rule.frontend/public/tailwind.css.js create mode 100644 io.sc.engine.rule.frontend/public/webjars/tailwindcss/3.4.5/tailwind.css.js create mode 100644 io.sc.engine.st.frontend/public/tailwind.css.js create mode 100644 io.sc.engine.st.frontend/public/webjars/tailwindcss/3.4.5/tailwind.css.js create mode 100644 io.sc.platform.core.frontend/public/webjars/tailwindcss/3.4.5/tailwind.css.js create mode 100644 io.sc.platform.core.frontend/template-project/public/webjars/tailwindcss/3.4.5/tailwind.css.js create mode 100644 io.sc.platform.developer.frontend/public/tailwind.css.js create mode 100644 io.sc.platform.developer.frontend/public/webjars/tailwindcss/3.4.5/tailwind.css.js create mode 100644 io.sc.platform.lcdp.frontend/public/tailwind.css.js create mode 100644 io.sc.platform.lcdp.frontend/public/webjars/tailwindcss/3.4.5/tailwind.css.js create mode 100644 io.sc.platform.mvc.frontend/public/tailwind.css.js create mode 100644 io.sc.platform.mvc.frontend/public/webjars/tailwindcss/3.4.5/tailwind.css.js create mode 100644 io.sc.platform.scheduler.manager.frontend/public/tailwind.css.js create mode 100644 io.sc.platform.scheduler.manager.frontend/public/webjars/tailwindcss/3.4.5/tailwind.css.js create mode 100644 io.sc.platform.system.frontend/public/tailwind.css.js create mode 100644 io.sc.platform.system.frontend/public/webjars/tailwindcss/3.4.5/tailwind.css.js create mode 100644 io.sc.standard.frontend/public/tailwind.css.js create mode 100644 io.sc.standard.frontend/public/webjars/tailwindcss/3.4.5/tailwind.css.js rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/build.gradle (54%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/assets/iconfont/Anton-Regular.ttf (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/assets/iconfont/HanaleiFill-Regular.ttf (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/assets/iconfont/Pacifico-Regular.ttf (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/assets/iconfont/demo.css (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/assets/iconfont/demo_index.html (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/assets/iconfont/iconfont.css (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/assets/iconfont/iconfont.eot (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/assets/iconfont/iconfont.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/assets/iconfont/iconfont.json (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/assets/iconfont/iconfont.svg (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/assets/iconfont/iconfont.ttf (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/assets/iconfont/iconfont.woff (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/assets/iconfont/iconfont.woff2 (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/css/EwaAntH.gif (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/css/EwaAntV.gif (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/css/arrow-down.png (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/css/loading.gif (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/css/luckysheet.css (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/css/menuSprite.svg (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/css/paint_16px.ico (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/css/paint_24px.ico (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/css/paint_32px.ico (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/css/sprite38.svg (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/css/waffle_sprite.png (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/demoData/demoFeature.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/demoData/sheetCell.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/demoData/sheetChart.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/demoData/sheetComment.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/demoData/sheetConditionFormat.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/demoData/sheetDataVerification.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/demoData/sheetFormula.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/demoData/sheetPicture.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/demoData/sheetPivotTable.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/demoData/sheetPivotTableData.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/demoData/sheetSparkline.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/demoData/sheetTable.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/expendPlugins/chart/chartmix.css (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/expendPlugins/chart/chartmix.umd.min.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/fonts/FontAwesome.otf (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/fonts/fontawesome-webfont.eot (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/fonts/fontawesome-webfont.svg (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/fonts/fontawesome-webfont.ttf (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/fonts/fontawesome-webfont.woff (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/fonts/fontawesome-webfont.woff2 (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/index.html (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/luckysheet.umd.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/luckysheet.umd.js.map (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/plugins/css/pluginsCss.css (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/plugins/images/CFcolorGradation.png (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/plugins/images/CFdataBar.png (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/plugins/images/CFicons.png (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/plugins/images/icon_dropCell.png (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/plugins/images/js.png (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/plugins/images/ui-icons_444444_256x240.png (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/plugins/images/ui-icons_555555_256x240.png (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/plugins/images/ui-icons_777620_256x240.png (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/plugins/images/ui-icons_777777_256x240.png (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/plugins/images/ui-icons_cc0000_256x240.png (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/plugins/images/ui-icons_ffffff_256x240.png (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/plugins/js/plugin.js (100%) rename {org.webjars.luckysheet-2.1.13 => io.sc.webjars}/src/main/resources/META-INF/resources/webjars/luckysheet/2.1.13/plugins/plugins.css (100%) create mode 100644 io.sc.webjars/src/main/resources/META-INF/resources/webjars/tailwindcss/3.4.5/tailwind.css.js diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 0288aaf7..9b40cb15 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -93,7 +93,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.2.2", - "platform-core": "8.1.349", + "platform-core": "8.1.352", "quasar": "2.16.11", "tailwindcss": "3.4.10", "vue": "3.5.4", diff --git a/erm.frontend/public/index.html b/erm.frontend/public/index.html index 3af1ca9a..cf3966b6 100644 --- a/erm.frontend/public/index.html +++ b/erm.frontend/public/index.html @@ -20,6 +20,7 @@ + + + + + + +
-
- - {{alerts.current.message}} +
+ + {{alerts.current.message}} -
- {{alerts.queue.length + 1}} -
+
+ {{alerts.queue.length + 1}}
+
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/io.sc.platform.lcdp.frontend/public/flowable/modeler/libs/angular_1.3.13/angular.js b/io.sc.platform.lcdp.frontend/public/flowable/modeler/libs/angular_1.3.13/angular.js index af2bde6e..973ac79d 100644 --- a/io.sc.platform.lcdp.frontend/public/flowable/modeler/libs/angular_1.3.13/angular.js +++ b/io.sc.platform.lcdp.frontend/public/flowable/modeler/libs/angular_1.3.13/angular.js @@ -8736,7 +8736,7 @@ function $HttpProvider() { defaults.headers.common.Authorization=authenticationHeaders.headers.Authorization; } console.log(defaults); - + // end modify by wsp var useApplyAsync = false; @@ -26136,4 +26136,4 @@ var minlengthDirective = function() { })(window, document); -!window.angular.$$csp() && window.angular.element(document).find('head').prepend(''); \ No newline at end of file +!window.angular.$$csp() && window.angular.element(document).find('head').prepend(''); diff --git a/io.sc.platform.lcdp.frontend/public/flowable/modeler/scripts/app.js b/io.sc.platform.lcdp.frontend/public/flowable/modeler/scripts/app.js index 6a227ec3..5085e48b 100644 --- a/io.sc.platform.lcdp.frontend/public/flowable/modeler/scripts/app.js +++ b/io.sc.platform.lcdp.frontend/public/flowable/modeler/scripts/app.js @@ -349,11 +349,19 @@ flowableModeler } }; - $http.get(FLOWABLE.APP_URL.getAccountUrl()) + // begin modify by wsp + $http.get(FLOWABLE.APP_URL.getAccountUrl(),{ + headers:{ + Authorization: 'Bearer ' + localStorage.getItem('access_token'), + } + }) + //$http.get(FLOWABLE.APP_URL.getAccountUrl()) + // end modify by wsp .success(function (data, status, headers, config) { + console.log(headers); $rootScope.account = data; $rootScope.invalidCredentials = false; - $rootScope.authenticated = true; + $rootScope.authenticated = true; }); $rootScope.logout = function () { diff --git a/io.sc.platform.lcdp.frontend/public/index.html b/io.sc.platform.lcdp.frontend/public/index.html index 3af1ca9a..cf3966b6 100644 --- a/io.sc.platform.lcdp.frontend/public/index.html +++ b/io.sc.platform.lcdp.frontend/public/index.html @@ -20,6 +20,7 @@ + + + + +