@tripup-company/element-ui-extended 0.0.61 → 0.0.64

package/package.json

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

package/src/components/EditableField/index.vue

@@ -56,6 +56,7 @@
         :remote="remote"
         :remote-method="remoteMethodHandler"
         placeholder="Select"
+        :value-key="objectValueKey"
         :multiple="selectMultiple"
         class="w-100"
       >
@@ -63,7 +64,7 @@
           v-for="item in selectListLocal"
           :key="item[selectKey]"
           :label="item[selectLabel]"
-          :value="item[selectValue]"
+          :value="selectJson ? item : item[selectValue]"
         />
       </el-select>
       <el-date-picker
@@ -143,6 +144,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    objectValueKey: {
+      type: String,
+      default: "value",
+    },
     selectJson: {
       type: Boolean,
       default: false,
@@ -225,9 +230,8 @@ export default {
             const labArray = this.selectList.find(
               x => x[this.selectKey] === compareValue
             );
-            const lab = labArray[this.selectLabel];
-            if (lab) {
-              values.push(lab);
+            if (labArray && labArray[this.selectLabel]) {
+              values.push(labArray[this.selectLabel]);
             }
             label = values.join("; ");
           });

package/src/components/GenericFilters/index.vue

@@ -39,6 +39,7 @@ name: "GenericFilter",
       return this.filterConvertor.applyFilter(this.search);
     },
     applyFilter() {
+      console.log(this.search);
       this.$emit('apply:filter', this.filterConvertor.applyFilter(this.search) );
     },
     resetFilter() {

package/src/components/NewField/index.vue

@@ -4,16 +4,44 @@
       <slot class="editable-cell__text__slot">
         <el-col :span="24">
           <el-checkbox v-if="type === 'checkbox'" v-model="dataModel" />
-          <el-select v-else-if="type === 'select'" v-model="dataModel" :filterable="filterable" :loading="loading" :remote="remote" :remote-method="remoteMethodHandler" :span="24" clearable placeholder="Select" :multiple="selectMultiple" class="w-100">
+          <el-select
+            v-else-if="type === 'select'"
+            v-model="dataModel"
+            :filterable="filterable"
+            :loading="loading"
+            :remote="remote"
+            :remote-method="remoteMethodHandler"
+            :span="24"
+            clearable
+            placeholder="Select"
+            :multiple="selectMultiple"
+            :value-key="objectValueKey"
+            class="w-100"
+          >
             <el-option
               v-for="item in selectListLocal"
               :key="item[selectKey]"
               :label="item[selectLabel]"
-              :value="item[selectValue]"
+              :value="selectJson ? item : item[selectValue]"
             />
           </el-select>
-          <el-date-picker v-else-if="type === 'date-picker'" v-model="dataModel" :format="format" :value-format="valueFormat" type="date" placeholder="Pick a day" class="w-100" />
-          <el-input-number v-else-if="type === 'number'" v-model="dataModel" :controls="false" :step="step" :precision="precision" class="w-100" />
+          <el-date-picker
+            v-else-if="type === 'date-picker'"
+            v-model="dataModel"
+            :format="format"
+            :value-format="valueFormat"
+            type="date"
+            placeholder="Pick a day"
+            class="w-100"
+          />
+          <el-input-number
+            v-else-if="type === 'number'"
+            v-model="dataModel"
+            :controls="false"
+            :step="step"
+            :precision="precision"
+            class="w-100"
+          />
           <el-input
             v-else
             v-model="dataModel"
@@ -31,11 +59,11 @@
 import lodash from "lodash";
 const _ = lodash;
 export default {
-  name: 'NewField',
+  name: "NewField",
   props: {
     field: {
       type: [String, Boolean],
-      default: '',
+      default: "",
     },
     filterable: {
       type: Boolean,
@@ -43,15 +71,15 @@ export default {
     },
     value: {
       type: [String, Boolean, Date, Number, Array],
-      default: '',
+      default: "",
     },
     type: {
       type: String,
-      default: 'input',
+      default: "input",
     },
     placeholder: {
       type: String,
-      default: '',
+      default: "",
     },
     selectList: {
       type: Array,
@@ -63,17 +91,25 @@ export default {
       type: Boolean,
       default: false,
     },
+    objectValueKey: {
+      type: String,
+      default: "value",
+    },
+    selectJson: {
+      type: Boolean,
+      default: false,
+    },
     selectKey: {
       type: String,
-      default: '',
+      default: "",
     },
     selectLabel: {
       type: String,
-      default: '',
+      default: "",
     },
     selectValue: {
       type: String,
-      default: '',
+      default: "",
     },
     precision: {
       type: Number,
@@ -89,11 +125,11 @@ export default {
     },
     format: {
       type: String,
-      default: 'dd.MM.yyyy',
+      default: "dd.MM.yyyy",
     },
     valueFormat: {
       type: String,
-      default: 'yyyy-MM-dd',
+      default: "yyyy-MM-dd",
     },
   },
   data() {
@@ -119,10 +155,10 @@ export default {
     },
   },
   watch: {
-    dataModel: function() {
-      this.$emit('editable:save', { 'field': this.field, 'value': this.dataModel });
+    dataModel: function () {
+      this.$emit("editable:save", { field: this.field, value: this.dataModel });
     },
-    value: function() {
+    value: function () {
       this.dataModel = _.cloneDeep(this.value);
     },
   },
@@ -132,7 +168,10 @@ export default {
   methods: {
     async remoteCall(query) {
       this.loading = true;
-      const response = await this.remoteMethod.all({ search: this.selectLabel  + ':' +query, searchFields: this.selectLabel + ':like' });
+      const response = await this.remoteMethod.all({
+        search: this.selectLabel + ":" + query,
+        searchFields: this.selectLabel + ":like",
+      });
       this.selectListLocal = response.data;
       this.loading = false;
     },

package/src/components/PartColumn/EditColumn.vue

@@ -18,6 +18,7 @@
             :select-list="field.selectList ? field.selectList : []"
             :select-multiple="field.selectMultiple"
             :select-json="field.selectJson ? field.selectJson : false"
+            :object-value-key="field.objectValueKey ? field.objectValueKey : 'value'"
             :select-key="field.selectList ? (field.selectKey ? field.selectKey : 'value' ) : ''"
             :select-label="field.selectList ? (field.selectLabel ? field.selectLabel : 'name' ) : ''"
             :select-value="field.selectList ? (field.selectValue ? field.selectValue : 'value' ) : ''"

package/src/components/PartColumn/NewColumn.vue

@@ -17,6 +17,7 @@
             :select-list="field.selectList ? field.selectList : []"
             :select-multiple="field.selectMultiple"
             :select-json="field.selectJson ? field.selectJson : false"
+            :object-value-key="field.objectValueKey ? field.objectValueKey : 'value'"
             :select-key="field.selectList ? (field.selectKey ? field.selectKey : 'value' ) : ''"
             :select-label="field.selectList ? (field.selectLabel ? field.selectLabel : 'name' ) : ''"
             :select-value="field.selectList ? (field.selectValue ? field.selectValue : 'value' ) : ''"