From 075121cc127e568631adf9257f072393ac3911c8 Mon Sep 17 00:00:00 2001
From: wulff007 <wulff007@gmail.com>
Date: Tue, 19 Mar 2024 20:20:26 +0300
Subject: [PATCH] - treefilter has height property - fix table state restoring
 - fix datasource remove error

---
 package.json                                       |  2 +-
 src/components/DialogView.vue                      |  8 ++++++--
 src/components/Table.vue                           |  8 +++-----
 src/components/TreeFilter.vue                      |  5 +++--
 src/components/configuration/tree.filter.config.ts |  5 +++++
 src/model/datasource.ts                            | 12 ++++--------
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index ccf241c..de01991 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tabbled-web",
   "private": true,
-  "version": "0.5.7",
+  "version": "0.5.8",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/src/components/DialogView.vue b/src/components/DialogView.vue
index 74d6392..eeb4546 100644
--- a/src/components/DialogView.vue
+++ b/src/components/DialogView.vue
@@ -1,7 +1,6 @@
 <template>
     <el-dialog class="dialog"
                :model-value="visible"
-               style="padding: 0"
                @close="emit('update:visible', false)"
                :title="pageConfig ? pageConfig.title : 'Dialog'"
                :modal="options && options.modal ? options.modal : true"
@@ -9,8 +8,9 @@
                :width="options && options.width ? options.width : '60%'"
                :fullscreen="screenSize === ScreenSize.mobile"
                :append-to-body="true"
+
     >
-        <el-form ref="grid"  class="grid-wrap" :model="editEntity" label-position="top" style="padding: 0">
+        <el-form ref="grid"  class="grid-wrap" :model="editEntity" label-position="top" style="padding: 0; height: 100%">
 
             <el-form-item v-for="(element, idx) in elements"
                           :label="getLabelElement(element)"
@@ -72,6 +72,7 @@ let editDataSource: DataSourceInterface = null
 let isNew = ref(false)
 let elements = ref<Array<ElementInterface>>([])
 let filters = ref<Filters>(null)
+let maxHeight = ref('')
 
 const emit = defineEmits(['update:visible', 'selected'])
 
@@ -100,6 +101,7 @@ async function init() {
     elements.value = []
     editDataSource = null
     editEntity.value = null
+    maxHeight.value = '200px'
 
     if (pageConfig.value.datasource) {
         editDataSource = await dsService.create(pageConfig.value.datasource)
@@ -279,6 +281,8 @@ function selectedChanged(sl) {
     .el-dialog__body {
         padding: 0;
         padding-bottom: 16px;
+        overflow: auto;
+        max-height: calc(100vh - 300px);
     }
 }
 
diff --git a/src/components/Table.vue b/src/components/Table.vue
index f181fd2..e4a3a78 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -565,9 +565,6 @@ async function addChild() {
         return
     }
 
-
-
-
     if (actions.value.onAdd) {
         await execAction(actions.value.onAdd)
         return
@@ -669,10 +666,11 @@ async function onGridReady(params) {
     }
 
     await init()
-    restoreCols()
+
 }
 
 async function onFirstDataRendered(/*params*/) {
+    restoreCols()
 }
 
 function saveColumnState(e) {
@@ -1037,7 +1035,7 @@ let onItemInserted = async (params) => {
 }
 
 let onItemRemoved = async (params) => {
-    //console.log('onItemRemoved', params)
+    console.log('onItemRemoved', params)
     gridApi.applyServerSideTransaction({
         remove: [params.data],
         route: isTree.value && params.route ? params.route.slice(0, params.route.length - 1) : null
diff --git a/src/components/TreeFilter.vue b/src/components/TreeFilter.vue
index 59372a6..0fe4532 100644
--- a/src/components/TreeFilter.vue
+++ b/src/components/TreeFilter.vue
@@ -1,6 +1,6 @@
 <template>
     <div v-if="fieldConfig" style="width: 100%;">
-        <el-card v-if="type === 'list'"  shadow="never" body-style="padding: 0" style="width: 100%">
+        <el-card v-if="type === 'list'"  shadow="never" body-style="padding: 0" :style="{width: '100%', height: height + 'px'}">
             <el-tree ref="tree"
                      style="width: 100%"
                      :data="treeData"
@@ -60,7 +60,8 @@ interface Props {
     rootItem: boolean,
     keyProp?: string,
     titleProp?: string,
-    childrenProp?: string
+    childrenProp?: string,
+    height?: string
 }
 
 const props = withDefaults(defineProps<Props>(), {
diff --git a/src/components/configuration/tree.filter.config.ts b/src/components/configuration/tree.filter.config.ts
index e622d15..56b0327 100644
--- a/src/components/configuration/tree.filter.config.ts
+++ b/src/components/configuration/tree.filter.config.ts
@@ -34,6 +34,11 @@ export class Config implements ComponentInterface {
             title: "Show root item",
             alias: "rootItem",
             type: "bool"
+        },{
+            title: "Height",
+            alias: "height",
+            type: 'number',
+            default: null
         },
         {
             title: 'Visibility',
diff --git a/src/model/datasource.ts b/src/model/datasource.ts
index aa2baa2..5652aeb 100644
--- a/src/model/datasource.ts
+++ b/src/model/datasource.ts
@@ -250,17 +250,11 @@ export class DataSource extends EventEmitter implements DataSourceInterface {
 
     async removeById(id: string, route?: string[]): Promise<boolean> {
         //let dt = new Date().getMilliseconds()
-        let res = await this.server.emit(`${this.type === 'config' ? 'config' : 'dataSources/data'}/removeById`, {
+        await this.server.emit(`${this.type === 'config' ? 'config' : 'dataSources/data'}/removeById`, {
             alias: this.alias,
             id: id
         })
         //console.log(this.alias, "removed; timing, ms: ", new Date().getMilliseconds() - dt)
-
-        this.emit('item-removed', {
-            data: res.data,
-            route: route
-        })
-
         return true
     }
 
@@ -279,6 +273,8 @@ export class DataSource extends EventEmitter implements DataSourceInterface {
         if (!msg || msg.type !== 'data' || !msg.entity || msg.entity.alias !== this.alias)
             return
 
+        console.log(msg)
+
         switch (msg.action) {
             case 'add':
                 this.emit('item-inserted', {
@@ -295,7 +291,7 @@ export class DataSource extends EventEmitter implements DataSourceInterface {
             case 'remove':
                 this.emit('item-removed', {
                     data: {
-                        id: msg.entity.data
+                        id: msg.entity.id
                     },
                     route: []
                 })