Compare commits

...

4 Commits

Author SHA1 Message Date
bbdb5d8eca Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main 2026-02-14 14:28:31 +03:30
f47a5100a2 1 2026-02-14 14:28:25 +03:30
Baghi330
7fd8cb9a65 11 2026-02-14 14:27:36 +03:30
Baghi330
32a2bb9e13 Merge remote-tracking branch 'origin/main' into Baghi/conflict 2026-02-14 14:13:05 +03:30
3 changed files with 74 additions and 135 deletions

View File

@ -249,10 +249,10 @@ function generateDetailsHtml(item) {
let html = `<details class="custom-details" ${item.isOpen ? "open" : ""}>`; let html = `<details class="custom-details" ${item.isOpen ? "open" : ""}>`;
html += `<summary>`; html += `<summary>`;
if (item.tag) { if (item.tag) {
html += `<span > ${item.tag} </span>`; html += `<span class="tag" > ${item.tag} </span>`;
} }
html += `${escapeHtml(item.title) || "بدون عنوان"}`; html += `${item.title || "بدون عنوان"}`;
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>`;
} }
@ -554,6 +554,18 @@ onBeforeUnmount(() => {
} }
} }
summary.tag {
color: blue;
border-radius: var(--radius) var(--radius) 0 0;
}
summary.label {
color: chocolate;
font-weight: 700;
}
summary { summary {
position: relative; position: relative;
padding: 1.25rem 1.25rem 1.25rem 3.5rem; padding: 1.25rem 1.25rem 1.25rem 3.5rem;
@ -564,7 +576,6 @@ onBeforeUnmount(() => {
); );
color: var(--color-primary-700); color: var(--color-primary-700);
border-radius: var(--radius) var(--radius) 0 0; border-radius: var(--radius) var(--radius) 0 0;
font-weight: 700;
font-size: 1.1rem; font-size: 1.1rem;
color: var(--color-dark-primary-800); color: var(--color-dark-primary-800);
// cursor: pointer; // cursor: pointer;

View File

@ -40,18 +40,16 @@ const myContentSchema = computed(() => {
pagination: props.pagination, pagination: props.pagination,
}; };
}); });
const headerTools = ref([ const headerTools = computed(() => [
[
{ {
items: [ items: [
{ key: "label", label: "کد:", style: "code-title" },
{ {
type: "dropdown", type: "dropdown",
key: "dropdown", key: "dropdown",
name: "refine_codes", name: "refine_codes",
dropdownSchema: { dropdownSchema: {
width: "18em", width: "18em",
modelValue: null, modelValue: null, // اینو بذار
optionAttribute: "title", optionAttribute: "title",
valueAttribute: "value", valueAttribute: "value",
searchable: false, searchable: false,
@ -59,75 +57,6 @@ const headerTools = ref([
items: refineCodes, items: refineCodes,
}, },
}, },
{ key: "label", label: "نوع رابطه:", style: "code-title" },
{
type: "dropdown",
key: "dropdown",
name: "refine_codes",
dropdownSchema: {
width: "10em",
modelValue: null,
optionAttribute: "title",
valueAttribute: "value",
searchable: false,
placeholder: "انتخاب کنید",
items: [
{
title: "تعارض",
value: "1",
},
{
title: "تینت",
value: "2",
},
{
title: "ییی",
value: "3",
},
{
title: "ییی",
value: "4",
},
],
},
},
{ key: "label", label: "وضعیت اعتبار:", style: "code-title" },
{
type: "dropdown",
key: "dropdown",
name: "refine_codes",
dropdownSchema: {
width: "10em",
modelValue: null,
optionAttribute: "title",
valueAttribute: "value",
searchable: false,
placeholder: "انتخاب کنید",
placeholder: "انتخاب کنید",
items: [
{
title: "تعارض",
value: "1",
},
{
title: "تینت",
value: "2",
},
{
title: "ییی",
value: "3",
},
{
title: "ییی",
value: "4",
},
],
},
},
],
},
{
items: [
{ {
key: "autoComplation", key: "autoComplation",
placeholder: "جستجوی ...", placeholder: "جستجوی ...",
@ -171,13 +100,12 @@ const headerTools = ref([
}, },
], ],
}, },
],
]); ]);
function headerToolsAction({ action, data }) { function headerToolsAction({ action, data }) {
if (action == "auto-complation") { if (action == "auto-complation") {
if (data.action == "complete-search") { if (data.action == "complete-search") {
// console.log("data ==> ", data); console.log("data ==> ", data);
emit("my-header-tools-search", data.item); emit("my-header-tools-search", data.item);
} }

View File

@ -55,7 +55,7 @@ const setDataEditor = async () => {
node = { node = {
isOpen: false, isOpen: false,
id: item.section_mom_id, id: item.section_mom_id,
title: "قانون مقدم : " + item.qanon_title + " > " + item.full_path, title: `<span class="label">قانون مقدم : </span>` + item.qanon_title + " > " + item.full_path,
tag: item.state_etebar, tag: item.state_etebar,
content: _source.content1, content: _source.content1,
link_label: "«منبع»", link_label: "«منبع»",
@ -90,7 +90,7 @@ const setDataEditor = async () => {
node = { node = {
isOpen: false, isOpen: false,
id: item.section_mom_id, id: item.section_mom_id,
title: "قانون موخر : " + item.qanon_title + " > " + item.full_path, title: `<span class="label">قانون موخر : </span>` + item.qanon_title + " > " + item.full_path,
tag: item.state_etebar, tag: item.state_etebar,
content: _source.content2, content: _source.content2,
link_label: "«منبع»", link_label: "«منبع»",