[add] widgets config

service/middleware.go

@@ -80,8 +80,8 @@ func adminRoot() (string, int) {
 	}
 
 	adminRoot := "/yao/"
-	if root, ok := share.App.Optional["adminRoot"].(string); ok && root != "" {
+	if share.App.AdminRoot != "" {
-		root = strings.TrimPrefix(root, "/")
+		root := strings.TrimPrefix(share.App.AdminRoot, "/")
 		root = strings.TrimSuffix(root, "/")
 		adminRoot = fmt.Sprintf("/%s/", root)
 	}

share/types.go

@@ -80,6 +80,7 @@ type AppInfo struct {
 	Storage     AppStorage             `json:"storage,omitempty"`
 	Option      map[string]interface{} `json:"option,omitempty"`
 	XGen        string                 `json:"xgen,omitempty"`
+	AdminRoot   string                 `json:"adminRoot,omitempty"`
 	Optional    map[string]interface{} `json:"optional,omitempty"`
 }
 

widgets/chart/chart.go

@@ -174,6 +174,7 @@ func (dsl *DSL) Xgen() (map[string]interface{}, error) {
 	}
 
 	setting["fields"] = fields
+	setting["config"] = dsl.Config
 	for _, cProp := range dsl.CProps {
 		err := cProp.Replace(setting, func(cProp component.CloudPropsDSL) interface{} {
 			return map[string]interface{}{

widgets/chart/types.go

@@ -14,6 +14,7 @@ type DSL struct {
 	Action      *ActionDSL             `json:"action"`
 	Layout      *LayoutDSL             `json:"layout"`
 	Fields      *FieldsDSL             `json:"fields"`
+	Config      map[string]interface{} `json:"config,omitempty"`
 	ComputesIn  field.ComputeFields    `json:"-"`
 	ComputesOut field.ComputeFields    `json:"-"`
 	CProps      field.CloudProps       `json:"-"`

widgets/form/form.go

@@ -192,6 +192,7 @@ func (dsl *DSL) Xgen() (map[string]interface{}, error) {
 	}
 
 	setting["fields"] = fields
+	setting["config"] = dsl.Config
 	for _, cProp := range dsl.CProps {
 		err := cProp.Replace(setting, func(cProp component.CloudPropsDSL) interface{} {
 			return map[string]interface{}{

widgets/form/types.go

@@ -14,6 +14,7 @@ type DSL struct {
 	Action      *ActionDSL             `json:"action"`
 	Layout      *LayoutDSL             `json:"layout"`
 	Fields      *FieldsDSL             `json:"fields"`
+	Config      map[string]interface{} `json:"config,omitempty"`
 	ComputesIn  field.ComputeFields    `json:"-"`
 	ComputesOut field.ComputeFields    `json:"-"`
 	CProps      field.CloudProps       `json:"-"`

widgets/table/table.go

@@ -261,6 +261,7 @@ func (dsl *DSL) Xgen() (map[string]interface{}, error) {
 	}
 
 	setting["fields"] = fields
+	setting["config"] = dsl.Config
 	for _, cProp := range dsl.CProps {
 		err := cProp.Replace(setting, func(cProp component.CloudPropsDSL) interface{} {
 			return map[string]interface{}{

widgets/table/table_test.go

@@ -22,7 +22,7 @@ func TestLoad(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	assert.Equal(t, 6, len(Tables))
+	assert.Equal(t, 9, len(Tables))
 }
 
 func TestLoadID(t *testing.T) {

widgets/table/types.go

@@ -15,6 +15,7 @@ type DSL struct {
 	Action      *ActionDSL             `json:"action"`
 	Layout      *LayoutDSL             `json:"layout"`
 	Fields      *FieldsDSL             `json:"fields"`
+	Config      map[string]interface{} `json:"config,omitempty"`
 	ComputesIn  field.ComputeFields    `json:"-"`
 	ComputesOut field.ComputeFields    `json:"-"`
 	CProps      field.CloudProps       `json:"-"`