diff --git a/controller/channel.go b/controller/channel.go index ff8ee5ee..2c38bf03 100644 --- a/controller/channel.go +++ b/controller/channel.go @@ -158,8 +158,8 @@ func SearchChannels(c *gin.Context) { keyword := c.Query("keyword") group := c.Query("group") modelKeyword := c.Query("model") - //idSort, _ := strconv.ParseBool(c.Query("id_sort")) - channels, err := model.SearchChannels(keyword, group, modelKeyword) + idSort, _ := strconv.ParseBool(c.Query("id_sort")) + channels, err := model.SearchChannels(keyword, group, modelKeyword, idSort) if err != nil { c.JSON(http.StatusOK, gin.H{ "success": false, @@ -294,10 +294,11 @@ func DeleteDisabledChannel(c *gin.Context) { } type ChannelTag struct { - Tag string `json:"tag"` - NewTag *string `json:"newTag"` - Priority *int64 `json:"priority"` - Weight *uint `json:"weight"` + Tag string `json:"tag"` + NewTag *string `json:"new_tag"` + Priority *int64 `json:"priority"` + Weight *uint `json:"weight"` + MapMapping *string `json:"map_mapping"` } func DisableTagChannels(c *gin.Context) { diff --git a/web/src/components/ChannelsTable.js b/web/src/components/ChannelsTable.js index 9be5e57a..e0bc332d 100644 --- a/web/src/components/ChannelsTable.js +++ b/web/src/components/ChannelsTable.js @@ -691,7 +691,7 @@ const ChannelsTable = () => { } setSearching(true); const res = await API.get( - `/api/channel/search?keyword=${searchKeyword}&group=${searchGroup}&model=${searchModel}` + `/api/channel/search?keyword=${searchKeyword}&group=${searchGroup}&model=${searchModel}&id_sort=${idSort}` ); const { success, message, data } = res.data; if (success) { diff --git a/web/src/pages/Channel/EditTagModal.js b/web/src/pages/Channel/EditTagModal.js index 9fe2b55d..ecbe52ef 100644 --- a/web/src/pages/Channel/EditTagModal.js +++ b/web/src/pages/Channel/EditTagModal.js @@ -8,7 +8,8 @@ const EditTagModal = (props) => { const [loading, setLoading] = useState(false); const originInputs = { tag: '', - newTag: null, + new_tag: null, + model_mapping: null, } const [inputs, setInputs] = useState(originInputs); @@ -18,11 +19,13 @@ const EditTagModal = (props) => { let data = { tag: tag, } - let shouldSave = true; if (inputs.newTag === tag) { setLoading(false); return; } + if (inputs.model_mapping !== null) { + data.model_mapping = inputs.model + } data.newTag = inputs.newTag; if (data.newTag === '') { Modal.confirm({ @@ -80,8 +83,8 @@ const EditTagModal = (props) => { setInputs({ ...inputs, newTag: value })} + value={inputs.new_tag} + onChange={(value) => setInputs({ ...inputs, new_tag: value })} placeholder="请输入新标签" />