@tripup-company/element-ui-extended 0.0.77 → 0.0.80

package/dist/src/components/GenericFilters/filter-convertor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-convertor.d.ts","sourceRoot":"","sources":["../../../../src/components/GenericFilters/filter-convertor.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,OAAO,eAAe;IAGlC,WAAW,CAAC,MAAM,KAAA;;;;CAkBnB"}
+{"version":3,"file":"filter-convertor.d.ts","sourceRoot":"","sources":["../../../../src/components/GenericFilters/filter-convertor.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,OAAO,eAAe;IAGlC,WAAW,CAAC,MAAM,KAAA;;;;CAqBnB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tripup-company/element-ui-extended",
-  "version": "0.0.77",
+  "version": "0.0.80",
   "main": "./dist/element-ui-extended.umd.js",
   "scripts": {
     "serve": "vue-cli-service serve && tsc --emitDeclarationOnly",

package/src/components/CompositeTable/index.vue

@@ -3,11 +3,23 @@
     <slot>
       <el-row :gutter="20">
         <el-col :span="filters.length ? 18 : 24">
+          <slot
+            v-if="showTopFilter"
+            v-bind="{ filters, search, handleApplyFilter, handleResetFilter }"
+            name="top-filter"
+          >
+            <generic-filter
+              :filters="filters"
+              :search="search"
+              @apply:filter="handleApplyFilter"
+              @reset:filter="handleResetFilter"
+            />
+          </slot>
           <slot
             name="quick-search-filter"
             v-bind="{
               topFilter,
-              search,
+              topSearch,
               handleApplyTopFilter,
               handleResetTopFilter,
             }"
@@ -43,6 +55,7 @@
         </el-col>
         <el-col :span="filters.length ? 6 : 0">
           <slot
+            v-if="showLeftFilter"
             name="filter"
             v-bind="{ filters, search, handleApplyFilter, handleResetFilter }"
           >
@@ -79,6 +92,14 @@ export default {
   },
   name: "CompositeTable",
   props: {
+    showTopFilter: {
+      default: false,
+      type: Boolean,
+    },
+    showLeftFilter: {
+      default: true,
+      type: Boolean,
+    },
     repository: {
       default() {
         return {};
@@ -140,16 +161,13 @@ export default {
     }
 
     search = Object.assign(search, listQueryObj.search);
-    topSearch = Object.assign(
-      topSearch,
-      listQueryObj.topSearch
-    );
+    topSearch = Object.assign(topSearch, listQueryObj.topSearch);
     let sort = {};
     if (listQueryObj.orderBy) {
-      sort = Object.assign(sort, {orderBy: listQueryObj.orderBy})
+      sort = Object.assign(sort, { orderBy: listQueryObj.orderBy });
     }
     if (listQueryObj.sortedBy) {
-      sort = Object.assign(sort, {sortedBy: listQueryObj.sortedBy})
+      sort = Object.assign(sort, { sortedBy: listQueryObj.sortedBy });
     }
     return {
       loading: false,

package/src/components/EditableField/index.vue

@@ -192,7 +192,7 @@ export default {
     return {
       isEditMode: false,
       model: "",
-      selectListLocal: [],
+      selectListLocal: this.selectList,
     };
   },
   computed: {
@@ -215,9 +215,6 @@ export default {
       },
     },
   },
-  mounted() {
-    this.selectListLocal = this.selectList;
-  },
   methods: {
     createList() {
       let label = "";
@@ -226,7 +223,7 @@ export default {
           let values = [];
           this.value.forEach((element) => {
             const compareValue = this.selectJson ? element[this.selectKey] : element;
-            const labArray = this.selectList.find(
+            const labArray = this.selectListLocal.find(
               x => x[this.selectKey] === compareValue
             );
             if (labArray && labArray[this.selectLabel]) {
@@ -237,8 +234,8 @@ export default {
         } else {
           label = "-";
         }
-      } else if (this.selectList.length) {
-        label = this.selectList.find((x) => x[this.selectKey] === this.value)[
+      } else if (this.selectListLocal.length) {
+        label = this.selectListLocal.find((x) => x[this.selectKey] === this.value)[
           this.selectLabel
         ];
       } else {

package/src/components/GenericTable/index.vue

@@ -12,7 +12,14 @@
             :sortable="field.sortable ? field.sortable : null"
           >
             <el-link
-              @click="field.callback(field.prop, context.$index, context.row)"
+                :href="
+                field.href
+                  ? typeof field.href === 'function'
+                    ? field.href(field.prop, context.$index, context.row)
+                    : field.href
+                  : '#'
+              "
+              @click.prevent="field.callback(field.prop, context.$index, context.row)"
             >
               {{
                 typeof field.formatter === "function"