From c9fa17595a0d17ebcaf383cdfdc1fc027ea204a6 Mon Sep 17 00:00:00 2001
From: Tseegii Tselmeg <tseegii.it@gmail.com>
Date: Fri, 20 Sep 2024 21:54:56 +0800
Subject: [PATCH 01/25] BS added form

---
 src/modules/agent/views/agentform.vue         | 22 +++++++++++--------
 .../krud/components/krud-header-bs.vue        |  2 +-
 src/modules/page/views/module.vue             |  2 +-
 src/modules/report/ReportBuilder.vue          |  1 +
 src/template/bs/widgets/bs-header.vue         |  2 +-
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/modules/agent/views/agentform.vue b/src/modules/agent/views/agentform.vue
index 98e308b..8b897f7 100644
--- a/src/modules/agent/views/agentform.vue
+++ b/src/modules/agent/views/agentform.vue
@@ -1,7 +1,7 @@
 <template>
-    <section class="page">
-        <paper-header class="mini" v-if="!withoutHeader">
-            <div slot="right" >
+    <section class="page module-page">
+        <paper-header class="mini" v-if="!withoutHeader && ($theme && $theme !== 'bs')">
+            <div slot="right">
                 <slot name="user-control"></slot>
             </div>
 
@@ -10,12 +10,12 @@
                     <li v-if="type == 'profile'">
                         <router-link to="">
                             <i class="tu-user"></i>
-                            <span>{{lang.personalInformation}}</span>
+                            <span>{{ lang.personalInformation }}</span>
                         </router-link>
                     </li>
                     <li v-if="type == 'password'">
                         <router-link to="">
-                            <span>{{lang.changePassword}}</span>
+                            <span>{{ lang.changePassword }}</span>
                         </router-link>
                     </li>
                 </ul>
@@ -23,10 +23,15 @@
             <div slot="tool">
             </div>
         </paper-header>
+
         <div class="crud-page-body">
             <section class="page-agent-form">
-                <dataform v-if="type == 'profile'" :url="baseUrl ? baseUrl : ''" class="material-form" ref="agentForm" schemaID="user_profile" :editMode="editMode" :do_render="editMode" :onReady="editUser" :onSuccess="onSuccess"/>
-                <dataform v-if="type == 'password'" :url="baseUrl ? baseUrl : ''" class="material-form" ref="agentForm" schemaID="user_password" :editMode="editMode" :do_render="editMode" a :onReady="editUser" :onSuccess="onSuccess"/>
+                <dataform v-if="type == 'profile'" :url="baseUrl ? baseUrl : ''" class="material-form" ref="agentForm"
+                          schemaID="user_profile" :editMode="editMode" :do_render="editMode" :onReady="editUser"
+                          :onSuccess="onSuccess"/>
+                <dataform v-if="type == 'password'" :url="baseUrl ? baseUrl : ''" class="material-form" ref="agentForm"
+                          schemaID="user_password" :editMode="editMode" :do_render="editMode" a :onReady="editUser"
+                          :onSuccess="onSuccess"/>
             </section>
         </div>
     </section>
