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

Merge remote-tracking branch 'origin/main' into Baghi/conflict

Browse Source
This commit is contained in:
Baghi330 2026-02-14 16:52:54 +03:30
commit 44168bd5ec
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -2,6 +2,6 @@ NUXT_PUBLIC_API_NAME=api/
IS_DEVLOP_MODE=1
NUXT_PUBLIC_SYSTEM=monir
NUXT_PUBLIC_SYSTEM=tavasi_conflict
NUXT_PUBLIC_BASE_URL=http://192.168.23.160/
NUXT_PUBLIC_BASE_URL2=https://hamfahmi.ir/

4
.env.tavasi
View File

@ -2,5 +2,5 @@
NUXT_PUBLIC_SYSTEM=majles
# (اختیاری)
NUXT_PUBLIC_APP_NAME=Majles System
NUXT_PUBLIC_BASE_URL=http://192.168.23.160/
NUXT_PUBLIC_SYSTEM=tavasi_conflict
NUXT_PUBLIC_BASE_URL=https://192.168.23.160/

10
app/components/auto-import/TiptapEditor.vue
View File

@ -251,7 +251,9 @@ function generateDetailsHtml(item) {
let html = `<details class="custom-details" ${item.isOpen ? "open" : ""}>`;
html += `<summary>`;
if (item.tag) {
html += `<span class="tag" > ${item.tag} </span>`;
html += `<a class="tag" target="normal" @click.stop="true" > ${item.tag} </a>`;
// console.log(" html 1 ", html);
}
html += `${item.title || "بدون عنوان"}`;
@ -269,6 +271,8 @@ function generateDetailsHtml(item) {
}
html += `</details>`;
// console.log(" html 10 ", html);
return html;
}
@ -281,6 +285,8 @@ function loadFromJson() {
html += generateDetailsHtml(item);
});
console.log('loadFromJson ', html);
editor.value.commands.setContent(html);
}
watch(
@ -289,7 +295,7 @@ watch(
if (!editor.value) return;
if (!newVal || newVal.length === 0) return;
console.log("accordionData updated:", newVal);
// console.log("accordionData updated:", newVal);
nextTick(() => {
loadFromJson();

6
app/components/lazy-load/data-entry/RelationEdit.vue
View File

@ -56,7 +56,7 @@ const setDataEditor = async () => {
node = {
isOpen: false,
id: item.section_mom_id,
title: `<span class="label">قانون مقدم : </span>` + item.qanon_title + " > " + item.full_path,
title: `<a class="label" href="#">قانون مقدم : </a>` + item.qanon_title + " - " + item.full_path,
tag: item.state_etebar,
content: _source.content1,
link_label: "«منبع»",
@ -91,7 +91,7 @@ const setDataEditor = async () => {
node = {
isOpen: false,
id: item.section_mom_id,
title: `<span class="label">قانون موخر : </span>` + item.qanon_title + " > " + item.full_path,
title: `<a class="label">قانون موخر : </a>` + item.qanon_title + " - " + item.full_path,
tag: item.state_etebar,
content: _source.content2,
link_label: "«منبع»",
@ -132,7 +132,7 @@ const setDataEditor = async () => {
if (_source.subject_unity.description) {
node["children"].push({
isOpen: false,
id: item.context_id,
id: _source.context_id,
title: "شرط اعتبار وحدت موضوع : ",
content: _source.subject_unity.description,
});

5
package.json
View File

@ -4,8 +4,11 @@
"private": true,
"scripts": {
"build": "nuxt build",
"dev": "nuxt dev",
"dev-tavasi": "env-cmd -f .env.tavasi nuxt dev --host --port 3007 --inspect",
"dev": "nuxt dev"
"build-tavasi": "env-cmd -f .env.tavasi nuxt build --host --inspect",
"build-majles": "env-cmd -f .env.majles nuxt build --host --inspect"
},
"dependencies": {
"@iconify-json/meteor-icons": "^1.2.1",