opencode/yao
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #214 from trheyi/main

Browse source 
[change] app.setting
This commit is contained in:
Max 2022-10-20 04:27:59 +08:00 • committed by GitHub
commit 2a1fc132ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
widgets/app/app.go
View file

@ -99,8 +99,8 @@ func exportAPI() error {
}
process := "yao.app.Xgen"
if Setting.Optional.Setting != "" {
process = Setting.Optional.Setting
if Setting.Setting != "" {
process = Setting.Setting
}
path := gou.Path{
@ -293,8 +293,8 @@ func processSetup(process *gou.Process) interface{} {
}
root := "yao"
if Setting.Optional.AdminRoot != "" {
root = Setting.Optional.AdminRoot
if Setting.AdminRoot != "" {
root = Setting.AdminRoot
}
setting, err := i18n.Trans(lang, []string{"app.app"}, Setting)
@ -518,11 +518,11 @@ func processXgen(process *gou.Process) interface{} {
// replaceAdminRoot
func (dsl *DSL) replaceAdminRoot() error {
if dsl.Optional.AdminRoot == "" {
dsl.Optional.AdminRoot = "yao"
if dsl.AdminRoot == "" {
dsl.AdminRoot = "yao"
}
root := strings.TrimPrefix(dsl.Optional.AdminRoot, "/")
root := strings.TrimPrefix(dsl.AdminRoot, "/")
root = strings.TrimSuffix(root, "/")
err := data.ReplaceXGen("/__yao_admin_root/", fmt.Sprintf("/%s/", root))
if err != nil {

24
widgets/app/app_test.go
View file

@ -26,8 +26,8 @@ func TestLoad(t *testing.T) {
assert.Equal(t, "::Another yao application", Setting.Description)
assert.Equal(t, []string{"demo"}, Setting.Menu.Args)
assert.Equal(t, "flows.app.menu", Setting.Menu.Process)
assert.Equal(t, true, Setting.Optional.HideNotification)
assert.Equal(t, false, Setting.Optional.HideSetting)
assert.Equal(t, true, Setting.Optional["hideNotification"])
assert.Equal(t, false, Setting.Optional["hideSetting"])
}
func TestLoadHK(t *testing.T) {
@ -53,16 +53,16 @@ func TestLoadHK(t *testing.T) {
assert.Equal(t, "又一個YAO應用", setting.Description)
assert.Equal(t, []string{"demo"}, setting.Menu.Args)
assert.Equal(t, "flows.app.menu", setting.Menu.Process)
assert.Equal(t, true, setting.Optional.HideNotification)
assert.Equal(t, false, setting.Optional.HideSetting)
assert.Equal(t, true, Setting.Optional["hideNotification"])
assert.Equal(t, false, Setting.Optional["hideSetting"])
assert.Equal(t, "::Demo Application", Setting.Name)
assert.Equal(t, "::Demo", Setting.Short)
assert.Equal(t, "::Another yao application", Setting.Description)
assert.Equal(t, []string{"demo"}, Setting.Menu.Args)
assert.Equal(t, "flows.app.menu", Setting.Menu.Process)
assert.Equal(t, true, Setting.Optional.HideNotification)
assert.Equal(t, false, Setting.Optional.HideSetting)
assert.Equal(t, true, Setting.Optional["hideNotification"])
assert.Equal(t, false, Setting.Optional["hideSetting"])
}
func TestLoadCN(t *testing.T) {
@ -88,16 +88,16 @@ func TestLoadCN(t *testing.T) {
assert.Equal(t, "又一个 YAO 应用", setting.Description)
assert.Equal(t, []string{"demo"}, setting.Menu.Args)
assert.Equal(t, "flows.app.menu", setting.Menu.Process)
assert.Equal(t, true, setting.Optional.HideNotification)
assert.Equal(t, false, setting.Optional.HideSetting)
assert.Equal(t, true, Setting.Optional["hideNotification"])
assert.Equal(t, false, Setting.Optional["hideSetting"])
assert.Equal(t, "::Demo Application", Setting.Name)
assert.Equal(t, "::Demo", Setting.Short)
assert.Equal(t, "::Another yao application", Setting.Description)
assert.Equal(t, []string{"demo"}, Setting.Menu.Args)
assert.Equal(t, "flows.app.menu", Setting.Menu.Process)
assert.Equal(t, true, Setting.Optional.HideNotification)
assert.Equal(t, false, Setting.Optional.HideSetting)
assert.Equal(t, true, Setting.Optional["hideNotification"])
assert.Equal(t, false, Setting.Optional["hideSetting"])
}
func TestExport(t *testing.T) {
@ -156,8 +156,8 @@ func TestProcessSetting(t *testing.T) {
assert.Equal(t, "Another yao application", setting.Description)
assert.Equal(t, []string{"demo"}, setting.Menu.Args)
assert.Equal(t, "flows.app.menu", setting.Menu.Process)
assert.Equal(t, true, setting.Optional.HideNotification)
assert.Equal(t, false, setting.Optional.HideSetting)
assert.Equal(t, true, Setting.Optional["hideNotification"])
assert.Equal(t, false, Setting.Optional["hideSetting"])
assert.Equal(t, true, setting.Sid != "")
// Set

9
widgets/app/types.go
View file

@ -12,7 +12,9 @@ type DSL struct {
Logo string `json:"logo,omitempty"`
Favicon string `json:"favicon,omitempty"`
Menu MenuDSL `json:"menu,omitempty"`
AdminRoot string `json:"adminRoot,omitempty"`
Optional OptionalDSL `json:"optional,omitempty"`
Setting string `json:"setting,omitempty"` // custom setting process
}
// MenuDSL the menu DSL
@ -22,12 +24,7 @@ type MenuDSL struct {
}
// OptionalDSL the Optional DSL
type OptionalDSL struct {
HideNotification bool `json:"hideNotification,omitempty"`
HideSetting bool `json:"hideSetting,omitempty"`
AdminRoot string `json:"adminRoot,omitempty"`
Setting string `json:"setting,omitempty"` // custom setting process
}
type OptionalDSL map[string]interface{}
// CFUN cloud function
type CFUN struct {