@opendesign-plus-test/components 0.0.1-rc.52 → 0.0.1-rc.53
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -302,10 +302,7 @@ watch(
|
|
|
302
302
|
(data) => {
|
|
303
303
|
if (data) {
|
|
304
304
|
const propData = getPropData() as unknown as CycleSubItemT;
|
|
305
|
-
|
|
306
|
-
console.log(props.subId, propData.sub_id);
|
|
307
|
-
const sub = propData?.cycle_sub?.find((v) => v.sub_id === props.subId || propData.sub_id) || {} as unknown as CycleSubItemT;
|
|
308
|
-
console.log(2, sub);
|
|
305
|
+
const sub = propData?.cycle_sub?.find((v) => v.sub_id === (props.subId || propData.sub_id)) || {} as unknown as CycleSubItemT;
|
|
309
306
|
const { mid, date, start, end, sub_id } = sub;
|
|
310
307
|
Object.assign(
|
|
311
308
|
form.value,
|
|
@@ -321,7 +318,6 @@ watch(
|
|
|
321
318
|
}
|
|
322
319
|
: {},
|
|
323
320
|
);
|
|
324
|
-
console.log(form.value);
|
|
325
321
|
} else {
|
|
326
322
|
const today = dayjs().format('YYYY-MM-DD');
|
|
327
323
|
const now = dayjs().format('HH:mm');
|
|
@@ -340,21 +340,18 @@ const confirmHandleItem = async () => {
|
|
|
340
340
|
return;
|
|
341
341
|
}
|
|
342
342
|
flag = await props.cancelSubMeetingRequest(row.sub_id);
|
|
343
|
-
message.success({
|
|
344
|
-
content: `${ t('meeting.meetingCancel', [row.topic]) }`,
|
|
345
|
-
});
|
|
346
343
|
} else {
|
|
347
344
|
if (!props.deleteMeetingRequest) {
|
|
348
345
|
return;
|
|
349
346
|
}
|
|
350
347
|
flag = await props.deleteMeetingRequest(row.id);
|
|
351
|
-
message.success({
|
|
352
|
-
content: `${ t('meeting.meetingCancel', [row.topic]) }`,
|
|
353
|
-
});
|
|
354
348
|
}
|
|
355
349
|
if (typeof flag === 'boolean' && !flag) {
|
|
356
350
|
return;
|
|
357
351
|
}
|
|
352
|
+
message.success({
|
|
353
|
+
content: `${ t('meeting.meetingCancel', [row.topic]) }`,
|
|
354
|
+
});
|
|
358
355
|
cancelHandleItem();
|
|
359
356
|
reloadAll.value = true;
|
|
360
357
|
getList();
|
|
@@ -45,7 +45,7 @@ const i18n = computed(() => {
|
|
|
45
45
|
// -------------------- 监听尺寸变化 --------------------
|
|
46
46
|
const meetInfoRef = ref<HTMLDivElement[]>();
|
|
47
47
|
|
|
48
|
-
|
|
48
|
+
let resizeObserver: ResizeObserver | null = null;
|
|
49
49
|
watch(
|
|
50
50
|
[() => props.list, () => isClient],
|
|
51
51
|
() => {
|
|
@@ -56,15 +56,19 @@ watch(
|
|
|
56
56
|
}
|
|
57
57
|
if (isClient) {
|
|
58
58
|
nextTick(() => {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
59
|
+
if (!resizeObserver) {
|
|
60
|
+
resizeObserver = new ResizeObserver((entries) => {
|
|
61
|
+
for (let entry of entries) {
|
|
62
|
+
const { height } = entry.contentRect;
|
|
63
|
+
entry.target.classList.remove('hidden-divider');
|
|
64
|
+
if (height >= 30) {
|
|
65
|
+
entry.target.classList.add('hidden-divider');
|
|
66
|
+
}
|
|
65
67
|
}
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
+
});
|
|
69
|
+
} else {
|
|
70
|
+
resizeObserver.disconnect();
|
|
71
|
+
}
|
|
68
72
|
meetInfoRef.value?.forEach((targetDiv) => {
|
|
69
73
|
resizeObserver!.observe(targetDiv);
|
|
70
74
|
});
|