[add] Integrate page builder

YaoApp · Dec 10, 2023 · d75ef3a · d75ef3a
1 parent 06c73e5
commit d75ef3a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -26,6 +26,7 @@ jobs:
           sudo apt-get install -y g++-aarch64-linux-gnu crossbuild-essential-arm64
           sudo apt-get install -y gcc-13-aarch64-linux-gnu
           sudo apt-get install -y g++-13-aarch64-linux-gnu
+          sudo apt-get install -y wget
 
       - name: Inspect Tools
         run: |

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -18,9 +18,9 @@ jobs:
     steps:
       - name: Install coscmd
         run: |
-          sudo /Library/Frameworks/Python.framework/Versions/3.11/bin/python -m pip install --upgrade pip
+          sudo /Library/Frameworks/Python.framework/Versions/3.12/bin/python -m pip install --upgrade pip
           sudo pip3 install coscmd 
-          echo "/Library/Frameworks/Python.framework/Versions/3.11/bin" >> $GITHUB_PATH
+          echo "/Library/Frameworks/Python.framework/Versions/3.12/bin" >> $GITHUB_PATH
 
       - name: Setup Node.js
         uses: actions/setup-node@v3

diff --git a/Makefile b/Makefile
@@ -155,6 +155,12 @@ artifacts-linux: clean
 	cd ../yao-init && rm -rf LICENSE
 #	cd ../yao-init rm -rf README.md
 
+#   Yao Builder
+	wget https://release-sv.yaoapps.com/archives/yao-builder-latest.tar.gz -O .tmp/yao-builder-latest.tar.gz
+	mkdir -p .tmp/data/builder
+	tar -zxvf .tmp/yao-builder-latest.tar.gz -C .tmp/data/builder
+	rm -rf .tmp/yao-builder-latest.tar.gz
+
 #	Packing
 	mkdir -p .tmp/data/xgen
 	cp -r ./ui .tmp/data/ui
@@ -205,6 +211,12 @@ artifacts-macos: clean
 	cd ../yao-init && rm -rf LICENSE
 #	 cd ../yao-init && rm -rf README.md
 
+#   Yao Builder
+	wget https://release-sv.yaoapps.com/archives/yao-builder-latest.tar.gz -O .tmp/yao-builder-latest.tar.gz
+	mkdir -p .tmp/data/builder
+	tar -zxvf .tmp/yao-builder-latest.tar.gz -C .tmp/data/builder
+	rm -rf .tmp/yao-builder-latest.tar.gz
+
 #	Packing
 	mkdir -p .tmp/data/xgen
 	cp -r ./ui .tmp/data/ui
@@ -284,6 +296,12 @@ release: clean
 	rm -rf .tmp/yao-init/LICENSE
 	rm -rf .tmp/yao-init/README.md
 
+#   Yao Builder
+	wget https://release-sv.yaoapps.com/archives/yao-builder-latest.tar.gz -O .tmp/yao-builder-latest.tar.gz
+	mkdir -p .tmp/data/builder
+	tar -zxvf .tmp/yao-builder-latest.tar.gz -C .tmp/data/builder
+	rm -rf .tmp/yao-builder-latest.tar.gz
+
 #	Packing
 	mkdir -p .tmp/data/xgen
 	cp -r ./ui .tmp/data/ui
@@ -338,6 +356,12 @@ linux-release: clean
 	rm -rf .tmp/yao-init/LICENSE
 	rm -rf .tmp/yao-init/README.md
 
+#   Yao Builder
+	wget https://release-sv.yaoapps.com/archives/yao-builder-latest.tar.gz -O .tmp/yao-builder-latest.tar.gz
+	mkdir -p .tmp/data/builder
+	tar -zxvf .tmp/yao-builder-latest.tar.gz -C .tmp/data/builder
+	rm -rf .tmp/yao-builder-latest.tar.gz
+
 #	Packing
 	mkdir -p .tmp/data/xgen
 	cp -r ./ui .tmp/data/ui

diff --git a/sui/api/process.go b/sui/api/process.go
@@ -257,7 +257,11 @@ func LocaleGet(process *process.Process) interface{} {
 		exception.New(err.Error(), 500).Throw()
 	}
 
-	return template.Locales()
+	locals := template.Locales()
+	if locals == nil {
+		return []core.SelectOption{}
+	}
+	return locals
 }
 
 // ThemeGet handle the find Template request