sileya-ai
/
vr-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-sws' into dev-yxl

v1.0.0
于肖磊 2024-09-05 15:48:23 +08:00
parent 9e0f32235d bb65290daf
commit a5451c3e9b
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/common/upload/index.vue
View File

@ -134,7 +134,7 @@
</div> </div>
</div> </div>
<div class="mt-10 flex-row jc-e"> <div class="mt-10 flex-row jc-e">
<el-pagination :current-page="page" background :page-size="30" :pager-count="5" layout="prev, pager, next" :total="data_total" @current-change="current_page_change" /> <el-pagination :current-page="page" background :page-size="page_size" :pager-count="5" layout="prev, pager, next" :total="data_total" @current-change="current_page_change" />
</div> </div>
</div> </div>
</div> </div>
@ -462,6 +462,7 @@ const remove_type_event = (node: any, data: Tree) => {
// const page_total = ref(0); // const page_total = ref(0);
// 当前页 // 当前页
const page = ref(1); const page = ref(1);
const page_size = ref(21);
// 总数量 // 总数量
const data_total = ref(0); const data_total = ref(0);
// 名称查询 // 名称查询
@ -477,6 +478,7 @@ const get_attachment_list = (type?: string) => {
img_loading.value = true; img_loading.value = true;
const new_data = { const new_data = {
page: page.value, page: page.value,
page_size: page_size.value,
type: upload_type.value == 'img' ? 'image' : upload_type.value == 'video' ? 'video' : upload_type.value == 'file' ? 'file' : '', type: upload_type.value == 'img' ? 'image' : upload_type.value == 'video' ? 'video' : upload_type.value == 'file' ? 'file' : '',
keywords: search_name.value, keywords: search_name.value,
category_id: category_id.value, category_id: category_id.value,

14
src/components/common/url-value/url-value-dialog.vue
View File

@ -6,9 +6,9 @@
</div> </div>
</template> </template>
<div class="url-value-content pa-20 flex-row"> <div class="url-value-content pa-20 flex-row">
<div v-if="type.length !== 1" class="left-content"> <div v-if="custom_link_type.length !== 1" class="left-content">
<el-menu :default-active="link_select" class="w br-none" @select="handle_select"> <el-menu :default-active="link_select" class="w br-none" @select="handle_select">
<el-menu-item v-for="item in base_data" :key="item.type" :index="item.type" :disabled="!(custom_link_type.length == 0 || custom_link_type.includes(item.type))"> <el-menu-item v-for="item in base_data" :key="item.type" :index="item.type" :disabled="!custom_link_type.includes(item.type)">
<span>{{ item.name }}</span> <span>{{ item.name }}</span>
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>
@ -91,6 +91,16 @@ const link_value = ref<any[]>([]);
const reset_compontent = ref(false); const reset_compontent = ref(false);
const custom_link_type = ref(props.type); const custom_link_type = ref(props.type);
const base_data = ref<any[]>([]); const base_data = ref<any[]>([]);
watch(
() => props.type,
(new_val) => {
if (new_val.length > 0) {
link_select.value = props.type[0];
} else {
link_select.value = '';
}
}
);
onMounted(() => { onMounted(() => {
nextTick(() => { nextTick(() => {
// 定时获取common_store.common.article_category的数据，直到拿到值或者关闭页面为止 // 定时获取common_store.common.article_category的数据，直到拿到值或者关闭页面为止