qor5 · zhangshanwen · Sep 5, 2024 · Sep 5, 2024 · Sep 5, 2024
diff --git a/autocomplete/builder.go b/autocomplete/builder.go
@@ -10,26 +10,33 @@ import (
 
 	"github.com/iancoleman/strcase"
 	"github.com/jinzhu/inflection"
-	vx "github.com/qor5/x/v3/ui/vuetifyx"
 	"go.uber.org/zap"
 	"gorm.io/gorm"
+
+	vx "github.com/qor5/x/v3/ui/vuetifyx"
 )
 
 type (
 	Builder struct {
-		prefix  string
-		db      *gorm.DB
-		logger  *zap.Logger
-		handler http.Handler
-		models  []*ModelBuilder
+		prefix           string
+		db               *gorm.DB
+		logger           *zap.Logger
+		handler          http.Handler
+		models           []*ModelBuilder
+		allowCrossOrigin bool
+	}
+
+	Handler interface {
+		Handle(pattern string, handler http.Handler)
 	}
 )
 
 func New() *Builder {
 	l, _ := zap.NewDevelopment()
 	return &Builder{
-		prefix: "",
-		logger: l,
+		prefix:           "",
+		logger:           l,
+		allowCrossOrigin: true,
 	}
 }
 
@@ -69,23 +76,26 @@ func (b *Builder) Prefix(v string) *Builder {
 	return b
 }
 
+func (b *Builder) AllowCrossOrigin(v bool) *Builder {
+	b.allowCrossOrigin = v
+	return b
+}
+
 func (b *Builder) Logger(v *zap.Logger) *Builder {
 	b.logger = v
 	return b
 }
 
