Baghi/conflict-nuxt-4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Baghi:82d71d0ede43ac9870f7f206276a42434ccdf03c
Branches Tags
Baghi:main
Baghi:shadi/conflict
Baghi:Baghi/conflict
...
compare: Baghi:bbdb5d8eca14e8a315d2579c935eca0efd9970c7
Branches Tags
Baghi:main
Baghi:shadi/conflict
Baghi:Baghi/conflict

4 Commits
82d71d0ede ... bbdb5d8eca

Author SHA1 Message Date
hsafaei
bbdb5d8eca Merge branch 'Baghi/conflict' of https://git2.tavasi.ir/Baghi/conflict-nuxt-4 into main 2026-02-14 14:28:31 +03:30
hsafaei
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
Show Stats Expand all files Collapse all files

17
app/components/auto-import/TiptapEditor.vue
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;

188
app/components/lazy-load/data-entry/MainList.vue
View File

@ -40,144 +40,72 @@ 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",
{ key: "dropdown",
type: "dropdown", name: "refine_codes",
key: "dropdown", dropdownSchema: {
name: "refine_codes", width: "18em",
dropdownSchema: { modelValue: null, // ✅ اینو بذار
width: "18em", optionAttribute: "title",
modelValue: null, valueAttribute: "value",
optionAttribute: "title", searchable: false,
valueAttribute: "value", placeholder: "انتخاب کنید",
searchable: false, items: refineCodes,
placeholder: "انتخاب کنید", },
items: refineCodes, },
{
key: "autoComplation",
placeholder: "جستجوی ...",
debounceTime: 500,
// autocompleteUrl: "/repo/monir/complation/sanad",
minCharsForAutocomplete: 3,
maxHistoryItems: 20,
showSearchButton: false,
filters: [
{
label: "همه اجزاء",
value: "all",
}, },
}, {
{ key: "label", label: "نوع رابطه:", style: "code-title" }, label: "عنوان جلسه",
{ value: "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" }, label: "عنوان دوره",
{ value: "branch",
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",
},
],
}, },
}, {
], label: " فقط فهرست",
}, value: "mindex",
{ },
items: [ {
{ label: " فقط کدها",
key: "autoComplation", value: "codes",
placeholder: "جستجوی ...", },
debounceTime: 500, {
// autocompleteUrl: "/repo/monir/complation/sanad", label: " دوره",
minCharsForAutocomplete: 3, value: "advance",
maxHistoryItems: 20, },
showSearchButton: false, ],
filters: [ },
{ {
label: "همه اجزاء", key: "prevNext",
value: "all", name: "entityNavigator",
}, prevDisabled: false,
{ nextDisabled: true,
label: "عنوان جلسه", },
value: "title", ],
}, },
{
label: "عنوان دوره",
value: "branch",
},
{
label: " فقط فهرست",
value: "mindex",
},
{
label: " فقط کدها",
value: "codes",
},
{
label: " دوره",
value: "advance",
},
],
},
{
key: "prevNext",
name: "entityNavigator",
prevDisabled: false,
nextDisabled: true,
},
],
},
],
]); ]);
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);
} }

4
app/components/lazy-load/data-entry/RelationEdit.vue
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: "«منبع»",