From 8b40364722fe15a63208690f6003b8994acc345a Mon Sep 17 00:00:00 2001
From: Pang <aipaw@live.cn>
Date: Sun, 10 Mar 2024 00:36:07 +0800
Subject: [PATCH] no message

---
 cmd                                  | 10 ++++++++++
 docker/office/resources/require.js   |  1 -
 electron/build.js                    |  6 ++++--
 resources/assets/js/store/actions.js | 14 ++++++++------
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/cmd b/cmd
index cf1ff837a..8b589d30f 100755
--- a/cmd
+++ b/cmd
@@ -465,6 +465,16 @@ if [ $# -gt 0 ]; then
     elif [[ "$1" == "electron" ]]; then
         shift 1
         run_electron $@
+    elif [[ "$1" == "eeui" ]]; then
+        shift 1
+        cli="$@"
+        por=""
+        if [[ "$cli" == "build" ]]; then
+            cli="build --simple"
+        elif [[ "$cli" == "dev" ]]; then
+            por="-p 8880:8880"
+        fi
+        docker run -it --rm -v ${cur_path}/resources/mobile:/work -w /work ${por} kuaifan/eeui-cli:0.0.1 eeui ${cli}
     elif [[ "$1" == "doc" ]]; then
         shift 1
         run_exec php "php app/Http/Controllers/Api/apidoc.php"
diff --git a/docker/office/resources/require.js b/docker/office/resources/require.js
index 53943d355..1155ff81d 100644
--- a/docker/office/resources/require.js
+++ b/docker/office/resources/require.js
@@ -52,7 +52,6 @@
                 window._disableDownload = setInterval(function() {
                     var downloadBtn = document.getElementById("slot-hbtn-download")
                     if(downloadBtn) {
-                        console.log(1)
                         clearInterval(window._disableDownload);
                         document.getElementById("slot-hbtn-download")?.remove()
                         document.getElementById("fm-btn-download")?.remove()
diff --git a/electron/build.js b/electron/build.js
index 632f0e043..895d9b679 100644
--- a/electron/build.js
+++ b/electron/build.js
@@ -229,14 +229,16 @@ function startBuild(data) {
     fs.writeFileSync(indexFile, indexString, 'utf8');
     //
     if (data.id === 'app') {
+        const eeuiDir = path.resolve(__dirname, "../resources/mobile");
+        const eeuiCli = "kuaifan/eeui-cli:0.0.1"
         const publicDir = path.resolve(__dirname, "../resources/mobile/src/public");
         fse.removeSync(publicDir)
         fse.copySync(electronDir, publicDir)
         if (argv[3] === "setting") {
-            child_process.spawnSync("eeui", ["setting"], {stdio: "inherit", cwd: "resources/mobile"});
+            child_process.spawnSync("docker", `run -it --rm -v ${eeuiDir}:/work -w /work ${eeuiCli} eeui setting`.split(" "), {stdio: "inherit", cwd: "resources/mobile"});
         }
         if (['setting', 'build'].includes(argv[3])) {
-            child_process.spawnSync("eeui", ["build", "--simple"], {stdio: "inherit", cwd: "resources/mobile"});
+            child_process.spawnSync("docker", `run -it --rm -v ${eeuiDir}:/work -w /work ${eeuiCli} eeui build --simple`.split(" "), {stdio: "inherit", cwd: "resources/mobile"});
         } else {
             [
                 path.resolve(publicDir, "../../platforms/ios/eeuiApp/bundlejs/eeui/public"),
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index bf22b12eb..34bf756f5 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -117,7 +117,7 @@ export default {
             'version': window.systemInfo.version || "0.0.1",
             'platform': $A.Platform,
         }
-        if(!state.userToken && state.meetingWindow?.meetingSharekey){
+        if (!state.userToken && state.meetingWindow?.meetingSharekey) {
             header.sharekey = state.meetingWindow.meetingSharekey;
         }
         if ($A.isJson(params.header)) {
@@ -4017,11 +4017,13 @@ export default {
     },
 
     /**
-    * 显示会议窗口
-    * @param state
-    * @param type
-    * @param meetingid
-    */
+     * 显示会议窗口
+     * @param state
+     * @param type
+     * @param meetingid
+     * @param meetingdisabled
+     * @param meetingSharekey
+     */
     showMeetingWindow({state}, {type, meetingid, meetingdisabled, meetingSharekey}) {
         state.meetingWindow = {
             show: true,