-func (b *Builder) Build() {
+func (b *Builder) Mux(mux Handler) {
 	mns := b.modelNames()
 	if len(lo.Uniq(mns)) != len(mns) {
 		panic(fmt.Sprintf("Duplicated model names registered %v", mns))
 	}
-	b.initMux()
+	b.initMux(mux)
 }
 
-func (b *Builder) initMux() {
+func (b *Builder) initMux(mux Handler) {
 	b.logger.Info("initializing mux for", zap.Reflect("models", b.modelNames()), zap.String("prefix", b.prefix))
-	mux := http.NewServeMux()
-
 	for _, m := range b.models {
 		path := m.JsonHref()
 		mux.Handle(
@@ -94,33 +104,32 @@ func (b *Builder) initMux() {
 		)
 		b.logger.Info(fmt.Sprintf("mounted url: %s\n", path))
 	}
-	b.handler = mux
 }
 
 func (b *Builder) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if b.handler == nil {
-		b.Build()
+		mux := http.NewServeMux()
+		b.Mux(mux)
+		b.handler = mux
 	}
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-	w.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
-	w.Header().Set("Access-Control-Allow-Headers", "Content-Type, Authorization")
 	b.handler.ServeHTTP(w, r)
 }
 
 func NewDefaultAutocompleteDataSource(v string) *vx.AutocompleteDataSource {
 	return &vx.AutocompleteDataSource{
-		RemoteURL:   v,
-		IsPaging:    true,
-		ItemTitle:   "title",
-		ItemValue:   "id",
-		PageKey:     ParamPage,
-		PageSizeKey: ParamPageSize,
-		CurrentKey:  ResponseCurrent,
-		PagesKey:    ResponsePages,
-		TotalKey:    ResponseTotal,
-		SearchKey:   ParamSearch,
-		ItemsKey:    ResponseItems,
-		Page:        1,
-		PageSize:    5,
+		RemoteURL:     v,
+		IsPaging:      true,
+		ItemTitle:     "title",
+		ItemValue:     "id",
+		PageField:     ParamPage,
+		PageSizeField: ParamPageSize,
+		CurrentField:  ResponseCurrent,
+		PagesField:    ResponsePages,
+		TotalField:    ResponseTotal,
+		SearchField:   ParamSearch,
+		ItemsField:    ResponseItems,
+		Page:          1,
+		PageSize:      5,
+		Separator:     "__",
 	}
 }
diff --git a/autocomplete/integration/autocomplete_test.go b/autocomplete/integration/autocomplete_test.go
@@ -60,12 +60,11 @@ type (
 func Handler(db *gorm.DB) http.Handler {
 	_ = db.AutoMigrate(Category{}, User{})
 	mux := http.NewServeMux()
-	b := autocomplete.New().DB(db).Prefix("/complete")
-	b.Model(&Category{}).Columns("id", "name", "path")
+	b := autocomplete.New().DB(db).Prefix("/complete").AllowCrossOrigin(true)
+	b.Model(&Category{}).Columns("id", "name", "path").OrderBy("id desc")
 	b.Model(&User{}).Columns("id", "name", "age").SQLCondition("name ilike ?")
 	mux.Handle("/complete/", b)
-	b.Build()
-	return mux
+	return b
 }
 
 func runTest(t *testing.T, r *http.Request, handler http.Handler) *bytes.Buffer {

diff --git a/autocomplete/model.go b/autocomplete/model.go
@@ -70,15 +70,25 @@
 	return fmt.Sprintf("%s/%s", b.p.prefix, b.uriName)
 }
 
-func (mb *ModelBuilder) NewModel() (r interface{}) {
-	return reflect.New(mb.modelType.Elem()).Interface()
+func (b *ModelBuilder) NewModel() (r interface{}) {
+	return reflect.New(b.modelType.Elem()).Interface()
 }
 
-func (mb *ModelBuilder) NewModelSlice() (r interface{}) {
-	return reflect.New(reflect.SliceOf(mb.modelType)).Interface()
+func (b *ModelBuilder) NewModelSlice() (r interface{}) {
+	return reflect.New(reflect.SliceOf(b.modelType)).Interface()
+}
+
+func (b *ModelBuilder) crossOrigin(w http.ResponseWriter) {
+	if !b.p.allowCrossOrigin {
+		return
+	}
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+	w.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
+	w.Header().Set("Access-Control-Allow-Headers", "Content-Type, Authorization")
 }
 
 func (b *ModelBuilder) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	b.crossOrigin(w)
 	var (
 		db       = b.p.db
 		response = Response{

diff --git a/docs/docsrc/examples/examples_admin/autocomplete.go b/docs/docsrc/examples/examples_admin/autocomplete.go
@@ -2,11 +2,11 @@ package examples_admin
 
 import (
 	"net/http"
-
-	"gorm.io/gorm"
+	"strings"
 
 	"github.com/qor5/web/v3"
 	"github.com/qor5/x/v3/ui/vuetifyx"
+	"gorm.io/gorm"
 
 	"github.com/qor5/admin/v3/autocomplete"
 	"github.com/qor5/admin/v3/presets"
@@ -36,7 +36,7 @@ func AutoCompleteBasicFilterExample(b *presets.Builder, ab *autocomplete.Builder
 	abm1 := ab.Model(&AutoCompletePost{}).SQLCondition("title ilike ? ").
 		Columns("id", "title").Paging(true)
 	abm2 := ab.Model(&AutoCompletePost{}).SQLCondition("body ilike ? ").
 		Columns("id", "body").UriName("body").OrderBy("id desc")
+		Columns("id", "body").UriName("auto-complete-posts-body").OrderBy("id desc")
 
 	// Call FilterDataFunc
 	listing.FilterDataFunc(func(ctx *web.EventContext) vuetifyx.FilterData {
@@ -67,6 +67,9 @@ func AutoCompleteBasicFilterExample(b *presets.Builder, ab *autocomplete.Builder
 				// ? is the value of selected option
 				SQLCondition:           `title ilike ?`,
 				AutocompleteDataSource: titleConfig,
+				WrapInput: func(val string) interface{} {
+					return strings.Split(val, titleConfig.Separator)[0]
+				},
 			},
 			{
 				Key:      "body",
@@ -76,6 +79,9 @@ func AutoCompleteBasicFilterExample(b *presets.Builder, ab *autocomplete.Builder
 				// ? is the value of selected option
 				SQLCondition:           `body ilike ?`,
 				AutocompleteDataSource: bodyConfig,
+				WrapInput: func(val string) interface{} {
+					return strings.Split(val, bodyConfig.Separator)[0]
+				},
 			},
 		}
 	})

diff --git a/docs/docsrc/examples/examples_admin/autocomplete_test.go b/docs/docsrc/examples/examples_admin/autocomplete_test.go
@@ -5,15 +5,18 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/qor5/admin/v3/autocomplete"
 	"github.com/theplant/gofixtures"
 
-	"github.com/qor5/admin/v3/presets"
+	"github.com/qor5/admin/v3/autocomplete"
+
 	. "github.com/qor5/web/v3/multipartestutils"
+
+	"github.com/qor5/admin/v3/presets"
 )
 
 var autocompleteData = gofixtures.Data(gofixtures.Sql(`
 INSERT INTO public.auto_complete_posts (id, created_at, updated_at, deleted_at, title, body, status) VALUES (1, '2024-08-06 10:06:17.193170 +00:00', '2024-08-08 02:09:24.689204 +00:00', null, 'testname', 'test.body', '123131231');
+INSERT INTO public.auto_complete_posts (id, created_at, updated_at, deleted_at, title, body, status) VALUES (2, '2024-08-06 10:06:17.193170 +00:00', '2024-08-08 02:09:24.689204 +00:00', null, 'testname', 'test.title', '123131231');
 
 `, []string{"auto_complete_posts"}))
 
@@ -33,9 +36,20 @@ func TestAutoComplete(t *testing.T) {
 				autocompleteData.TruncatePut(dbr)
 				return httptest.NewRequest("GET", "/auto-complete-posts", nil)
 			},
-			ExpectPageBodyContainsInOrder: []string{"testname", "test.body"},
+			ExpectPageBodyContainsInOrder: []string{"test.title", "test.body"},
+		},
+		{
+			Name:  "Index AutoCompletePost Filter",
+			Debug: true,
+			ReqFunc: func() *http.Request {
+				autocompleteData.TruncatePut(dbr)
+				return httptest.NewRequest("GET", "/auto-complete-posts?f_title=test.title__2", nil)
+			},
+			ExpectPageBodyContainsInOrder: []string{"test.title"},
+			ExpectPageBodyNotContains:     []string{"test.body"},
 		},
 	}
+
 	for _, c := range cases {
 		t.Run(c.Name, func(t *testing.T) {
 			RunCase(t, c, b)

diff --git a/docs/docsrc/examples/examples_admin/linkage_select_filter_item_remote.go b/docs/docsrc/examples/examples_admin/linkage_select_filter_item_remote.go
@@ -0,0 +1,76 @@
+package examples_admin
+
+import (
+	"fmt"
+	"net/http"
+	"strings"
+
+	"github.com/qor5/web/v3"
+	"github.com/qor5/web/v3/examples"
+	h "github.com/theplant/htmlgo"
+	"gorm.io/gorm"
+
+	"github.com/qor5/admin/v3/docs/docsrc/examples/examples_presets"
+	"github.com/qor5/admin/v3/presets"
+	"github.com/qor5/admin/v3/presets/gorm2op"
+	vx "github.com/qor5/x/v3/ui/vuetifyx"
+)
+
+func LinkageSelectFilterItemRemoteExample(b *presets.Builder, mux examples.Muxer, db *gorm.DB) http.Handler {
+	b.DataOperator(gorm2op.DataOperator(db))
+	labels := []string{"Province", "City", "District"}
+	_ = db.AutoMigrate(&examples_presets.Address{})
+	mb := b.Model(&examples_presets.Address{})
+
+	eb := mb.Editing("ProvinceCityDistrict")
+
+	remoteUrl := "/examples/api/linkage-select-server"
+	eb.Field("ProvinceCityDistrict").ComponentFunc(func(obj interface{}, field *presets.FieldContext, ctx *web.EventContext) h.HTMLComponent {
+		return vx.VXLinkageSelectRemote().
+			Attr(web.VField(field.Name, []interface{}{})...).
+			Labels(labels...).
+			RemoteUrl(remoteUrl).
+			IsPaging(true).
+			LevelStart(1)
+	}).SetterFunc(func(obj interface{}, field *presets.FieldContext, ctx *web.EventContext) (err error) {
+		var vs []string
+		for i := 0; i < 3; i++ {
+			vs = append(vs, ctx.R.FormValue(fmt.Sprintf("ProvinceCityDistrict[%v].Name", i)))
+		}
+		m := obj.(*examples_presets.Address)
+		m.Province = vs[0]
+		m.City = vs[1]
+		m.District = vs[2]
+		return nil
+	})
+
+	lb := mb.Listing()
+	options := vx.DefaultVXLinkageSelectRemoteOptions("/examples/api/linkage-select-server")
+	wrapInputs := make([]func(val string) interface{}, 0)
+	for i := 0; i < 3; i++ {
+		wrapInputs = append(wrapInputs, func(val string) interface{} {
+			return strings.Split(val, options.Separator)[0]
+		})
+	}
+
+	lb.FilterDataFunc(func(ctx *web.EventContext) vx.FilterData {
+		return []*vx.FilterItem{
+			{
+				Key:      "province_city_district",
+				Label:    "Province&City&District",
+				ItemType: vx.ItemTypeLinkageSelectRemote,
+				LinkageSelectData: vx.FilterLinkageSelectData{
+					Labels:                     labels,
+					SelectOutOfOrder:           true,
+					SQLConditions:              []string{"province = ?", "city = ?", "district = ?"},
+					LinkageSelectRemoteOptions: options,
+					WrapInput:                  wrapInputs,
+				},
+				ValuesAre: []string{},
+			},
+		}
+	})
+	sever := LinkageSelectFilterItemRemoteServer{}
+	mux.Handle(remoteUrl, &sever)
+	return b
+}