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

[change] widget table DSL (import actions)

Browse source
This commit is contained in:
Max 2022-11-10 17:18:39 +08:00
parent 7526ccaaf2
commit ef07366fbd
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
widgets/table/layout.go
View file

@ -181,7 +181,6 @@ func (layout *LayoutDSL) Xgen() (map[string]interface{}, error) {
// replace import // replace import
if layout.Header != nil && layout.Header.Preset != nil && layout.Header.Preset.Import != nil { if layout.Header != nil && layout.Header.Preset != nil && layout.Header.Preset.Import != nil {
name := layout.Header.Preset.Import.Name name := layout.Header.Preset.Import.Name
operation := layout.Header.Preset.Import.Operation
res["header"].(map[string]interface{})["preset"].(map[string]interface{})["import"] = map[string]interface{}{ res["header"].(map[string]interface{})["preset"].(map[string]interface{})["import"] = map[string]interface{}{
"api": map[string]interface{}{ "api": map[string]interface{}{
"setting": fmt.Sprintf("/api/xiang/import/%s/setting", name), "setting": fmt.Sprintf("/api/xiang/import/%s/setting", name),
@ -191,7 +190,7 @@ func (layout *LayoutDSL) Xgen() (map[string]interface{}, error) {
"mapping_setting_model": fmt.Sprintf("import_%s_mapping", name), "mapping_setting_model": fmt.Sprintf("import_%s_mapping", name),
"preview_setting_model": fmt.Sprintf("import_%s_preview", name), "preview_setting_model": fmt.Sprintf("import_%s_preview", name),
}, },
"operation": operation, "actions": layout.Header.Preset.Import.Actions,
} }
} }

6
widgets/table/process_test.go
View file

@ -351,7 +351,8 @@ func TestProcessSetting(t *testing.T) {
data := any.Of(res).MapStr().Dot() data := any.Of(res).MapStr().Dot()
assert.Equal(t, "/api/xiang/import/pet", data.Get("header.preset.import.api.import")) assert.Equal(t, "/api/xiang/import/pet", data.Get("header.preset.import.api.import"))
// assert.Equal(t, "跳转", data.Get("header.preset.import.operation.0.title")) assert.Equal(t, "查看详情1", data.Get("header.preset.import.actions[0].title"))
assert.Equal(t, "查看详情2", data.Get("header.preset.import.actions[1].title"))
assert.Equal(t, "/api/__yao/table/pet/component/fields.table.入院状态.view.props.xProps/remote", data.Get("fields.table.入院状态.view.props.xProps.remote.api")) assert.Equal(t, "/api/__yao/table/pet/component/fields.table.入院状态.view.props.xProps/remote", data.Get("fields.table.入院状态.view.props.xProps.remote.api"))
assert.Equal(t, "/api/__yao/table/pet/component/fields.table.入院状态.edit.props.xProps/remote", data.Get("fields.table.入院状态.edit.props.xProps.remote.api")) assert.Equal(t, "/api/__yao/table/pet/component/fields.table.入院状态.edit.props.xProps/remote", data.Get("fields.table.入院状态.edit.props.xProps.remote.api"))
} }
@ -368,7 +369,8 @@ func TestProcessXgen(t *testing.T) {
data := any.Of(res).MapStr().Dot() data := any.Of(res).MapStr().Dot()
assert.Equal(t, "/api/xiang/import/pet", data.Get("header.preset.import.api.import")) assert.Equal(t, "/api/xiang/import/pet", data.Get("header.preset.import.api.import"))
// assert.Equal(t, "跳转", data.Get("header.preset.import.operation.0.title")) assert.Equal(t, "查看详情1", data.Get("header.preset.import.actions[0].title"))
assert.Equal(t, "查看详情2", data.Get("header.preset.import.actions[1].title"))
assert.Equal(t, "/api/__yao/table/pet/component/fields.table.入院状态.view.props.xProps/remote", data.Get("fields.table.入院状态.view.props.xProps.remote.api")) assert.Equal(t, "/api/__yao/table/pet/component/fields.table.入院状态.view.props.xProps/remote", data.Get("fields.table.入院状态.view.props.xProps.remote.api"))
assert.Equal(t, "/api/__yao/table/pet/component/fields.table.入院状态.edit.props.xProps/remote", data.Get("fields.table.入院状态.edit.props.xProps.remote.api")) assert.Equal(t, "/api/__yao/table/pet/component/fields.table.入院状态.edit.props.xProps/remote", data.Get("fields.table.入院状态.edit.props.xProps.remote.api"))
} }

8
widgets/table/types.go
View file

@ -102,13 +102,7 @@ type BatchPresetDSL struct {
// ImportPresetDSL layout.header.preset.import // ImportPresetDSL layout.header.preset.import
type ImportPresetDSL struct { type ImportPresetDSL struct {
Name string `json:"name,omitempty"` Name string `json:"name,omitempty"`
Operation []OperationImportDSL `json:"operation,omitempty"` Actions []component.ActionDSL `json:"actions,omitempty"`
}
// OperationImportDSL layout.header.preset.import.operation[*]
type OperationImportDSL struct {
Title string `json:"title,omitempty"`
Link string `json:"link,omitempty"`
} }
// FilterLayoutDSL layout.filter // FilterLayoutDSL layout.filter