Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main

This commit is contained in:
hsafaei 2026-02-14 16:46:05 +03:30
commit 50cf02890a
2 changed files with 18 additions and 22 deletions

View File

@ -12,15 +12,13 @@
:key="index" :key="index"
@click="btn.action(editor)" @click="btn.action(editor)"
:class="{ 'is-active': btn.isActive ? btn.isActive(editor) : false }" :class="{ 'is-active': btn.isActive ? btn.isActive(editor) : false }"
:disabled="btn.disabled ? !btn.disabled(editor) : false" :disabled="readOnly || (btn.disabled ? btn.disabled(editor) : false)"
:title="btn.title" :title="btn.title"
> >
<span class="toolbar-icon">{{ btn.icon }}</span> <span class="toolbar-icon">{{ btn.icon }}</span>
</button> </button>
</div> </div>
</div> </div>
<!-- محتوای ادیتور -->
<editor-content :editor="editor" class="editor-content" /> <editor-content :editor="editor" class="editor-content" />
</div> </div>
</template> </template>
@ -42,6 +40,10 @@ const props = defineProps({
type: Array, type: Array,
default: () => [], default: () => [],
}, },
readOnly: {
type: Boolean,
default: true,
},
}); });
const editor = ref(null); const editor = ref(null);
@ -258,17 +260,14 @@ function generateDetailsHtml(item) {
if (item.link_url) { if (item.link_url) {
html += `<a class="link-url" href="${item.link_url}">${item.link_label}</a>`; html += `<a class="link-url" href="${item.link_url}">${item.link_label}</a>`;
} }
html += "</summary>"; html += `</summary>`;
const formattedContent = formatContent(item.content || ""); html += formatContent(item.content || "");
html += `<div class="details-content">${formattedContent}</div>`;
if (item.children && item.children.length > 0) { if (item.children && item.children.length > 0) {
html += '<div class="children-container">';
item.children.forEach((child) => { item.children.forEach((child) => {
html += generateDetailsHtml(child); html += generateDetailsHtml(child);
}); });
html += "</div>";
} }
html += `</details>`; html += `</details>`;
@ -307,6 +306,7 @@ watch(
); );
onMounted(() => { onMounted(() => {
editor.value = new Editor({ editor.value = new Editor({
editable: !props.readOnly,
extensions: [ extensions: [
StarterKit, StarterKit,
Underline, Underline,
@ -440,7 +440,7 @@ onBeforeUnmount(() => {
.tiptap { .tiptap {
font-family: font-family:
"Vazir", "sahel",
"Inter", "Inter",
-apple-system, -apple-system,
BlinkMacSystemFont, BlinkMacSystemFont,
@ -560,11 +560,9 @@ onBeforeUnmount(() => {
} }
} }
summary.tag { summary.tag {
color: blue; color: blue;
border-radius: var(--radius) var(--radius) 0 0; border-radius: var(--radius) var(--radius) 0 0;
} }
summary.label { summary.label {

View File

@ -49,7 +49,7 @@ const setDataEditor = async () => {
base_url += "/entity/show/view/qasection/{{qanon_id}}?jump_id={{section_id}}"; base_url += "/entity/show/view/qasection/{{qanon_id}}?jump_id={{section_id}}";
accordionItems.value = []; accordionItems.value = [];
let node = {} let node = {};
if (_source.previous_info) { if (_source.previous_info) {
let item = _source.previous_info; let item = _source.previous_info;
@ -127,17 +127,15 @@ const setDataEditor = async () => {
title: "توضیح هوشمند برای وجود وحدت موضوع بین احکام استنادی ", title: "توضیح هوشمند برای وجود وحدت موضوع بین احکام استنادی ",
content: _source.subject_unity.reason, content: _source.subject_unity.reason,
children: [], children: [],
} };
if(_source.subject_unity.description){
if (_source.subject_unity.description) {
node["children"].push({ node["children"].push({
isOpen: false, isOpen: false,
id: _source.context_id, id: _source.context_id,
title: "شرط اعتبار وحدت موضوع : ", title: "شرط اعتبار وحدت موضوع : ",
content: _source.subject_unity.description, content: _source.subject_unity.description,
}); });
} }
accordionItems.value.push(node); accordionItems.value.push(node);
@ -148,23 +146,23 @@ const setDataEditor = async () => {
title: "توضیح وجود تخالف بین دو ماده ", title: "توضیح وجود تخالف بین دو ماده ",
content: _source.conflict_detection.description, content: _source.conflict_detection.description,
children: [], children: [],
} };
accordionItems.value.push(node); accordionItems.value.push(node);
/////-------------بیان نوع تخالف---------------------- /////-------------بیان نوع تخالف----------------------
node = { node = {
isOpen: true, isOpen: true,
id: 11, id: 11,
title: "بیان نوع تخالف بین دو ماده : " + _source.conflict_relation_identification.main_type, title:
"بیان نوع تخالف بین دو ماده : " +
_source.conflict_relation_identification.main_type,
content: _source.conflict_relation_identification.description, content: _source.conflict_relation_identification.description,
children: [], children: [],
} };
accordionItems.value.push(node); accordionItems.value.push(node);
/////----------------------------------- /////-----------------------------------
console.log("accordionItems", accordionItems.value); console.log("accordionItems", accordionItems.value);
}; };