diff --git a/.env b/.env
index 047e961..874fdb7 100755
--- a/.env
+++ b/.env
@@ -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/
\ No newline at end of file
diff --git a/.env.tavasi b/.env.tavasi
index 92d3afa..dc99bec 100755
--- a/.env.tavasi
+++ b/.env.tavasi
@@ -2,5 +2,5 @@
NUXT_PUBLIC_SYSTEM=majles
# (اختیاری)
-NUXT_PUBLIC_APP_NAME=Majles System
-NUXT_PUBLIC_BASE_URL=http://192.168.23.160/
\ No newline at end of file
+NUXT_PUBLIC_SYSTEM=tavasi_conflict
+NUXT_PUBLIC_BASE_URL=https://192.168.23.160/
diff --git a/app/components/auto-import/TiptapEditor.vue b/app/components/auto-import/TiptapEditor.vue
index 1fdc351..52774bc 100755
--- a/app/components/auto-import/TiptapEditor.vue
+++ b/app/components/auto-import/TiptapEditor.vue
@@ -251,7 +251,9 @@ function generateDetailsHtml(item) {
let html = ``;
html += ``;
if (item.tag) {
- html += ` ${item.tag} `;
+ html += ` ${item.tag} `;
+ // console.log(" html 1 ", html);
+
}
html += `${item.title || "بدون عنوان"}`;
@@ -269,6 +271,8 @@ function generateDetailsHtml(item) {
}
html += `
`;
+
+ // 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();
diff --git a/app/components/lazy-load/data-entry/RelationEdit.vue b/app/components/lazy-load/data-entry/RelationEdit.vue
index ea8aabb..b2d45a2 100644
--- a/app/components/lazy-load/data-entry/RelationEdit.vue
+++ b/app/components/lazy-load/data-entry/RelationEdit.vue
@@ -56,7 +56,7 @@ const setDataEditor = async () => {
node = {
isOpen: false,
id: item.section_mom_id,
- title: `قانون مقدم : ` + item.qanon_title + " > " + item.full_path,
+ title: `قانون مقدم : ` + 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: `قانون موخر : ` + item.qanon_title + " > " + item.full_path,
+ title: `قانون موخر : ` + 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,
});
diff --git a/package.json b/package.json
index b65a3af..c76845b 100755
--- a/package.json
+++ b/package.json
@@ -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",