#4050 fix-3956

Merged
chenshihai merged 4 commits from fix-3956 into V20230425 1 year ago
  1. +20
    -7
      web_src/js/components/images/Images.vue
  2. +8
    -5
      web_src/js/components/images/adminImages.vue
  3. +2
    -0
      web_src/js/features/i18nVue.js

+ 20
- 7
web_src/js/components/images/Images.vue View File

@@ -43,6 +43,7 @@
{{sortPublic | transformSort(vm)}}<i class="el-icon-caret-bottom el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{label:'defaultsort',sort:''}">{{$i18n['cloudeBrainMirror']['defaultsort']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'moststars',sort:'moststars'}">{{$i18n['cloudeBrainMirror']['moststars']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'mostused',sort:'mostused'}">{{$i18n['cloudeBrainMirror']['mostused']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'newest',sort:'newest'}">{{$i18n['cloudeBrainMirror']['newest']}}</el-dropdown-item>
@@ -243,6 +244,7 @@
{{sortPublic | transformSort(vm)}}<i class="el-icon-caret-bottom el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{label:'defaultsort',sort:''}">{{$i18n['cloudeBrainMirror']['defaultsort']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'moststars',sort:'moststars'}">{{$i18n['cloudeBrainMirror']['moststars']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'mostused',sort:'mostused'}">{{$i18n['cloudeBrainMirror']['mostused']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'newest',sort:'newest'}">{{$i18n['cloudeBrainMirror']['newest']}}</el-dropdown-item>
@@ -284,6 +286,7 @@
{{sortCustom | transformSort(vm)}}<i class="el-icon-caret-bottom el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{label:'defaultsort',sort:''}">{{$i18n['cloudeBrainMirror']['defaultsort']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'moststars',sort:'moststars'}">{{$i18n['cloudeBrainMirror']['moststars']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'mostused',sort:'mostused'}">{{$i18n['cloudeBrainMirror']['mostused']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'newest',sort:'newest'}">{{$i18n['cloudeBrainMirror']['newest']}}</el-dropdown-item>
@@ -527,6 +530,7 @@
{{sortCustom | transformSort(vm)}}<i class="el-icon-caret-bottom el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{label:'defaultsort',sort:''}">{{$i18n['cloudeBrainMirror']['defaultsort']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'moststars',sort:'moststars'}">{{$i18n['cloudeBrainMirror']['moststars']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'mostused',sort:'mostused'}">{{$i18n['cloudeBrainMirror']['mostused']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'newest',sort:'newest'}">{{$i18n['cloudeBrainMirror']['newest']}}</el-dropdown-item>
@@ -569,6 +573,7 @@
{{sortStar | transformSort(vm)}}<i class="el-icon-caret-bottom el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{label:'defaultsort',sort:''}">{{$i18n['cloudeBrainMirror']['defaultsort']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'moststars',sort:'moststars'}">{{$i18n['cloudeBrainMirror']['moststars']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'mostused',sort:'mostused'}">{{$i18n['cloudeBrainMirror']['mostused']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'newest',sort:'newest'}">{{$i18n['cloudeBrainMirror']['newest']}}</el-dropdown-item>
@@ -761,6 +766,7 @@
{{sortStar | transformSort(vm)}}<i class="el-icon-caret-bottom el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{label:'defaultsort',sort:''}">{{$i18n['cloudeBrainMirror']['defaultsort']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'moststars',sort:'moststars'}">{{$i18n['cloudeBrainMirror']['moststars']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'mostused',sort:'mostused'}">{{$i18n['cloudeBrainMirror']['mostused']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'newest',sort:'newest'}">{{$i18n['cloudeBrainMirror']['newest']}}</el-dropdown-item>
@@ -789,28 +795,28 @@ export default {
currentPagePublic: 1,
pageSizePublic: 10,
totalNumPublic: 0,
paramsPublic: { page: 1, pageSize: 10, q: "", recommend: false,cloudbrainType:-1,sort:"moststars" },
paramsPublic: { page: 1, pageSize: 10, q: "", recommend: false,cloudbrainType:-1,sort:"" },
tableDataPublic: [],
loadingPublic: false,
sortPublic:'moststars',
sortPublic:'defaultsort',

currentPageCustom: 1,
pageSizeCustom: 10,
totalNumCustom: 0,
paramsCustom: { page: 1, pageSize: 10, q: "",cloudbrainType:-1,sort:"moststars" },
paramsCustom: { page: 1, pageSize: 10, q: "",cloudbrainType:-1,sort:"" },
tableDataCustom: [],
starCustom: [],
loadingCustom: false,
refreshCustomTimer: null,
sortCustom:'moststars',
sortCustom:'defaultsort',

currentPageStar: 1,
pageSizeStar: 10,
totalNumStar: 0,
paramsStar: { page: 1, pageSize: 10, q: "",cloudbrainType:-1 ,sort:"moststars"},
paramsStar: { page: 1, pageSize: 10, q: "",cloudbrainType:-1 ,sort:""},
tableDataStar: [],
loadingStar: false,
sortStar:'moststars',
sortStar:'defaultsort',
vm:this,
};
},
@@ -1058,6 +1064,8 @@ export default {
return vm.$i18n['cloudeBrainMirror']['moststars'];
} else if(val==='mostused'){
return vm.$i18n['cloudeBrainMirror']['mostused'];
}else if(val==='defaultsort'){
return vm.$i18n['cloudeBrainMirror']['defaultsort'];
}else{
return vm.$i18n['cloudeBrainMirror']['newest'];
}
@@ -1090,7 +1098,12 @@ export default {
this.getImageListPublic();
},
},
mounted() {},
mounted() {
const lang = document.querySelector('html').getAttribute('lang');
if(lang!='zh-CN'){
document.getElementsByClassName('el-col-2').forEach((item)=>{item.style.width="10%"})
}
},
created() {
this.$i18n = window.i18n;
const params = new URLSearchParams(location.search);


+ 8
- 5
web_src/js/components/images/adminImages.vue View File

@@ -43,9 +43,10 @@
{{sortCustom | transformSort(vm)}}<i class="el-icon-caret-bottom el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{label:'moststars',sort:'moststars'}">{{$i18n['cloudeBrainMirror']['moststars']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'mostused',sort:'mostused'}">{{$i18n['cloudeBrainMirror']['mostused']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'newest',sort:'newest'}">{{$i18n['cloudeBrainMirror']['newest']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'defaultsort',sort:''}">{{$i18n['cloudeBrainMirror']['defaultsort']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'moststars',sort:'moststars'}">{{$i18n['cloudeBrainMirror']['moststars']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'mostused',sort:'mostused'}">{{$i18n['cloudeBrainMirror']['mostused']}}</el-dropdown-item>
<el-dropdown-item :command="{label:'newest',sort:'newest'}">{{$i18n['cloudeBrainMirror']['newest']}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -180,13 +181,13 @@
currentPageCustom: 1,
pageSizeCustom: 15,
totalNumCustom: 0,
paramsCustom: { page: 1, pageSize: 15, q: '', recommend: false,sort:'moststars', },
paramsCustom: { page: 1, pageSize: 15, q: '', recommend: false,sort:'', },
tableDataCustom: [],
starCustom: [],
loadingCustom: false,
vm:this,
firstSearch:false,
sortCustom:'moststars',
sortCustom:'defaultsort',
};
},
methods: {
@@ -316,6 +317,8 @@
return vm.$i18n['cloudeBrainMirror']['moststars'];
} else if(val==='mostused'){
return vm.$i18n['cloudeBrainMirror']['mostused'];
}else if(val==='defaultsort'){
return vm.$i18n['cloudeBrainMirror']['defaultsort'];
}else{
return vm.$i18n['cloudeBrainMirror']['newest'];
}


+ 2
- 0
web_src/js/features/i18nVue.js View File

@@ -135,6 +135,7 @@ export const i18nVue = {
create_cloud_brain_mirror: '创建云脑镜像',
openi: '启智',
c2net: '智算网络',
defaultsort: '默认排序',
moststars: '最多收藏',
mostused: '最多引用',
newest:'最新创建'
@@ -295,6 +296,7 @@ export const i18nVue = {
create_cloud_brain_mirror: 'Create cloud brain mirror',
openi: 'OpenI',
c2net: 'C²NET',
defaultsort: 'Default Sort',
moststars: 'Most Stars',
mostused: 'Most Quote',
newest:'Newest Create'


Loading…
Cancel
Save