@@ -36,7 +41,7 @@
 import pagination from "./pagination";
 
 export default {
-    props:['type', 'withoutHeader', 'baseUrl'],
+    props: ['type', 'withoutHeader', 'baseUrl'],
     components: {
         'dv-pagination': pagination
     },
@@ -57,7 +62,6 @@ export default {
     },
 
 
-
     methods: {
         onSuccess(data) {
         },
diff --git a/src/modules/krud/components/krud-header-bs.vue b/src/modules/krud/components/krud-header-bs.vue
index 90872be..c7b41e7 100644
--- a/src/modules/krud/components/krud-header-bs.vue
+++ b/src/modules/krud/components/krud-header-bs.vue
@@ -290,7 +290,7 @@
                             class="mdi mdi-account-circle text-muted fs-16 align-middle me-1"></i>
                             <span class="align-middle"> Хувийн мэдээлэл</span>
                         </router-link>
-                        <router-link class="dropdown-item" to="/chat">
+                        <router-link class="dropdown-item" to="/module/password">
                             <i class=" mdi mdi-message-text-outline text-muted fs-16 align-middle me-1"></i>
                             <span class="align-middle"> Нууц үг солих</span>
                         </router-link>
diff --git a/src/modules/page/views/module.vue b/src/modules/page/views/module.vue
index 10430ae..f394150 100644
--- a/src/modules/page/views/module.vue
+++ b/src/modules/page/views/module.vue
@@ -1,5 +1,5 @@
 <template>
-    <section>
+    <section :class="`page ${$theme === 'bs' ? 'page-bs' : ''}`">
         <agent v-if="$route.params.module == 'agent'">
             <user-control slot="user-control"></user-control>
         </agent>
diff --git a/src/modules/report/ReportBuilder.vue b/src/modules/report/ReportBuilder.vue
index 89c78ee..92d8e6c 100644
--- a/src/modules/report/ReportBuilder.vue
+++ b/src/modules/report/ReportBuilder.vue
@@ -26,6 +26,7 @@ export default {
                 const ret = new Promise(function (resolve) {
                     resolveFunc = resolve;
                     fillReportList();
+                    
                     $("#dlgOpen").modal("show");
                     $("#dlgOpen").on("hide.bs.modal", function () {
                         $(this).off("hide.bs.modal");
diff --git a/src/template/bs/widgets/bs-header.vue b/src/template/bs/widgets/bs-header.vue
index d757b60..99f8208 100644
--- a/src/template/bs/widgets/bs-header.vue
+++ b/src/template/bs/widgets/bs-header.vue
@@ -143,7 +143,7 @@
                             class="mdi mdi-account-circle text-muted fs-16 align-middle me-1"></i>
                             <span class="align-middle"> Хувийн мэдээлэл</span>
                         </router-link>
-                        <router-link class="dropdown-item" to="/chat">
+                        <router-link class="dropdown-item" to="/module/password">
                             <i class=" mdi mdi-message-text-outline text-muted fs-16 align-middle me-1"></i>
                             <span class="align-middle"> Нууц үг солих</span>
                         </router-link>

From 20dae198f2332abd912a339f4c0a9f8e84956f94 Mon Sep 17 00:00:00 2001
From: Tseegii Tselmeg <tseegii.it@gmail.com>
Date: Sat, 9 Nov 2024 20:36:22 +0800
Subject: [PATCH 02/25] Added on filter datagrid

---
 package.json                          |  1 -
 src/modules/dataform/DataformMixin.js |  4 +-
 src/modules/datagrid/Datafilter.vue   |  1 -
 src/modules/datagrid/Datagrid.vue     |  4 ++
 src/modules/krud/templates/canvas.vue |  2 +
 src/modules/krud/templates/mixins.js  |  2 +-
 src/modules/page/NavBs.vue            |  2 +-
 src/modules/report/ReportBuilder.vue  | 96 +++++++++++++--------------
 8 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/package.json b/package.json
index 18ccc20..514e090 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
     "dependencies": {
         "@ckeditor/ckeditor5-vue2": "^3.0.1",
         "@firebase/messaging": "^0.7.4",
-        "@mescius/activereportsjs": "^5.0.4",
         "@tinymce/tinymce-vue": "^3.0.0",
         "accounting-js": "^1.1.1",
         "ag-grid-community": "28.2.1",
diff --git a/src/modules/dataform/DataformMixin.js b/src/modules/dataform/DataformMixin.js
index 9d0b719..53687a6 100644
--- a/src/modules/dataform/DataformMixin.js
+++ b/src/modules/dataform/DataformMixin.js
@@ -692,10 +692,10 @@ export default {
                             }
                         } else {
                             console.log(data);
-
                             this.$Notice.error({
                                 title: data.msg ? data.msg : this.lang.errorSaving
-                            })
+                            });
+
                             if (this.$props.onError) {
                                 this.$props.onError()
                             }
diff --git a/src/modules/datagrid/Datafilter.vue b/src/modules/datagrid/Datafilter.vue
index 17fe38a..6b9d3c0 100644
--- a/src/modules/datagrid/Datafilter.vue
+++ b/src/modules/datagrid/Datafilter.vue
@@ -18,7 +18,6 @@
                     <br/>
                 </Form>
             </div>
-
         </div>
 
         <GridRowUpdate :permissions="permissions" :model="model" :schema="schema" :url="url" :inFilter="true" :schemaID="schemaID"  />
diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index 208aedf..b8edae7 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -205,6 +205,7 @@ export default {
         "gridSelector",
         // "url",
         "hideInfo",
+        "onFilterChange"
     ],
     computed: {
         // ...mapGetters({
@@ -1287,6 +1288,9 @@ export default {
 
         filterData(page) {
             this.changePage(page);
+            if(this.onFilterChange) {
+                this.onFilterChange(this.filterModel);
+            }
         },
 
         fetchAggregations(filters) {
diff --git a/src/modules/krud/templates/canvas.vue b/src/modules/krud/templates/canvas.vue
index 42d2cd6..6d14676 100644
--- a/src/modules/krud/templates/canvas.vue
+++ b/src/modules/krud/templates/canvas.vue
@@ -69,6 +69,7 @@
                               :onRowSelect="onRowSelectedEvent"
                               :hasSelection="hasSelection"
                               :permissions="permissions"
+                              :on-filter-change="onFilterChange"
                               :page_id="page_id"
                               :custom_condition="$props.custom_condition? $props.custom_condition :null"
                               :user_condition="user_condition ? user_condition.gridCondition : null">
@@ -130,6 +131,7 @@ export default {
         };
     },
     created() {
+        console.log("on FILTER", this.onFilter);
     },
     components: {
         "slide-panel": slidePanel,
diff --git a/src/modules/krud/templates/mixins.js b/src/modules/krud/templates/mixins.js
index c90d1a0..49dcd4d 100644
--- a/src/modules/krud/templates/mixins.js
+++ b/src/modules/krud/templates/mixins.js
@@ -10,7 +10,7 @@ export default {
         "hideInfo", "view_url", "mode", "onPropertySuccess",
         "onPropertyError", "page_id", "withoutHeader",
         "withCrudLog", "projects_id", "exportSelectedRows",
-        "exportPath", "exportLabel"
+        "exportPath", "exportLabel", "onFilterChange"
     ],
     components: {
         krudtools
diff --git a/src/modules/page/NavBs.vue b/src/modules/page/NavBs.vue
index 43698ef..667389c 100644
--- a/src/modules/page/NavBs.vue
+++ b/src/modules/page/NavBs.vue
@@ -21,7 +21,7 @@ export default {
         };
     },
     created() {
-        console.log(this.menu);
+        console.log("MENU", this.menu);
     },
     methods: {
         can(menu) {
diff --git a/src/modules/report/ReportBuilder.vue b/src/modules/report/ReportBuilder.vue
index 92d8e6c..7703f50 100644
--- a/src/modules/report/ReportBuilder.vue
+++ b/src/modules/report/ReportBuilder.vue
@@ -1,7 +1,7 @@
 <template>
     <section class="report-builder">
         <div class="rb-workspace">
-            <div id="designer-builder"></div>
+            <div id="designer-host"></div>
         </div>
     </section>
 </template>
@@ -10,54 +10,54 @@
 export default {
     name: "Lambda report designer",
     mounted() {
-        let designer = new MESCIUS.ActiveReportsJS.ReportDesigner.Designer("#designer-builder");
-        // designer.setReport({id: "blank.rdlx-json", displayName: "my report"});
+        const designer = new GC.ActiveReports.ReportDesigner.Designer("#designer-host");
+        designer.setReport({id: "./report.rdlx", displayName: "my report"});
 
-        designer.setActionHandlers({
-            onCreate: function () {
-                const reportId = `NewReport${++this.counter}`;
-                return Promise.resolve({
-                    definition: CPLReport,
-                    id: reportId,
-                    displayName: reportId,
-                });
-            },
-            onOpen: function () {
-                const ret = new Promise(function (resolve) {
-                    resolveFunc = resolve;
-                    fillReportList();
-                    
-                    $("#dlgOpen").modal("show");
-                    $("#dlgOpen").on("hide.bs.modal", function () {
-                        $(this).off("hide.bs.modal");
-                        resolveFunc = null;
-                        resolve(null);
-                    });
-                });
-                return ret;
-            },
-            onSave: function (info) {
-                const reportId = info.id || `NewReport${++this.counter}`;
-                reportStorage.set(reportId, info.definition);
-                return Promise.resolve({ displayName: reportId });
-            },
-            onSaveAs: function (info) {
-                const reportId = `NewReport${++this.counter}`;
-                reportStorage.set(reportId, info.definition);
-                return Promise.resolve({ id: reportId, displayName: reportId });
-            },
-        });
-        function onSelectReport(reportId) {
-            if (resolveFunc) {
-                resolveFunc({
-                    definition: reportStorage.get(reportId),
-                    id: reportId,
-                    displayName: reportId,
-                });
-                $("#dlgOpen").modal("hide");
-                resolveFunc = null;
-            }
-        }
+        // designer.setActionHandlers({
+        //     onCreate: function () {
+        //         const reportId = `NewReport${++this.counter}`;
+        //         return Promise.resolve({
+        //             definition: CPLReport,
+        //             id: reportId,
+        //             displayName: reportId,
+        //         });
+        //     },
+        //     onOpen: function () {
+        //         const ret = new Promise(function (resolve) {
+        //             resolveFunc = resolve;
+        //             fillReportList();
+        //
+        //             $("#dlgOpen").modal("show");
+        //             $("#dlgOpen").on("hide.bs.modal", function () {
+        //                 $(this).off("hide.bs.modal");
+        //                 resolveFunc = null;
+        //                 resolve(null);
+        //             });
+        //         });
+        //         return ret;
+        //     },
+        //     onSave: function (info) {
+        //         const reportId = info.id || `NewReport${++this.counter}`;
+        //         reportStorage.set(reportId, info.definition);
+        //         return Promise.resolve({ displayName: reportId });
+        //     },
+        //     onSaveAs: function (info) {
+        //         const reportId = `NewReport${++this.counter}`;
+        //         reportStorage.set(reportId, info.definition);
+        //         return Promise.resolve({ id: reportId, displayName: reportId });
+        //     },
+        // });
+        // function onSelectReport(reportId) {
+        //     if (resolveFunc) {
+        //         resolveFunc({
+        //             definition: reportStorage.get(reportId),
+        //             id: reportId,
+        //             displayName: reportId,
+        //         });
+        //         $("#dlgOpen").modal("hide");
+        //         resolveFunc = null;
+        //     }
+        // }
     },
 
     data() {

From 4781e193e00bbc5f5c1dd9a0aebd014dcb1dfe5c Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Wed, 11 Sep 2024 22:31:43 +0800
Subject: [PATCH 03/25] empty pull tseke list

---
 src/modules/krud/templates/list.vue | 63 ++++++++++++++++-------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/modules/krud/templates/list.vue b/src/modules/krud/templates/list.vue
index 104d8f7..b0b3140 100644
--- a/src/modules/krud/templates/list.vue
+++ b/src/modules/krud/templates/list.vue
@@ -1,37 +1,37 @@
 <template>
     <section class="list-template">
         <div :class="`crud-page ${hideHeader ? 'no-header' : '' }`">
-            <!--            <div class="crud-page-header">-->
-            <!--                            <div v-if="hasNavSlot" class="krud-left">-->
-            <!--                                <div class="crud-page-header-left">-->
-            <!--                                    <slot name="nav"></slot>-->
-            <!--                                </div>-->
-            <!--                            </div>-->
+<!--            <div class="crud-page-header">-->
+<!--                <div v-if="hasNavSlot" class="krud-left">-->
+<!--                    <div class="crud-page-header-left">-->
+<!--                        <slot name="nav"></slot>-->
+<!--                    </div>-->
+<!--                </div>-->
 
-            <!--                <div v-else class="crud-page-header-left">-->
-            <!--                    <i v-if="$props.icon" :class="icon"></i>-->
-            <!--                    <h3 v-if="$props.title">{{ $props.title.replace(/-/g, ' ') }}</h3>-->
-            <!--                    <slot name="nav"></slot>-->
-            <!--                </div>-->
+<!--                <div v-else class="crud-page-header-left">-->
+<!--                    <i v-if="$props.icon" :class="icon"></i>-->
+<!--                    <h3 v-if="$props.title">{{ $props.title.replace(/-/g, ' ') }}</h3>-->
+<!--                    <slot name="nav"></slot>-->
+<!--                </div>-->
 
-            <!--                <div class="crud-page-header-right">-->
-            <!--                    <div class="tool-options">-->
-            <!--                        <slot name="tooloptions"></slot>-->
-            <!--                    </div>-->
-            <!--                    <krudtools :search="search"-->
-            <!--                               :refresh="refresh"-->
-            <!--                               :exportExcel="exportExcel"-->
-            <!--                               :print="print"-->
-            <!--                               :save="save"-->
-            <!--                               :isPrint="isPrint"-->
-            <!--                               :isExcel="isExcel"-->
-            <!--                               :isRefresh="isRefresh"-->
-            <!--                               :isSave="isSave"-->
-            <!--                               :isSearch="isSearch"-->
-            <!--                    />-->
-            <!--                    <slot name="right"></slot>-->
-            <!--                </div>-->
-            <!--            </div>-->
+<!--                <div class="crud-page-header-right">-->
+<!--                    <div class="tool-options">-->
+<!--                        <slot name="tooloptions"></slot>-->
+<!--                    </div>-->
+<!--                    <krudtools :search="search"-->
+<!--                               :refresh="refresh"-->
+<!--                               :exportExcel="exportExcel"-->
+<!--                               :print="print"-->
+<!--                               :save="save"-->
+<!--                               :isPrint="isPrint"-->
+<!--                               :isExcel="isExcel"-->
+<!--                               :isRefresh="isRefresh"-->
+<!--                               :isSave="isSave"-->
+<!--                               :isSearch="isSearch"-->
+<!--                    />-->
+<!--                    <slot name="right"></slot>-->
+<!--                </div>-->
+<!--            </div>-->
 
             <krud-header-bs v-if="$theme == 'bs'"
                             :title="title"
@@ -129,5 +129,10 @@ export default {
         "krud-header-bs": krudHeaderBs
     },
     mixins: [mixins],
+    created() {
+        console.log('here');
+        console.log($theme);
+        console.log(this);
+    }
 };
 </script>

From db3ccfe9e9368cae78208cdb1edfa22ac7037d97 Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Sat, 9 Nov 2024 20:43:28 +0800
Subject: [PATCH 04/25] changes

---
 src/modules/krud/templates/canvas.vue |   1 -
 src/modules/krud/templates/list.vue   | 146 +++++++++++++-------------
 2 files changed, 73 insertions(+), 74 deletions(-)

diff --git a/src/modules/krud/templates/canvas.vue b/src/modules/krud/templates/canvas.vue
index 6d14676..ec6c9ca 100644
--- a/src/modules/krud/templates/canvas.vue
+++ b/src/modules/krud/templates/canvas.vue
@@ -49,7 +49,6 @@
                 </template>
             </krud-header>
 
-
             <div class="crud-page-body">
                 <div class="v-nav" v-if="hasVNavSlot">
                     <slot name="v-nav"></slot>
diff --git a/src/modules/krud/templates/list.vue b/src/modules/krud/templates/list.vue
index b0b3140..2b490cf 100644
--- a/src/modules/krud/templates/list.vue
+++ b/src/modules/krud/templates/list.vue
@@ -1,84 +1,84 @@
 <template>
     <section class="list-template">
         <div :class="`crud-page ${hideHeader ? 'no-header' : '' }`">
-<!--            <div class="crud-page-header">-->
-<!--                <div v-if="hasNavSlot" class="krud-left">-->
-<!--                    <div class="crud-page-header-left">-->
-<!--                        <slot name="nav"></slot>-->
-<!--                    </div>-->
-<!--                </div>-->
-
-<!--                <div v-else class="crud-page-header-left">-->
-<!--                    <i v-if="$props.icon" :class="icon"></i>-->
-<!--                    <h3 v-if="$props.title">{{ $props.title.replace(/-/g, ' ') }}</h3>-->
-<!--                    <slot name="nav"></slot>-->
-<!--                </div>-->
-
-<!--                <div class="crud-page-header-right">-->
-<!--                    <div class="tool-options">-->
-<!--                        <slot name="tooloptions"></slot>-->
-<!--                    </div>-->
-<!--                    <krudtools :search="search"-->
-<!--                               :refresh="refresh"-->
-<!--                               :exportExcel="exportExcel"-->
-<!--                               :print="print"-->
-<!--                               :save="save"-->
-<!--                               :isPrint="isPrint"-->
-<!--                               :isExcel="isExcel"-->
-<!--                               :isRefresh="isRefresh"-->
-<!--                               :isSave="isSave"-->
-<!--                               :isSearch="isSearch"-->
-<!--                    />-->
-<!--                    <slot name="right"></slot>-->
-<!--                </div>-->
-<!--            </div>-->
-
-            <krud-header-bs v-if="$theme == 'bs'"
-                            :title="title"
-                            :permissions="permissions"
-                            :search="search"
-                            :refresh="refresh"
-                            :exportExcel="exportExcel"
-                            :print="print"
-                            :save="save"
-                            :isPrint="isPrint"
-                            :isExcel="isExcel"
-                            :isRefresh="isRefresh"
-                            :isSave="isSave"
-                            :isSearch="isSearch">
-                <template slot="tooloptions">
-                    <slot name="tooloptions"></slot>
-                </template>
-
-                <template slot="header-left">
-                    <slot name="left"></slot>
-                </template>
-                <slot name="right"></slot>
-            </krud-header-bs>
-
-            <krud-header v-else
-                         :title="title"
-                         :permissions="permissions"
-                         :search="search"
-                         :refresh="refresh"
-                         :exportExcel="exportExcel"
-                         :print="print"
-                         :save="save"
-                         :isPrint="isPrint"
-                         :isExcel="isExcel"
-                         :isRefresh="isRefresh"
-                         :isSave="isSave"
-                         :isSearch="isSearch">
+            <div class="crud-page-header">
                 <div v-if="hasNavSlot" class="krud-left">
                     <div class="crud-page-header-left">
                         <slot name="nav"></slot>
                     </div>
                 </div>
-                <template slot="tooloptions">
-                    <slot name="tooloptions"></slot>
-                </template>
-                <slot name="right"></slot>
-            </krud-header>
+
+                <div v-else class="crud-page-header-left">
+                    <i v-if="$props.icon" :class="icon"></i>
+                    <h3 v-if="$props.title">{{ $props.title.replace(/-/g, ' ') }}</h3>
+                    <slot name="nav"></slot>
+                </div>
+
+                <div class="crud-page-header-right">
+                    <div class="tool-options">
+                        <slot name="tooloptions"></slot>
+                    </div>
+                    <krudtools :search="search"
+                               :refresh="refresh"
+                               :exportExcel="exportExcel"
+                               :print="print"
+                               :save="save"
+                               :isPrint="isPrint"
+                               :isExcel="isExcel"
+                               :isRefresh="isRefresh"
+                               :isSave="isSave"
+                               :isSearch="isSearch"
+                    />
+                    <slot name="right"></slot>
+                </div>
+            </div>
+
+<!--            <krud-header-bs v-if="$theme == 'bs'"-->
+<!--                            :title="title"-->
+<!--                            :permissions="permissions"-->
+<!--                            :search="search"-->
+<!--                            :refresh="refresh"-->
+<!--                            :exportExcel="exportExcel"-->
+<!--                            :print="print"-->
+<!--                            :save="save"-->
+<!--                            :isPrint="isPrint"-->
+<!--                            :isExcel="isExcel"-->
+<!--                            :isRefresh="isRefresh"-->
+<!--                            :isSave="isSave"-->
+<!--                            :isSearch="isSearch">-->
+<!--                <template slot="tooloptions">-->
+<!--                    <slot name="tooloptions"></slot>-->
+<!--                </template>-->
+
+<!--                <template slot="header-left">-->
+<!--                    <slot name="left"></slot>-->
+<!--                </template>-->
+<!--                <slot name="right"></slot>-->
+<!--            </krud-header-bs>-->
+
+<!--            <krud-header v-else-->
+<!--                         :title="title"-->
+<!--                         :permissions="permissions"-->
+<!--                         :search="search"-->
+<!--                         :refresh="refresh"-->
+<!--                         :exportExcel="exportExcel"-->
+<!--                         :print="print"-->
+<!--                         :save="save"-->
+<!--                         :isPrint="isPrint"-->
+<!--                         :isExcel="isExcel"-->
+<!--                         :isRefresh="isRefresh"-->
+<!--                         :isSave="isSave"-->
+<!--                         :isSearch="isSearch">-->
+<!--                <div v-if="hasNavSlot" class="krud-left">-->
+<!--                    <div class="crud-page-header-left">-->
+<!--                        <slot name="nav"></slot>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--                <template slot="tooloptions">-->
+<!--                    <slot name="tooloptions"></slot>-->
+<!--                </template>-->
+<!--                <slot name="right"></slot>-->
+<!--            </krud-header>-->
 
             <div class="crud-page-body">
                 <div class="v-nav" v-if="hasVNavSlot">

From 5bacaf36e41e53c610df523d30ff438c3c96b645 Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Fri, 6 Dec 2024 16:36:30 +0800
Subject: [PATCH 05/25] editable money element added

---
 src/modules/datagrid/Datagrid.vue             |  5 ++
 src/modules/datagrid/GridFormItem.vue         |  2 +-
 .../datagrid/elements/editableMoney.vue       | 87 +++++++++++++++++++
 3 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 src/modules/datagrid/elements/editableMoney.vue

diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index b8edae7..386684f 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -174,6 +174,7 @@ import Button from "./elements/Button";
 import editableText from "./elements/editableText"
 import editableDate from "./elements/editableDate"
 import editableNumber from "./elements/editableNumber"
+import editableMoney from "./elements/editableMoney"
 import editableSelect from "./elements/editableSelect"
 
 //Filter elements
@@ -246,6 +247,7 @@ export default {
             editableText,
             editableDate,
             editableNumber,
+            editableMoney,
             editableSelect,
             selectFloatingFilter,
             SetFilter,
@@ -1132,6 +1134,9 @@ export default {
                             case 'number':
                                 colItem.cellEditor = "editableNumber";
                                 break;
+                            case 'money':
+                                colItem.cellEditor = "editableMoney";
+                                break;
                             case 'select':
                                 colItem.cellEditor = "editableSelect";
                                 break;
diff --git a/src/modules/datagrid/GridFormItem.vue b/src/modules/datagrid/GridFormItem.vue
index c315072..aa4d5e4 100644
--- a/src/modules/datagrid/GridFormItem.vue
+++ b/src/modules/datagrid/GridFormItem.vue
@@ -40,7 +40,7 @@
         },
         data() {
             return {
-                editElements: ['text', 'number', 'date'],
+                editElements: ['text', 'number', 'date', 'money'],
             };
         },
     };
diff --git a/src/modules/datagrid/elements/editableMoney.vue b/src/modules/datagrid/elements/editableMoney.vue
new file mode 100644
index 0000000..c41e955
--- /dev/null
+++ b/src/modules/datagrid/elements/editableMoney.vue
@@ -0,0 +1,87 @@
+<template>
+    <InputNumber :ref="'input'" @keypress="onKeyDown($event)" v-model="value" :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
+           :parser="value => value.replace(/\$\s?|(,*)/g, '')" style="width: 100%!important"/>
+</template>
+<script>
+import Vue from "vue";
+
+export default Vue.extend({
+    data() {
+        return {
+            value: '',
+            cancelBeforeStart: true
+        }
+    },
+    methods: {
+        getValue() {
+            return this.value;
+        },
+
+        isCancelBeforeStart() {
+            return this.cancelBeforeStart;
+        },
+
+        // isCancelAfterEnd() {
+        //     return this.value > 1000000;
+        // },
+
+        onKeyDown(event) {
+
+            if (!this.isKeyPressedNumeric(event)) {
+                this.$refs.input.focus();
+                if (event.preventDefault) event.preventDefault();
+            } else if (this.isKeyPressedNavigation(event)) {
+                event.stopPropagation();
+            }
+        },
+
+        getCharCodeFromEvent(event) {
+            event = event || window.event;
+            return (typeof event.which === "undefined") ? event.keyCode : event.which;
+        },
+
+        isCharNumeric(charStr) {
+            return /\d/.test(charStr);
+        },
+
+        isKeyPressedNumeric(event) {
+            const charCode = this.getCharCodeFromEvent(event);
+            const charStr = String.fromCharCode(charCode);
+            return this.isCharNumeric(charStr);
+        },
+        isKeyPressedNavigation(event) {
+            return event.keyCode === 39
+                || event.keyCode === 37;
+        }
+    },
+    created() {
+        // this.value = this.params.value;
+
+        if (this.isCharNumeric(this.params.charPress)) {
+            this.value = this.params.charPress;
+        } else {
+            if (this.params.value !== undefined && this.params.value !== null) {
+                this.value = this.params.value;
+            }
+        }
+
+        // only start edit if key pressed is a number, not a letter
+        this.cancelBeforeStart = this.params.charPress && ('1234567890'.indexOf(this.params.charPress) < 0);
+
+
+    },
+    mounted() {
+        Vue.nextTick(() => {
+            // need to check if the input reference is still valid - if the edit was cancelled before it started there
+            // wont be an editor component anymore
+            if (this.$refs.input) {
+                this.$refs.input.focus();
+            }
+        });
+    }
+})
+</script>
+
+<style scoped>
+
+</style>

From b20fe8c646275c1bb03d3a13bdb604747f372175 Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Fri, 6 Dec 2024 17:18:49 +0800
Subject: [PATCH 06/25] pinned left background

---
 src/modules/datagrid/scss/_override.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/datagrid/scss/_override.scss b/src/modules/datagrid/scss/_override.scss
index 7b523a1..303a259 100644
--- a/src/modules/datagrid/scss/_override.scss
+++ b/src/modules/datagrid/scss/_override.scss
@@ -488,7 +488,7 @@ img.ag-grid-image {
 
 .ag-pinned-left-header {
     //z-index: 1000;
-    //background: #fafafa;
+    background: #fafafa;
     border-right: solid 1px #cccccc !important;
 }
 

From 2f53ef26931f9bbbb9a48183a08078c72687cb04 Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Mon, 9 Dec 2024 18:24:39 +0800
Subject: [PATCH 07/25] editable select element added

---
 src/modules/datagrid/Datagrid.vue             |  6 +-
 src/modules/datagrid/GridFormItem.vue         |  2 +-
 .../datagrid/elements/editableSelect.vue      | 75 +++++++------------
 3 files changed, 31 insertions(+), 52 deletions(-)

diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index 386684f..e2f9ffb 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -1139,6 +1139,9 @@ export default {
                                 break;
                             case 'select':
                                 colItem.cellEditor = "editableSelect";
+                                colItem.cellEditorParams = {
+                                    id: this.$props.schemaID
+                                };
                                 break;
                             default:
                                 break;
@@ -1909,7 +1912,8 @@ export default {
             if (this.editableShouldSubmit) {
                 let item = {
                     rowIndex: row.rowIndex,
-                    data: row.data
+                    data: row.data,
+                    gridId: this.$props.schemaID,
                 };
                 this.changedRowsData.push(item);
                 return;
diff --git a/src/modules/datagrid/GridFormItem.vue b/src/modules/datagrid/GridFormItem.vue
index aa4d5e4..d015fae 100644
--- a/src/modules/datagrid/GridFormItem.vue
+++ b/src/modules/datagrid/GridFormItem.vue
@@ -40,7 +40,7 @@
         },
         data() {
             return {
-                editElements: ['text', 'number', 'date', 'money'],
+                editElements: ['text', 'number', 'date', 'money', 'select'],
             };
         },
     };
diff --git a/src/modules/datagrid/elements/editableSelect.vue b/src/modules/datagrid/elements/editableSelect.vue
index 2e0f5c2..e12c718 100644
--- a/src/modules/datagrid/elements/editableSelect.vue
+++ b/src/modules/datagrid/elements/editableSelect.vue
@@ -1,70 +1,45 @@
 <template>
-    <input :ref="'input'" type="text" @keydown="onKeyDown($event)" v-model="value"/>
+    <Select v-model="value" :placeholder="lang.type" clearable filterable>
+        <Option v-for="item in options" :value="item.label" :key="item.label">{{ item.label }}
+        </Option>
+    </Select>
 </template>
 <script>
 import Vue from "vue";
+import axios from "axios";
+import {getRelation} from "../utils/userFilter";
 
 export default Vue.extend(
     {
-        // template: `<input :ref="'input'" @keydown="onKeyDown($event)" v-model="value"/>`,
         data() {
             return {
+                options: [],
                 value: '',
-                cancelBeforeStart: true
             }
         },
-
-        methods: {
-            getValue() {
-                return this.value;
-            },
-
-            isCancelBeforeStart() {
-                return this.cancelBeforeStart;
-            },
-
-            // will reject the number if it greater than 1,000,000
-            // not very practical, but demonstrates the method.
-            isCancelAfterEnd() {
-                return this.value > 1000000;
-            },
-
-            onKeyDown(event) {
-                if (!this.isKeyPressedNumeric(event)) {
-                    if (event.preventDefault) event.preventDefault();
-                }
-            },
-
-            getCharCodeFromEvent(event) {
-                event = event || window.event;
-                return (typeof event.which === "undefined") ? event.keyCode : event.which;
+        computed: {
+            lang() {
+                const labels = ['type',
+                ];
+                return labels.reduce((obj, key, i) => {
+                    obj[key] = this.$t('dataGrid.' + labels[i]);
+                    return obj;
+                }, {});
             },
-
-            isCharNumeric(charStr) {
-                return /\d/.test(charStr);
-            },
-
-            isKeyPressedNumeric(event) {
-                const charCode = this.getCharCodeFromEvent(event);
-                const charStr = String.fromCharCode(charCode);
-                return this.isCharNumeric(charStr);
-            }
         },
         created() {
             this.value = this.params.value;
-
-            // only start edit if key pressed is a number, not a letter
-            this.cancelBeforeStart = this.params.charPress && ('1234567890'.indexOf(this.params.charPress) < 0);
-        },
-        mounted() {
-            Vue.nextTick(() => {
-                // need to check if the input reference is still valid - if the edit was cancelled before it started there
-                // wont be an editor component anymore
-                if (this.$refs.input) {
-                    this.$refs.input.focus();
-                }
+            let dataUrl = `/lambda/krud/${this.params.id}/options`;
+            this.params.column.filter.relation = getRelation(this.params.column.filter.relation);
+            axios.post(dataUrl, getRelation(this.params.column.filter.relation)).then(({data}) => {
+                this.options = data;
             });
-        }
+        },
+        methods: {
+            getValue() {
+                return this.value;
+            },
+        },
     })
 </script>
 

From 52681ab0d740e1d522352ef8629d8df96b5d8d99 Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Mon, 9 Dec 2024 18:48:02 +0800
Subject: [PATCH 08/25] select element placeholder update

---
 src/modules/datagrid/elements/editableSelect.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/modules/datagrid/elements/editableSelect.vue b/src/modules/datagrid/elements/editableSelect.vue
index e12c718..b95d3a6 100644
--- a/src/modules/datagrid/elements/editableSelect.vue
+++ b/src/modules/datagrid/elements/editableSelect.vue
@@ -1,5 +1,6 @@
 <template>
-    <Select v-model="value" :placeholder="lang.type" clearable filterable>
+    <Select v-model="value" :placeholder="lang.select" clearable filterable>
+<!--    <Select v-model="value" :placeholder="placeholder" clearable filterable>-->
         <Option v-for="item in options" :value="item.label" :key="item.label">{{ item.label }}
         </Option>
     </Select>
@@ -15,14 +16,15 @@ export default Vue.extend(
             return {
                 options: [],
                 value: '',
+                placeholder: ''
             }
         },
         computed: {
             lang() {
-                const labels = ['type',
+                const labels = ['select',
                 ];
                 return labels.reduce((obj, key, i) => {
-                    obj[key] = this.$t('dataGrid.' + labels[i]);
+                    obj[key] = this.$t('dataSource.' + labels[i]);
                     return obj;
                 }, {});
             },
@@ -34,6 +36,10 @@ export default Vue.extend(
             axios.post(dataUrl, getRelation(this.params.column.filter.relation)).then(({data}) => {
                 this.options = data;
             });
+            this.placeholder = this.params.column.label;
+            console.log(this.params);
+            console.log('re');
+            console.log(this.params.column.filter.relation);
         },
         methods: {
             getValue() {

From 136febd165e65a6b82291b7e332435e1ce85d90b Mon Sep 17 00:00:00 2001
From: Mungunbagana Batzorig <MB.Bagana@gmail.com>
Date: Tue, 17 Dec 2024 10:01:41 +0800
Subject: [PATCH 09/25] some

---
 qodana.yaml                     | 32 ++++++++++++++++++++++++++++++++
 src/components/IconSelector.vue |  2 +-
 src/components/UserControl.vue  |  3 ++-
 src/components/listview.vue     |  6 +++++-
 src/modules/agent/index.js      |  2 +-
 5 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 qodana.yaml

diff --git a/qodana.yaml b/qodana.yaml
new file mode 100644
index 0000000..26a653d
--- /dev/null
+++ b/qodana.yaml
@@ -0,0 +1,32 @@
+#-------------------------------------------------------------------------------#
+#               Qodana analysis is configured by qodana.yaml file               #
+#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
+#-------------------------------------------------------------------------------#
+version: "1.0"
+
+#Specify inspection profile for code analysis
+profile:
+  name: qodana.starter
+
+#Enable inspections
+#include:
+#  - name: <SomeEnabledInspectionId>
+
+#Disable inspections
+#exclude:
+#  - name: <SomeDisabledInspectionId>
+#    paths:
+#      - <path/where/not/run/inspection>
+
+php:
+  version: 8.1 #(Applied in CI/CD pipeline)
+
+#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
+#bootstrap: sh ./prepare-qodana.sh
+
+#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
+#plugins:
+#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
+
+#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
+linter: jetbrains/qodana-php:latest
diff --git a/src/components/IconSelector.vue b/src/components/IconSelector.vue
index 5f27a5b..76f5705 100644
--- a/src/components/IconSelector.vue
+++ b/src/components/IconSelector.vue
@@ -3024,7 +3024,7 @@ export default {
             let iconGroup = [];
             if (this.iconSearch !== null && this.iconSearch != "") {
                 this.iconData.forEach(group => {
-                    if (group.hasOwnProperty("icons")) {
+                    if (group && group.hasOwnProperty("icons")) {
                         let icons = group.icons.filter(icon => icon.toLowerCase().includes(this.iconSearch.toLowerCase()));
                         if (icons.length >= 1) {
                             iconGroup.push({
diff --git a/src/components/UserControl.vue b/src/components/UserControl.vue
index 1bb282d..1ac268e 100644
--- a/src/components/UserControl.vue
+++ b/src/components/UserControl.vue
@@ -91,7 +91,8 @@ export default {
 
     methods: {
         logout() {
-            axios.post("/auth/logout", {}).then(o => {
+            // eslint-disable-next-line no-undef
+            axios.post("/auth/logout", {}).then(()=> {
                 window.location = "/auth/login";
             });
         },
diff --git a/src/components/listview.vue b/src/components/listview.vue
index 151f431..1489beb 100644
--- a/src/components/listview.vue
+++ b/src/components/listview.vue
@@ -61,7 +61,7 @@
                         <router-link :to="`${prefix ? prefix : ''}/${type}/builder/${item.id}`" class="btn-edit">
                             <Icon type="md-create"></Icon>
                         </router-link>
-                        <Poptip confirm :title="lang.delete_data" confirm width="180" :ok-text="lang1.yes"
+                        <Poptip confirm :title="lang.delete_data" width="180" :ok-text="lang1.yes"
                                 :cancel-text="lang1.no" @on-ok="deleteListItem(item.id)" @on-cancel="cancel">
                             <a href="javascript:void(0)" class="btn-del">
                                 <Icon type="ios-trash"></Icon>
@@ -147,6 +147,7 @@ export default {
     },
     methods: {
         getData() {
+            // eslint-disable-next-line no-undef
             axios.get(this.$props.src).then(({data}) => {
                 this.loading = false;
                 this.listData = data.data.sort((s1, s2) => {
@@ -186,6 +187,7 @@ export default {
             if (this.type === "datasource") {
                 src = "/lambda/puzzle/schema/datasource"
             }
+            // eslint-disable-next-line no-undef
             axios.post(src, data).then(({data}) => {
                 if (data.status) {
                     this.$Notice.success({
@@ -218,6 +220,7 @@ export default {
                     src = `/lambda/puzzle/project/${this.$project.id}/grid/${id}`
                 }
             }
+            // eslint-disable-next-line no-undef
             axios.get(src)
                 .then(({data}) => {
                     this.duplicateData.name = data.data.hasOwnProperty('name') ? data.data.name : data.data.model;
@@ -229,6 +232,7 @@ export default {
             });
         },
         deleteListItem(id) {
+            // eslint-disable-next-line no-undef
             axios.delete(this.$project ? `/lambda/puzzle/delete/project/vb_schemas/${this.$project.id}/${this.type}/${id}` : `/lambda/puzzle/delete/vb_schemas/${this.type}/${id}`).then(o => {
                 this.filteredList = this.filteredList.filter(
                     item => item.id !== id
diff --git a/src/modules/agent/index.js b/src/modules/agent/index.js
index 671237f..7ef1a37 100755
--- a/src/modules/agent/index.js
+++ b/src/modules/agent/index.js
@@ -8,7 +8,7 @@ const components = {
     'agent-form': AgentForm
 };
 
-const install = function (Vue, options) {
+const install = function (Vue) {
     if (install.installed) return;
     Object.keys(components).forEach(key => Vue.component(key, components[key]));
 };

From 41eb883acf740c56d49768cef75708852b895dbf Mon Sep 17 00:00:00 2001
From: Mungunbagana Batzorig <MB.Bagana@gmail.com>
Date: Tue, 17 Dec 2024 15:32:23 +0800
Subject: [PATCH 10/25] some

---
 src/modules/datagrid/Datagrid.vue    | 2 +-
 src/modules/krud/templates/mixins.js | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index 72c6b0a..f3c4e20 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -254,7 +254,7 @@ export default {
     },
 
     created() {
-        // console.log('condition', this.$props.custom_condition);
+        // console.log('actions', this.$props.actions);
     },
 
     watch: {
diff --git a/src/modules/krud/templates/mixins.js b/src/modules/krud/templates/mixins.js
index cd80c9a..78f90b1 100644
--- a/src/modules/krud/templates/mixins.js
+++ b/src/modules/krud/templates/mixins.js
@@ -14,6 +14,9 @@ export default {
     ],
     components: {
         krudtools
+    },
+    mounted() {
+
     },
     data() {
         return {

From d1daaa2538441433e99988e5bc9f6063ce89ef56 Mon Sep 17 00:00:00 2001
From: Tseegii Tselmeg <tseegii.it@gmail.com>
Date: Sat, 21 Dec 2024 20:20:29 +0800
Subject: [PATCH 11/25] Fixed double data

---
 src/modules/dataform/DataformMixin.js    | 4 +++-
 src/modules/dataform/ExpandOption.vue    | 6 +-----
 src/modules/dataform/SubForm.vue         | 2 --
 src/modules/dataform/elements/Select.vue | 6 +++++-
 src/modules/dataform/elements/index.js   | 2 +-
 src/modules/datagrid/Datagrid.vue        | 2 +-
 src/modules/datagrid/elements/Select.vue | 5 ++++-
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/modules/dataform/DataformMixin.js b/src/modules/dataform/DataformMixin.js
index 53687a6..4225213 100644
--- a/src/modules/dataform/DataformMixin.js
+++ b/src/modules/dataform/DataformMixin.js
@@ -291,6 +291,8 @@ export default {
                 this.step = formSchema.step;
             }
 
+            console.log(this.schema);
+
             this.ui = formSchema.ui
             if (formSchema.save_btn_text) {
                 this.save_btn_text = formSchema.save_btn_text
@@ -529,7 +531,7 @@ export default {
             if (!subForm) {
                 delete i['table']
                 delete i['extra']
-                i.schemaID = this.$props.schemaID
+                i.schemaID = this.$props.schemaID;
             }
             this.setPlaceholderLabel(i);
             return i
diff --git a/src/modules/dataform/ExpandOption.vue b/src/modules/dataform/ExpandOption.vue
index 0604774..9544207 100644
--- a/src/modules/dataform/ExpandOption.vue
+++ b/src/modules/dataform/ExpandOption.vue
@@ -260,9 +260,7 @@
                                     :options="[{type:'table',list:tableList}, {type:'view',list:viewList}]"
                                     @select="relationSchema"
                                     group-values="list" group-label="type" :group-select="true"
-
-                                ></multiselect>
-
+                                />
                             </li>
                             <li>
                                 <label>{{ lang.Related_fields }}</label>
@@ -379,8 +377,6 @@
                                             }}
                                         </Option>
                                     </OptionGroup>
-
-
                                 </Select>
                             </li>
                         </ul>
diff --git a/src/modules/dataform/SubForm.vue b/src/modules/dataform/SubForm.vue
index 5687f19..c1e5f2b 100644
--- a/src/modules/dataform/SubForm.vue
+++ b/src/modules/dataform/SubForm.vue
@@ -446,7 +446,6 @@ export default {
                         title: `${val} давхцаж байна !!!`
                     })
                 } else {
-
                     if (this.f.subtype === 'Form') {
                         this.f.formId = val
                         let defualtURL = `/lambda/puzzle/schema/form/${val}/builder`
@@ -459,7 +458,6 @@ export default {
                             this.f.schema = getTableMeta(formSchema.model)
                             this.f.model = formSchema.model
                         }
-
                     } else {
                         this.f.model = val
                         this.f.schema = getTableMeta(val)
diff --git a/src/modules/dataform/elements/Select.vue b/src/modules/dataform/elements/Select.vue
index 12da990..25b4a3b 100644
--- a/src/modules/dataform/elements/Select.vue
+++ b/src/modules/dataform/elements/Select.vue
@@ -116,6 +116,8 @@ export default {
             }
         },
     },
+
+
     data() {
         return {
             value: null,
@@ -170,7 +172,9 @@ export default {
         },
     },
 
-    created() {
+    mounted() {
+        console.log('select created', this.meta);
+
         if (this.meta.relation.addAble && this.meta.relation.addFrom) {
             this.addAble = true;
         }
diff --git a/src/modules/dataform/elements/index.js b/src/modules/dataform/elements/index.js
index 4e43aee..ae71fa1 100644
--- a/src/modules/dataform/elements/index.js
+++ b/src/modules/dataform/elements/index.js
@@ -5,7 +5,7 @@ export const elements = [
     },
     {
         element: "Select",
-        component: () => import(/* webpackChunkName: "form-field-Select" */'./Select.vue'),
+        component: () => import('./Select.vue'),
     },
     {
         element: "Number",
diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index e2f9ffb..d8e4510 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -1455,7 +1455,7 @@ export default {
                         });
 
                         //check later ----- Tseegii
-                        this.data.splice(index, 1);
+                        // this.data.splice(index, 1);
                         this.gridOptions.rowData.splice(index, 1);
 
                         this.info.total--;
diff --git a/src/modules/datagrid/elements/Select.vue b/src/modules/datagrid/elements/Select.vue
index 01d8c69..5729d1a 100644
--- a/src/modules/datagrid/elements/Select.vue
+++ b/src/modules/datagrid/elements/Select.vue
@@ -99,6 +99,10 @@ export default {
         },
     },
     mounted() {
+        console.log('I AM SELECT');
+        console.log(this.model.component);
+        console.log(this.meta);
+
         let dataUrl = `/lambda/krud/${this.meta.schemaID}/options`;
 
         if (this.meta.filter.relation.parentFieldOfForm != null && this.meta.filter.relation.parentFieldOfTable != null) {
@@ -119,7 +123,6 @@ export default {
             this.loading = false;
 
             if(this.model.form[this.model.component] != null && this.model.form[this.model.component] != undefined){
-
                 let valueIndex = this.options.findIndex(el=>el.value == this.model.form[this.model.component]);
                 if(valueIndex >= 0){
                     this.value = this.options[valueIndex];

From 286900a34052b1104fb86dcd84abec25b4856fbf Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Wed, 8 Jan 2025 17:44:04 +0800
Subject: [PATCH 12/25] z-index notice

---
 src/template/paper/scss/iv-override.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/template/paper/scss/iv-override.scss b/src/template/paper/scss/iv-override.scss
index d84ac72..2c77a7a 100644
--- a/src/template/paper/scss/iv-override.scss
+++ b/src/template/paper/scss/iv-override.scss
@@ -93,7 +93,7 @@
 }
 
 .ivu-notice {
-    z-index: 99999;
+    z-index: 99999 !important;
 }
 
 .ivu-modal-mask {

From 5f66f3b101af90609b04105f6b80cdd8ae97de2e Mon Sep 17 00:00:00 2001
From: n0m4dz <tseegii.it@gmail.com>
Date: Wed, 26 Mar 2025 17:06:11 +0800
Subject: [PATCH 13/25] Fixed grid bug

---
 src/index.js                                 |  2 +-
 src/modules/datagrid/Datagrid.vue            | 67 ++++++++++++--------
 src/modules/datagrid/elements/TextFilter.vue | 40 ++++++++++++
 src/modules/datagrid/scss/_template.scss     |  8 +++
 src/modules/datagrid/utils/data.js           |  1 +
 5 files changed, 92 insertions(+), 26 deletions(-)
 create mode 100644 src/modules/datagrid/elements/TextFilter.vue

diff --git a/src/index.js b/src/index.js
index 55f462e..dba0880 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,7 +3,7 @@
  */
 import Vue from "vue";
 import axios from 'axios';
-import {i18n} from './locale';
+import { i18n } from './locale';
 import router from './router'
 import App from './app.vue';
 import {
diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index d8e4510..f34e289 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -50,7 +50,6 @@
                     @grid-ready="onGridReady"
                     @sort-changed="onSortChanged"
                     @filter-changed="onFilterChanged"
-                    @filter-modified="onFilterModified"
                     @row-double-clicked="onRowDblClick"
                     @row-clicked="onRowClick"
                     @row-selected="onRowSelected"
@@ -182,6 +181,7 @@ import selectFloatingFilter from "./elements/selectFloatingFilter"
 import SetFilter from "./elements/SetFilter"
 import SetFilterDate from "./elements/SetFilterDate"
 import SetFilterAltered from "./elements/SetFilterAltered"
+import TextFilter from "./elements/TextFilter.vue"
 import "./elements/ExcelFilter.js"
 import GridRowUpdate from "./GridRowUpdate";
 
@@ -253,11 +253,13 @@ export default {
             SetFilter,
             SetFilterAltered,
             SetFilterDate,
+            TextFilter
         };
     },
 
     created() {
         console.log('condition', this.$props.custom_condition);
+        this.axiosController = new AbortController();
     },
 
     watch: {
@@ -919,6 +921,18 @@ export default {
                             colItem.filter = "agTextColumnFilter";
 
                             if (!this.isClient) {
+                                //Check next time and add custom filter here
+                                colItem.floatingFilterComponent = "TextFilter";
+                                colItem.floatingFilterComponentParams = {
+                                    schemaID: this.$props.schemaID,
+                                    column: this.schema.find(col => col.model == item.model),
+                                    width: item.width,
+                                    isClient: this.isClient,
+                                    filterModel: this.filterModel,
+                                    filterType: 'text',
+                                    filterData: this.isClient ? this.onClientFilter : this.updateFilterModel
+                                };
+
                                 colItem.filterParams = {
                                     // newRowsAction: "keep",
                                     suppressAndOrCondition: true,
@@ -1236,7 +1250,7 @@ export default {
                 filters.custom_condition = this.custom_condition;
             }
 
-            axios.post(url, filters).then(({data}) => {
+            axios.post(url, filters, {signal: this.axiosController.signal}).then(({data}) => {
                 if (this.isClient) {
                     if (Array.isArray(data)) {
                         this.$data.data = data;
@@ -1253,10 +1267,10 @@ export default {
                     this.$data.data = data.data;
                     this.gridOptions.api.setRowData(data.data)
 
+
                     if (this.aggregations.columnAggregations.length >= 1) {
                         this.fetchAggregations(filters);
                     }
-                    // }
                 }
 
                 if (this.$data.gridOptions.sizeColumnsToFit) {
@@ -1270,7 +1284,7 @@ export default {
                     this.gridApi.hideOverlay();
                 }
 
-                //select prev selected items
+                // select prev selected items
                 setTimeout(() => {
                     this.preselect();
 
@@ -1280,7 +1294,6 @@ export default {
                     });
                 }, 100);
 
-
                 this.isLoading = false;
             }).catch(e => {
                 console.log(e.message);
@@ -1296,7 +1309,7 @@ export default {
 
         filterData(page) {
             this.changePage(page);
-            if(this.onFilterChange) {
+            if (this.onFilterChange) {
                 this.onFilterChange(this.filterModel);
             }
         },
@@ -1456,7 +1469,8 @@ export default {
 
                         //check later ----- Tseegii
                         // this.data.splice(index, 1);
-                        this.gridOptions.rowData.splice(index, 1);
+                        // this.gridOptions.rowData.splice(index, 1);
+                        this.data = this.data.filter(item => item[this.identity] !== id);
 
                         this.info.total--;
                         setTimeout(() => {
@@ -1784,7 +1798,9 @@ export default {
         onFilterModified(event) {
             if (!this.isClient) {
                 //Todo server side configs
-                console.log(event);
+                // console.log(event);
+                // console.log('I am here', this.filterModel);
+                // console.log(this.gridOptions.api.getFilterModel());
             }
         },
 
@@ -1795,6 +1811,7 @@ export default {
 
             //when enable server side filter
             if (!this.isClient) {
+
                 for (let key in this.filterModel) {
                     if (typeof this.filterModel[key] === 'object') {
                         delete this.filterModel[key];
@@ -1809,23 +1826,23 @@ export default {
             } else {
                 let filters = event.api.getFilterModel();
                 console.log(filters);
-
-                for (let key in filters) {
-                    if (Object.prototype.hasOwnProperty.call(filters, key)) {
-                        // console.log(filters[key]);
-                        if (filters[key].filterType == "set" && this.selectInputModels.includes(key)) {
-                            let instance = this.gridApi.getFilterInstance(key);
-                            console.log("here", instance);
-
-                            //             if (instance.isNothingSelected()) {
-                            //                 console.log("I am here nothing");
-                            //                 //     instance.selectEverything();
-                            //                 //     // this.gridApi.onFilterChanged();
-                            //             }
-                            // instance.resetFilterValues();
-                        }
-                    }
-                }
+                //
+                // for (let key in filters) {
+                //     if (Object.prototype.hasOwnProperty.call(filters, key)) {
+                // console.log(filters[key]);
+                // if (filters[key].filterType == "set" && this.selectInputModels.includes(key)) {
+                //     let instance = this.gridApi.getFilterInstance(key);
+                //     console.log("here", instance);
+
+                //             if (instance.isNothingSelected()) {
+                //                 console.log("I am here nothing");
+                //                 //     instance.selectEverything();
+                //                 //     // this.gridApi.onFilterChanged();
+                //             }
+                // instance.resetFilterValues();
+                // }
+                //     }
+                // }
                 this.info.total = this.gridApi.getModel().rootNode.childrenAfterFilter.length;
             }
         },
diff --git a/src/modules/datagrid/elements/TextFilter.vue b/src/modules/datagrid/elements/TextFilter.vue
new file mode 100644
index 0000000..c59e5ae
--- /dev/null
+++ b/src/modules/datagrid/elements/TextFilter.vue
@@ -0,0 +1,40 @@
+<template>
+    <input class="ag-grid-custom-text-filter" @input="onFilterChange"/>
+</template>
+
+<script>
+import Vue from "vue";
+import axios from "axios";
+import {element} from "../elements";
+import {getRelation} from "../utils/userFilter";
+import debounce from 'lodash.debounce';
+export default Vue.extend({
+    data() {
+        return {
+            options: [],
+            selected: '',
+            currentValue: null
+        }
+    },
+
+    created() {
+        this.onFilterChange = debounce(this.onFilterChange, 300);
+    },
+
+    methods: {
+        element: element,
+
+        onFilterChange(e) {
+            this.valueChanged(e);
+        },
+
+        valueChanged(e) {
+            if (this.params.isClient) {
+                this.params.filterData(this.params.column.model, e.target.value, 'contains');
+            } else {
+                this.params.filterData(this.params.column.model, e.target.value);
+            }
+        }
+    }
+});
+</script>
diff --git a/src/modules/datagrid/scss/_template.scss b/src/modules/datagrid/scss/_template.scss
index 5f76098..a84a82e 100644
--- a/src/modules/datagrid/scss/_template.scss
+++ b/src/modules/datagrid/scss/_template.scss
@@ -100,3 +100,11 @@
     display: flex;
     flex-direction: column;
 }
+
+.ag-grid-custom-text-filter{
+    width: 100% !important;
+    height: 100% !important;
+    color: #000 !important;
+    border: 0 !important;
+    box-shadow: none !important;
+}
diff --git a/src/modules/datagrid/utils/data.js b/src/modules/datagrid/utils/data.js
index 16c9d5a..a214260 100644
--- a/src/modules/datagrid/utils/data.js
+++ b/src/modules/datagrid/utils/data.js
@@ -105,6 +105,7 @@ export const data = (vm) => {
         showGrid: false,
         saveFilter: false,
         selectInputModels: [],
+        axiosController: null
         // updateDisableField:null,
         // updateDisableFieldValue:null
     }

From 7c044a659e1c7ddce4658f176bed806c694934b7 Mon Sep 17 00:00:00 2001
From: n0m4dz <tseegii.it@gmail.com>
Date: Sat, 5 Apr 2025 17:12:10 +0800
Subject: [PATCH 14/25] Fixed param value of form

---
 src/modules/dataform/DataformMixin.js    | 13 +++++--------
 src/modules/dataform/elements/Date.vue   |  1 -
 src/modules/dataform/elements/Select.vue |  2 --
 src/modules/krud/Krud.vue                |  2 --
 src/modules/page/NavBs.vue               |  2 +-
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/modules/dataform/DataformMixin.js b/src/modules/dataform/DataformMixin.js
index 4225213..517e0ab 100644
--- a/src/modules/dataform/DataformMixin.js
+++ b/src/modules/dataform/DataformMixin.js
@@ -250,7 +250,6 @@ export default {
             try {
                 let response = await axios.get(configUrl)
                 let data = JSON.parse(response.data.data.schema)
-                console.log("form schema: ", data);
 
                 data['form_id'] = response.data.data.id
                 data['form_name'] = response.data.data.name
@@ -291,8 +290,6 @@ export default {
                 this.step = formSchema.step;
             }
 
-            console.log(this.schema);
-
             this.ui = formSchema.ui
             if (formSchema.save_btn_text) {
                 this.save_btn_text = formSchema.save_btn_text
@@ -339,7 +336,7 @@ export default {
 
         setHiddenItemModel(schema) {
             schema.forEach(item => {
-                    if (item.hidden || item.disabled) {
+                    if (item.hidden || item.disabled || item.param) {
                         if (this.isValid(item.default)) {
                             this.setModel(item.model, item.default, item.formType)
                         }
@@ -347,12 +344,14 @@ export default {
                         if (item.hasUserId) {
                             this.setModel(item.model, window.init.user.id * 1, item.formType)
                         }
+
                         if (item.fillByUserField !== null && item.fillByUserField !== '' && item.fillByUserField !== undefined) {
                             this.setModel(item.model, window.init.user[item.fillByUserField], item.formType)
                         }
+
                         if (this.isValid(item.param)) {
-                            if (item.param in this.$route.params) {
-                                let param = this.$route.params[item.param]
+                            if (this.$route.query[item.param]) {
+                                let param = this.$route.query[item.param]
                                 if (param != 'null') {
                                     Vue.set(this.$data.model, item.model, param)
                                 }
@@ -1018,8 +1017,6 @@ export default {
                     }
                 }
             })
-            console.log('selects: ', selects);
-
             return selects
         },
 
diff --git a/src/modules/dataform/elements/Date.vue b/src/modules/dataform/elements/Date.vue
index 3fb9e09..d20bb0e 100644
--- a/src/modules/dataform/elements/Date.vue
+++ b/src/modules/dataform/elements/Date.vue
@@ -36,7 +36,6 @@ export default {
         }
     },
     created() {
-        console.log('working: ', model.form[this.model.component]);
         if(typeof this.meta.autoFillCurrentDate != undefined && this.meta.autoFillCurrentDate){
             this.model.form[this.model.component] = new Date();
         }
diff --git a/src/modules/dataform/elements/Select.vue b/src/modules/dataform/elements/Select.vue
index 25b4a3b..6d5ce3a 100644
--- a/src/modules/dataform/elements/Select.vue
+++ b/src/modules/dataform/elements/Select.vue
@@ -173,8 +173,6 @@ export default {
     },
 
     mounted() {
-        console.log('select created', this.meta);
-
         if (this.meta.relation.addAble && this.meta.relation.addFrom) {
             this.addAble = true;
         }
diff --git a/src/modules/krud/Krud.vue b/src/modules/krud/Krud.vue
index 4ed3395..bf962ae 100644
--- a/src/modules/krud/Krud.vue
+++ b/src/modules/krud/Krud.vue
@@ -79,8 +79,6 @@ export default {
 
     methods: {
         renderTemplate(template) {
-            console.log("template number:", template);
-
             if (templates.hasOwnProperty(template)) {
                 return templates[template]
             } else {
diff --git a/src/modules/page/NavBs.vue b/src/modules/page/NavBs.vue
index 667389c..d8e3e3d 100644
--- a/src/modules/page/NavBs.vue
+++ b/src/modules/page/NavBs.vue
@@ -21,7 +21,7 @@ export default {
         };
     },
     created() {
-        console.log("MENU", this.menu);
+
     },
     methods: {
         can(menu) {

From 1a6269b921409d6095106ee56dc5de6ee3f3f51d Mon Sep 17 00:00:00 2001
From: n0m4dz <tseegii.it@gmail.com>
Date: Sat, 12 Apr 2025 19:43:06 +0800
Subject: [PATCH 15/25] fixed position

---
 src/modules/dataform/Dataform.vue | 176 ++++++++++++------------------
 1 file changed, 67 insertions(+), 109 deletions(-)

diff --git a/src/modules/dataform/Dataform.vue b/src/modules/dataform/Dataform.vue
index 357a486..05cd7db 100644
--- a/src/modules/dataform/Dataform.vue
+++ b/src/modules/dataform/Dataform.vue
@@ -69,147 +69,105 @@
                     <div v-else>
                         <Row v-for='row in ui.schema' :key='row.index'>
                             <!-- Section -->
-                            <Col v-for='col in row.children' v-if='isVisibleSection(col) && !row.sectionRenderByTab'
+                            <Col v-for='col in row.children'
                                  :key='col.index' :xs='col.span.xs'
                                  :sm='col.span.sm' :md='col.span.md' :lg='col.span.lg'>
-                                <div
-                                    :class="col.name !== '' && col.name !== null && col.name !== undefined ? 'fieldset' : ''">
-                                    <legend v-if="col.name != ''">{{ col.name }}</legend>
-                                    <Row v-for='srow in col.children' :key='srow.index'>
-                                        <Col v-for='scol in srow.children' :id='scol.id' :key='scol.index' :xs='24'
-                                             :sm='24' :md='scol.span.md' :lg='scol.span.lg'>
-                                            <Divider v-if='scol.name' orientation='left' class='form-divider'>
-                                                {{ scol.name }}
-                                            </Divider>
-                                            <div v-for='item in scol.children' :key='item.index'>
-                                                <component
-                                                    :key='item.id'
-                                                    :ref="'sf'+item.id"
-                                                    :url='url'
-                                                    v-if="isShow(item.model) && item.formType == 'SubForm' && item.subtype"
-                                                    :is='element(`subform/${item.subtype}`)'
-                                                    :model='{form: model, component: item.model}'
-                                                    :form='setMeta(item, true)'
-                                                    :formula='formula'
-                                                    :relations='relations'
-                                                    :asyncMode='asyncMode'
-                                                    :editMode='editMode'
-                                                />
 
-                                                <component
-                                                    :key='item.model'
-                                                    v-if="isShow(item.model) && item.formType != 'SubForm'"
-                                                    :do_render='do_render'
-                                                    :asyncMode='asyncMode'
-                                                    :editMode='editMode'
-                                                    :is='element(item.formType)'
-                                                    :model='{form: model, component: item.model}'
-                                                    :disabled='item.disabled ? item.disabled : false'
-                                                    :label='getLabel(item)'
-                                                    :rule='item.model'
-                                                    :meta='setMeta(item)'
-                                                    :identity='identity'
-                                                    :url='url'
-                                                    :getSchemaByModel='getSchemaByModel'
-                                                    :getSchemaRelationByModel='getSchemaRelationByModel'
-                                                    :setSchemaByModel='setSchemaByModel'
-                                                    :relation_data='getRelation(item)'
-                                                />
-                                            </div>
-                                        </Col>
-                                    </Row>
-                                </div>
                             </Col>
 
-                            <!-- Tab -->
-                            <Tabs :value='0' v-if='row.sectionRenderByTab'>
-                                <TabPane :label='col.name' :name='col.index' v-for='col in row.children'
-                                         v-if='isVisibleSection(col)' :key='col.index'>
-                                    <Row v-for='srow in col.children' :key='srow.index'>
-                                        <Col v-for='scol in srow.children' :id='scol.id' :key='scol.index' :xs='24'
-                                             :sm='24' :md='scol.span.md' :lg='scol.span.lg'>
-                                            <Divider v-if='scol.name' orientation='left' class='form-divider'>
-                                                {{ scol.name }}
-                                            </Divider>
-                                            <span v-for='item in scol.children' :key='item.index'>
+                            <!-- Standart column -->
+                            <Col v-for='col in row.children' :key='col.index' :xs='col.span.xs'
+                                 :sm='col.span.sm' :md='col.span.md' :lg='col.span.lg'>
+                                <div v-if="col.type == 'col'">
+                                    <Divider v-if='col.name' orientation='left' class='form-divider'>
+                                        {{ col.name }}
+                                    </Divider>
+                                    <div v-for='item in col.children' :key='item.index'>
                                         <component
+                                            :key='item.model'
                                             :ref="'sf'+item.id"
                                             v-if="isShow(item.model) && item.formType == 'SubForm' && item.subtype"
                                             :is='element(`subform/${item.subtype}`)'
+                                            :label='getLabel(item)'
                                             :model='{form: model, component: item.model}'
                                             :form='setMeta(item, true)'
-                                            :formula='formula'
-                                            :url='url'
                                             :relations='relations'
                                             :asyncMode='asyncMode'
+                                            :formula='formula'
+                                            :schemaID='schemaID'
+                                            :url='url'
                                             :editMode='editMode'>
                                         </component>
+
                                         <component
+                                            :key='item.model'
                                             v-if="isShow(item.model) && item.formType != 'SubForm'"
                                             :do_render='do_render'
-                                            :asyncMode='asyncMode'
                                             :editMode='editMode'
                                             :is='element(item.formType)'
-                                            :model='{form: model, component: item.model}'
-                                            :key="model"
-                                            :url='url'
                                             :disabled='item.disabled ? item.disabled : false'
+                                            :model='{form: model, component: item.model}'
                                             :label='getLabel(item)'
                                             :rule='item.model'
                                             :meta='setMeta(item)'
                                             :identity='identity'
+                                            :asyncMode='asyncMode'
                                             :getSchemaByModel='getSchemaByModel'
                                             :getSchemaRelationByModel='getSchemaRelationByModel'
                                             :setSchemaByModel='setSchemaByModel'
                                             :relation_data='getRelation(item)'>
                                         </component>
-                                        </span>
-                                        </Col>
-                                    </Row>
-                                </TabPane>
-                            </Tabs>
+                                    </div>
+                                </div>
 
-                            <!-- Standart column -->
-                            <Col v-for='col in row.children' v-if="col.type == 'col'" :key='col.index' :xs='col.span.xs'
-                                 :sm='col.span.sm' :md='col.span.md' :lg='col.span.lg'>
-                                <Divider v-if='col.name' orientation='left' class='form-divider'>
-                                    {{ col.name }}
-                                </Divider>
-                                <div v-for='item in col.children' :key='item.index'>
-                                    <component
-                                        :key='item.model'
-                                        :ref="'sf'+item.id"
-                                        v-if="isShow(item.model) && item.formType == 'SubForm' && item.subtype"
-                                        :is='element(`subform/${item.subtype}`)'
-                                        :label='getLabel(item)'
-                                        :model='{form: model, component: item.model}'
-                                        :form='setMeta(item, true)'
-                                        :relations='relations'
-                                        :asyncMode='asyncMode'
-                                        :formula='formula'
-                                        :schemaID='schemaID'
-                                        :url='url'
-                                        :editMode='editMode'>
-                                    </component>
+                                <div v-if='isVisibleSection(col) && !row.sectionRenderByTab'>
+                                    <div
+                                        :class="col.name !== '' && col.name !== null && col.name !== undefined ? 'fieldset' : ''">
+                                        <legend v-if="col.name != ''">{{ col.name }}</legend>
+                                        <Row v-for='srow in col.children' :key='srow.index'>
+                                            <Col v-for='scol in srow.children' :id='scol.id' :key='scol.index' :xs='24'
+                                                 :sm='24' :md='scol.span.md' :lg='scol.span.lg'>
+                                                <Divider v-if='scol.name' orientation='left' class='form-divider'>
+                                                    {{ scol.name }}
+                                                </Divider>
+                                                <div v-for='item in scol.children' :key='item.index'>
+                                                    <component
+                                                        :key='item.id'
+                                                        :ref="'sf'+item.id"
+                                                        :url='url'
+                                                        v-if="isShow(item.model) && item.formType == 'SubForm' && item.subtype"
+                                                        :is='element(`subform/${item.subtype}`)'
+                                                        :model='{form: model, component: item.model}'
+                                                        :form='setMeta(item, true)'
+                                                        :formula='formula'
+                                                        :relations='relations'
+                                                        :asyncMode='asyncMode'
+                                                        :editMode='editMode'
+                                                    />
 
-                                    <component
-                                        :key='item.model'
-                                        v-if="isShow(item.model) && item.formType != 'SubForm'"
-                                        :do_render='do_render'
-                                        :editMode='editMode'
-                                        :is='element(item.formType)'
-                                        :disabled='item.disabled ? item.disabled : false'
-                                        :model='{form: model, component: item.model}'
-                                        :label='getLabel(item)'
-                                        :rule='item.model'
-                                        :meta='setMeta(item)'
-                                        :identity='identity'
-                                        :asyncMode='asyncMode'
-                                        :getSchemaByModel='getSchemaByModel'
-                                        :getSchemaRelationByModel='getSchemaRelationByModel'
-                                        :setSchemaByModel='setSchemaByModel'
-                                        :relation_data='getRelation(item)'>
-                                    </component>
+                                                    <component
+                                                        :key='item.model'
+                                                        v-if="isShow(item.model) && item.formType != 'SubForm'"
+                                                        :do_render='do_render'
+                                                        :asyncMode='asyncMode'
+                                                        :editMode='editMode'
+                                                        :is='element(item.formType)'
+                                                        :model='{form: model, component: item.model}'
+                                                        :disabled='item.disabled ? item.disabled : false'
+                                                        :label='getLabel(item)'
+                                                        :rule='item.model'
+                                                        :meta='setMeta(item)'
+                                                        :identity='identity'
+                                                        :url='url'
+                                                        :getSchemaByModel='getSchemaByModel'
+                                                        :getSchemaRelationByModel='getSchemaRelationByModel'
+                                                        :setSchemaByModel='setSchemaByModel'
+                                                        :relation_data='getRelation(item)'
+                                                    />
+                                                </div>
+                                            </Col>
+                                        </Row>
+                                    </div>
                                 </div>
                             </Col>
                         </Row>

From 520cb52ddb3237cd41f9ef10b34bcecdfd6bac69 Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Wed, 23 Apr 2025 23:08:58 +0800
Subject: [PATCH 16/25] checkbox pinned

---
 src/modules/datagrid/Datagrid.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index f34e289..cd5f434 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -531,9 +531,14 @@ export default {
                     checkboxSelection: true,
                     headerCheckboxSelection: !this.$props.gridSelector,
                     headerCheckboxSelectionFilteredOnly: true,
+                    pinned: 'left',
+                    lockPosition: true,
                     filter: false
                 };
-                this.$data.columns.push(selectionCol);
+                // this.$data.columns.push(selectionCol);
+                this.$data.columns.unshift(selectionCol);
+                console.log('this.$data.columns');
+                console.log(this.$data.columns);
             }
 
             if (gridSchema.hasCheckbox || this.$props.hasSelection) {

From c95bdfb7a5660c8fb2d6d390ccb72dd86080c30a Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Wed, 23 Apr 2025 23:15:19 +0800
Subject: [PATCH 17/25] checkbox pinned fix

---
 src/modules/datagrid/Datagrid.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index cd5f434..4635f60 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -535,10 +535,7 @@ export default {
                     lockPosition: true,
                     filter: false
                 };
-                // this.$data.columns.push(selectionCol);
                 this.$data.columns.unshift(selectionCol);
-                console.log('this.$data.columns');
-                console.log(this.$data.columns);
             }
 
             if (gridSchema.hasCheckbox || this.$props.hasSelection) {

From f09840b70764b5bc6de841e144da359871b48671 Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Tue, 6 May 2025 19:35:40 +0800
Subject: [PATCH 18/25] tseke empty

---
 src/modules/datagrid/Datagrid.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index 4635f60..d1c3792 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -379,7 +379,7 @@ export default {
              * Custom part remove later
              */
             this.gridOptions.getRowStyle = (params) => {
-                if ((this.$props.schemaID == 220) && isValid(params.data.ubtirsenognoo)) {
+                if (((this.$props.schemaID == 220) || (this.$props.schemaID == 382)) && isValid(params.data.ubtirsenognoo)) {
                     return {'background-color': '#87cefa'}
                 }
 

From a4ceffa3773a654eecdce7ad1c9442b67c46c033 Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Tue, 13 May 2025 17:49:25 +0800
Subject: [PATCH 19/25] show icon added in datagrid

---
 src/modules/dataform/elements/Switch.vue |  3 ++-
 src/modules/datagrid/Datagrid.vue        | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/modules/dataform/elements/Switch.vue b/src/modules/dataform/elements/Switch.vue
index afa3e18..99359d1 100644
--- a/src/modules/dataform/elements/Switch.vue
+++ b/src/modules/dataform/elements/Switch.vue
@@ -1,6 +1,7 @@
 <template>
     <FormItem :label=label :prop=rule>
-        <i-switch v-model="model.form[model.component]"></i-switch>
+        <i-switch v-model="model.form[model.component]"
+                  :disabled="meta && meta.disabled ? meta.disabled : false"></i-switch>
     </FormItem>
 </template>
 
diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index d1c3792..51ef801 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -1679,8 +1679,17 @@ export default {
                     actions.push(menuItem);
                 }
 
-                if (item === 'v') {
+                if (item === 'v' && this.permissions && this.permissions.r) {
                     console.log("v action");
+                    let menuItem = {
+                        name: "Харах",
+                        icon:
+                            "<span class='ivu-icon ivu-icon-ios-eye-outline'></span>",
+                        action: () => {
+                            this.fnView(rowId);
+                        }
+                    };
+                    actions.push(menuItem);
                 }
 
                 if (item === 'e' && this.permissions && this.permissions.u) {

From 94822c68cb18a9c881cf80020e940184c2b75e73 Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Fri, 23 May 2025 18:33:15 +0800
Subject: [PATCH 20/25] krud delete action update

---
 src/modules/datagrid/Datagrid.vue    | 4 ++--
 src/modules/datagrid/scss/style.scss | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index 51ef801..3135a7e 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -1704,8 +1704,8 @@ export default {
                     actions.push(menuItem);
                 }
 
-                // if (item == 'd' && this.permissions && this.permissions.d) {
-                if (item === 'd') {
+                if (item === 'd' && this.permissions && this.permissions.d) {
+                // if (item === 'd') {
                     let menuItem = {
                         name: "Устгах",
                         icon: "<span class='ivu-icon ivu-icon-ios-trash-outline'></span>",
diff --git a/src/modules/datagrid/scss/style.scss b/src/modules/datagrid/scss/style.scss
index 828daf2..aaec051 100644
--- a/src/modules/datagrid/scss/style.scss
+++ b/src/modules/datagrid/scss/style.scss
@@ -42,7 +42,9 @@
             height: calc(100vh - 160px) !important;
             .number-cell{
                 text-align: right;
-                display: block;
+                //display: block;
+                display: flex;
+                justify-content: flex-end;
             }
         }
 

From d4a266bc71cf024a6e0af30a61ed16ae2856bd63 Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Tue, 27 May 2025 11:55:01 +0800
Subject: [PATCH 21/25] parentElement added

---
 src/modules/dataform/ExpandOption.vue          |  8 ++++++++
 src/modules/dataform/FormBuilder.vue           |  1 +
 src/modules/dataform/elements/subform/Form.vue | 12 ++++++++++--
 src/modules/datagrid/scss/_override.scss       |  1 +
 src/modules/process/ProcessBuilder.vue         |  1 +
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/modules/dataform/ExpandOption.vue b/src/modules/dataform/ExpandOption.vue
index 9544207..6c7d906 100644
--- a/src/modules/dataform/ExpandOption.vue
+++ b/src/modules/dataform/ExpandOption.vue
@@ -64,6 +64,14 @@
                                 <Input v-model="item.param" :placeholder="lang.Parameter_name"/>
                             </li>
 
+                            <!--                            tseke added etseg baganaas utga awah-->
+
+                            <li>
+                                <label>Эцэг формоос утга авах</label>
+                                <Input v-model="item.parentElement" placeholder="Эцэг формоос утга авах"/>
+                            </li>
+                            <!--                            end-->
+
                             <li>
                                 <label>{{ lang.Get_user_ID }}</label>
                                 <i-switch v-model="item.hasUserId" size="small"></i-switch>
diff --git a/src/modules/dataform/FormBuilder.vue b/src/modules/dataform/FormBuilder.vue
index 40371dd..a49596f 100644
--- a/src/modules/dataform/FormBuilder.vue
+++ b/src/modules/dataform/FormBuilder.vue
@@ -1241,6 +1241,7 @@ export default {
                 hidden: false,
                 disabled: false,
                 default: null,
+                parentElement: '',
                 prefix: '',
                 ifshowhide: '',
                 rules: [],
diff --git a/src/modules/dataform/elements/subform/Form.vue b/src/modules/dataform/elements/subform/Form.vue
index fca0a45..80fbe01 100644
--- a/src/modules/dataform/elements/subform/Form.vue
+++ b/src/modules/dataform/elements/subform/Form.vue
@@ -285,9 +285,18 @@ export default {
             // this.$modal.hide(`form-modal-${this.form.formId}`);
         },
         formReady(formData, subSchema) {
+            let parentFields = subSchema.filter(field => field.hasOwnProperty('parentElement'));
 
-            let parentFieldIndex = subSchema.findIndex(field => field.model == this.form.parent);
+            parentFields.forEach(field => {
+                this.$refs.form.model[field.model] = this.model.form[field.parentElement];
+            });
+            parentFields.forEach(field => {
+                if (this.model.form.hasOwnProperty(field.parentElement)) {
+                    this.$refs.form.model[field.model] = this.model.form[field.parentElement];
+                }
+            });
 
+            let parentFieldIndex = subSchema.findIndex(field => field.model == this.form.parent);
             if (parentFieldIndex > 0) {
                 subSchema[parentFieldIndex].hidden = true;
             }
@@ -432,7 +441,6 @@ export default {
             if (this.form.addFromGrid && this.form.sourceGridID) {
                 this.showAddSourceModal();
             } else {
-
                 this.addByFrom();
             }
         },
diff --git a/src/modules/datagrid/scss/_override.scss b/src/modules/datagrid/scss/_override.scss
index 303a259..18f4798 100644
--- a/src/modules/datagrid/scss/_override.scss
+++ b/src/modules/datagrid/scss/_override.scss
@@ -61,6 +61,7 @@
 
     .ag-cell-wrapper {
         overflow-x: hidden !important;
+        margin-left: -2px !important;
 
         .ag-cell-value {
             img {
diff --git a/src/modules/process/ProcessBuilder.vue b/src/modules/process/ProcessBuilder.vue
index 1d35491..038783f 100644
--- a/src/modules/process/ProcessBuilder.vue
+++ b/src/modules/process/ProcessBuilder.vue
@@ -922,6 +922,7 @@ export default {
                 hidden: false,
                 disabled: false,
                 default: null,
+                parentElement: '',
                 prefix: '',
                 ifshowhide: '',
                 rules: [],

From 735a4d4d7a3b2ff425e0ee582fec91fb1e66980c Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Thu, 29 May 2025 12:43:02 +0800
Subject: [PATCH 22/25] permissions d updated

---
 src/modules/datagrid/Datagrid.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index 3135a7e..fd50e42 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -1635,6 +1635,8 @@ export default {
 
             let rowId = params.node.data[this.identity];
             console.log("EDIT ID:", rowId, this.identity, params.node.data);
+            console.log(this.gridActions);
+            console.log(this.permissions);
 
             let actions = [];
             if (this.$props.actions) {
@@ -1704,6 +1706,7 @@ export default {
                     actions.push(menuItem);
                 }
 
+                // console.log(item, this.permissions, this.permissions.d);
                 if (item === 'd' && this.permissions && this.permissions.d) {
                 // if (item === 'd') {
                     let menuItem = {

From 43a82cecc771e1e67dfafffa7ee1d3136422c0b1 Mon Sep 17 00:00:00 2001
From: Tseke <ts.tserenbaatar@gmail.com>
Date: Thu, 19 Jun 2025 13:21:21 +0800
Subject: [PATCH 23/25] datagrid footer aggre added

---
 src/modules/datagrid/Datagrid.vue | 74 +++++++++++++++++++++++++++----
 1 file changed, 66 insertions(+), 8 deletions(-)

diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index fd50e42..891eb3f 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -282,6 +282,7 @@ export default {
         //     }
         // },
 
+
         highlights() {
             this.preselect();
         }
@@ -420,6 +421,52 @@ export default {
                 }
             };
 
+            this.gridOptions.excelStyles = [
+                {
+                    headerHeight: 60
+                },
+                {
+                    id: 'excel-header-style',
+                    interior: {
+                        color: '#dae3f3', // Толгойн өнгө
+                        pattern: 'Solid',
+                    },
+                    font: {
+                        size: 12,
+                        bold: true,
+                        color: '#333333'
+                    },
+                    alignment: {
+                        horizontal: 'Center',
+                        vertical: 'Center'
+                    },
+                    borders: {
+                        borderTop:    { color: '#000000', lineStyle: 'Continuous', weight: 1 },
+                        borderBottom: { color: '#000000', lineStyle: 'Continuous', weight: 1 },
+                        borderLeft:   { color: '#000000', lineStyle: 'Continuous', weight: 1 },
+                        borderRight:  { color: '#000000', lineStyle: 'Continuous', weight: 1 }
+                    },
+                },
+                {
+                    id: 'excel-cell-style',
+                    font: {
+                        size: 11,
+                        color: '#000000'
+                    },
+                    borders: {
+                        borderTop:    { color: '#000000', lineStyle: 'Continuous', weight: 1 },
+                        borderBottom: { color: '#000000', lineStyle: 'Continuous', weight: 1 },
+                        borderLeft:   { color: '#000000', lineStyle: 'Continuous', weight: 1 },
+                        borderRight:  { color: '#000000', lineStyle: 'Continuous', weight: 1 }
+                    },
+                    alignment: {
+                        horizontal: 'Center',
+                        vertical: 'Center',
+                        wrapText: true
+                    },
+                }
+            ];
+
             /*********/
             //client side sorting and filtering
             if (this.isClient) {
@@ -427,6 +474,11 @@ export default {
                 this.gridOptions.enableServerSideSorting = false;
                 this.gridOptions.enableFilter = true;
                 this.gridOptions.enableSorting = true;
+                //tseke
+                if (gridSchema.columnAggregations) {
+                    Vue.set(this.aggregations, "columnAggregations", gridSchema.columnAggregations);
+                }
+                //tseke
             } else {
                 if (gridSchema.columnAggregations) {
                     Vue.set(this.aggregations, "columnAggregations", gridSchema.columnAggregations);
@@ -527,7 +579,7 @@ export default {
                     width: 38,
                     minWidth: 38,
                     suppressNavigable: true,
-                    cellClass: 'no-border grid-checkbox',
+                    cellClass: 'grid-checkbox',
                     checkboxSelection: true,
                     headerCheckboxSelection: !this.$props.gridSelector,
                     headerCheckboxSelectionFilteredOnly: true,
@@ -585,7 +637,11 @@ export default {
                     floatingFilter: false,
                     suppressMenu: true,
                     width: 60,
-                    valueGetter: 'node.rowIndex + 1'
+                    valueGetter: params => {
+                        return params.node.rowPinned ? '' : params.node.rowIndex + 1;
+                    },
+                    cellClass: 'excel-cell-style',
+                    headerClass: 'excel-header-style',
                 });
             }
 
@@ -702,11 +758,12 @@ export default {
                     headerName: this.getLabel(item),
                     field: item.model,
                     suppressNavigable: true,
-                    cellClass: 'no-border',
+                    cellClass: 'excel-cell-style',
                     enableRowGroup: true,
                     enableValue: true,
                     enablePivot: true,
-                    suppressMenu: !this.colMenu
+                    suppressMenu: !this.colMenu,
+                    headerClass: 'excel-header-style',
                 };
 
                 //Sortable
@@ -1254,6 +1311,7 @@ export default {
 
             axios.post(url, filters, {signal: this.axiosController.signal}).then(({data}) => {
                 if (this.isClient) {
+
                     if (Array.isArray(data)) {
                         this.$data.data = data;
                         this.info.total = data.length;
@@ -1262,17 +1320,17 @@ export default {
                     if (typeof data === 'object' && ('data' in data)) {
                         this.$data.data = data.data;
                     }
+
                 } else {
                     this.info.total = data.total;
                     this.info.totalPage = data.last_page;
                     //getting data
                     this.$data.data = data.data;
                     this.gridOptions.api.setRowData(data.data)
+                }
 
-
-                    if (this.aggregations.columnAggregations.length >= 1) {
-                        this.fetchAggregations(filters);
-                    }
+                if (this.aggregations.columnAggregations.length >= 1) {
+                    this.fetchAggregations(filters);
                 }
 
                 if (this.$data.gridOptions.sizeColumnsToFit) {

From 651367db74a4b45b56466dd99813290b48bca57c Mon Sep 17 00:00:00 2001
From: n0m4dz <tseegii.it@gmail.com>
Date: Mon, 15 Sep 2025 16:27:08 +0800
Subject: [PATCH 24/25] Sub has trigger

---
 package.json                      |  3 ++-
 src/modules/dataform/SubForm.vue  | 20 +++++++++++++++++---
 src/modules/datagrid/Datagrid.vue | 21 ++++++++++++++++-----
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 514e090..19270ca 100644
--- a/package.json
+++ b/package.json
@@ -105,5 +105,6 @@
     ],
     "publishConfig": {
         "access": "public"
-    }
+    },
+    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/src/modules/dataform/SubForm.vue b/src/modules/dataform/SubForm.vue
index c1e5f2b..e799f78 100644
--- a/src/modules/dataform/SubForm.vue
+++ b/src/modules/dataform/SubForm.vue
@@ -53,8 +53,8 @@
                 <div class='fb-control-sub-item' v-if="f.subtype != 'Form'">
                     <Input v-model='f.min_height' :placeholder='lang.min_height'/>
                 </div>
-
             </div>
+
             <div class='fb-control fb-control-sub'>
                 <div class='fb-control-sub-item'>
                     <Checkbox v-model='f.timestamp' v-if="f.subtype != 'Form'">
@@ -65,10 +65,10 @@
                         <span>{{ lang.hide }}</span>
                     </Checkbox>
                     <Checkbox v-model='f.checkEmpty'>
-                        <span>Өгөдөл заавал бөглүүлэх</span>
+                        <span>Өгөгдөл заавал бөглүүлэх</span>
                     </Checkbox>
-
                 </div>
+
                 <div class='fb-control-sub-item'>
                     <Checkbox v-model='f.disableDelete'>
                         <span>{{ lang.Close_deletion_action }}</span>
@@ -101,6 +101,20 @@
                     <Input v-model='f.tableTypeValue' :placeholder='lang.Table_Type_value' size='small'/>
                 </div>
             </div>
+            <div class='sub-form-source-grid'>
+                <Row gutter='10'>
+                    <Col span='8'>
+                        <Label>Controller namespace</Label>
+                        <Input type='text' v-model='f.callTriggerNamespace' placeholder='Триггер namespace'/> <br>
+
+                    </Col>
+                    <Col span='8'>
+                        <Label>Before trigger /өгөгдөл дуудахаас өмнө - edit mode only/</Label>
+                        <Input type='text' v-model='f.callTriggerFunction' placeholder='Function name'/> <br>
+                    </Col>
+                </Row>
+            </div>
+
             <div class='sub-form-source-grid'>
                 <Row gutter='10'>
                     <Col span='8'>
diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index f34e289..4e9fbb8 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -428,10 +428,6 @@ export default {
                 this.gridOptions.enableFilter = true;
                 this.gridOptions.enableSorting = true;
             } else {
-                if (gridSchema.columnAggregations) {
-                    Vue.set(this.aggregations, "columnAggregations", gridSchema.columnAggregations);
-                }
-
                 if (gridSchema.excelUploadCustomUrl) {
                     this.$parent.excelUploadCustomUrl = gridSchema.excelUploadCustomUrl;
                 }
@@ -452,6 +448,9 @@ export default {
                 }
             }
 
+            if (gridSchema.columnAggregations) {
+                Vue.set(this.aggregations, "columnAggregations", gridSchema.columnAggregations);
+            }
 
             if (gridSchema.theme) {
                 this.theme = 'theme' in gridSchema ? gridSchema.theme : 'normal';
@@ -531,7 +530,9 @@ export default {
                     checkboxSelection: true,
                     headerCheckboxSelection: !this.$props.gridSelector,
                     headerCheckboxSelectionFilteredOnly: true,
-                    filter: false
+                    filter: false,
+                    pinned: 'left',
+                    lockPosition: true
                 };
                 this.$data.columns.push(selectionCol);
             }
@@ -688,6 +689,10 @@ export default {
             return item.label ? item.label : `[${item.model}]`
         },
 
+        setClientAggregations() {
+            console.log("aff", this.aggregations.columnAggregations);
+        },
+
         setColumn(item) {
             //set post models -- hidden could be posted
             if (isValid(item.editable) && (isValid(item.editable) && item.editable.shouldPost)) {
@@ -707,6 +712,11 @@ export default {
                     suppressMenu: !this.colMenu
                 };
 
+                if(item.model == 'status' && this.isClient){
+                    colItem.aggFunc = 'sum';
+                    console.log(colItem);
+                }
+
                 //Sortable
                 if (!item.sortable) {
                     colItem.sortable = false;
@@ -1163,6 +1173,7 @@ export default {
                     }
                 }
 
+
                 this.$data.columns.push(colItem);
             }
         },

From 5c1d0530e3df410f8f615c0d7e680e02b920783c Mon Sep 17 00:00:00 2001
From: n0m4dz <tseegii.it@gmail.com>
Date: Sat, 13 Dec 2025 19:06:56 +0800
Subject: [PATCH 25/25] Fixed ag grid

---
 src/modules/datagrid/Datagrid.vue |  2 +-
 src/modules/page/NavBs.vue        |  5 +++--
 src/modules/page/index.js         |  1 +
 src/modules/page/views/index.vue  |  2 ++
 src/utils/index.js                | 22 ++++++++++++++++++++++
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue
index 01fedc5..bd531ee 100644
--- a/src/modules/datagrid/Datagrid.vue
+++ b/src/modules/datagrid/Datagrid.vue
@@ -1794,7 +1794,7 @@ export default {
                 actions.push('separator')
             }
 
-            // actions.push('copy')
+            actions.push('copy')
             actions.push('copyWithHeaders')
             actions.push('chartRange')
             // actions.push('excelExport')
diff --git a/src/modules/page/NavBs.vue b/src/modules/page/NavBs.vue
index d8e3e3d..12c8732 100644
--- a/src/modules/page/NavBs.vue
+++ b/src/modules/page/NavBs.vue
@@ -7,6 +7,7 @@
 
 <script>
 import NavItem from "./NavItem.vue"
+import {checkLinkAccess} from "../../utils/index.js";
 
 export default {
     props: ['hasTooltip'],
@@ -20,8 +21,8 @@ export default {
             extra: window.init.permissions.extra,
         };
     },
-    created() {
-
+    mounted() {
+        checkLinkAccess(this.$route, this.$router, this.menu);
     },
     methods: {
         can(menu) {
diff --git a/src/modules/page/index.js b/src/modules/page/index.js
index f7b8ec4..45cdf9f 100644
--- a/src/modules/page/index.js
+++ b/src/modules/page/index.js
@@ -21,6 +21,7 @@ let routes = [
         component: () => import(/* webpackChunkName: "page-404" */ './views/404')
     }
 ];
+
 const install = (Vue, options) => {
     Vue.mixin({
         mounted() {
diff --git a/src/modules/page/views/index.vue b/src/modules/page/views/index.vue
index 409f1c8..ed62b98 100644
--- a/src/modules/page/views/index.vue
+++ b/src/modules/page/views/index.vue
@@ -272,6 +272,8 @@ export default {
     },
     mounted() {
         this.checkSub();
+
+        console.log('checking access');
     }
 };
 </script>
diff --git a/src/utils/index.js b/src/utils/index.js
index ebc7824..bf8095e 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -13,3 +13,25 @@ export const getTableView = (tableOrView) => {
     return list;
 }
 
+export const checkLinkAccess = (route, router, menu) => {
+    let hasAccess = false;
+    menu.forEach((item) => {
+        if (item.link_to == 'crud' && route.path == `/p/${item.id}`) {
+            hasAccess = true;
+        }
+
+        if (item.link_to == 'noAction' && item.children.length > 0) {
+            item.children.forEach((subItem) => {
+                if (subItem.link_to == 'crud' && route.path == `/p/${item.id}/${subItem.id}`) {
+                    hasAccess = true;
+                }
+            });
+        }
+    });
+
+    // setTimeout(() => {
+    //     if (hasAccess == false) {
+    //         return router.push('/');
+    //     }
+    // }, 1000)
+}