@tripup-company/element-ui-extended 0.0.87 → 0.0.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tripup-company/element-ui-extended",
-  "version": "0.0.87",
+  "version": "0.0.89",
   "main": "./dist/element-ui-extended.umd.js",
   "scripts": {
     "serve": "vue-cli-service serve && tsc --emitDeclarationOnly",
@@ -44,7 +44,7 @@
     "prettier": "^2.2.1",
     "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
-    "ts-loader": "^9.2.6",
+    "ts-loader": "^9.4.2",
     "typescript": "~4.1.5",
     "vue-loader": "^15.9.5",
     "vue-template-compiler": "^2.6.11"

package/src/components/EditableField/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="editable-cell">
-    <div v-if="!isEditMode" class="editable-cell__text">
+    <div v-if="!isEditMode" class="editable-cell__text" :style="height? 'height: ' + height : ''">
       <slot class="editable-cell__text__slot">
         <el-col :span="23">
           <div
@@ -78,7 +78,7 @@
       <el-input
         v-else
         v-model="model"
-        :rows="3"
+        :rows="rows"
         :type="type"
         :placeholder="placeholder"
         class="editable-cell__input"
@@ -141,6 +141,14 @@ export default {
       type: Array,
       default: () => [],
     },
+    rows: {
+      type: Number,
+      default: 3,
+    },
+    height: {
+      type: String,
+      default: '102px',
+    },
     selectMultiple: {
       type: Boolean,
       default: false,

package/src/components/GenericTable/index.vue

@@ -4,19 +4,19 @@
       <template v-for="field in fields">
         <template v-if="field.callback">
           <el-table-column
-            :key="field.prop"
-            v-slot="context"
-            :prop="field.prop"
-            :label="field.label"
-            :width="field.width ? field.width : null"
-            :sortable="field.sortable ? field.sortable : null"
+              :key="field.prop"
+              v-slot="context"
+              :prop="field.prop"
+              :label="field.label"
+              :width="field.width ? field.width : null"
+              :sortable="field.sortable ? field.sortable : null"
           >
             <el-link v-if="field.href" :href="customHref(field, context)">
               {{ customLinkLabel(field, context) }}
             </el-link>
             <el-link
-              v-else
-              @click.prevent="
+                v-else
+                @click.prevent="
                 field.callback(field.prop, context.$index, context.row)
               "
             >
@@ -24,16 +24,29 @@
             </el-link>
           </el-table-column>
         </template>
+        <template v-else-if="field.type && field.type === 'template'">
+          <el-table-column
+              :key="field.prop"
+              :prop="field.prop"
+              :label="field.label"
+              :width="field.width ? field.width : null"
+              :sortable="field.sortable ? field.sortable : null"
+          >
+            <template slot-scope="scope">
+              <span v-html="field.formatter(scope)"></span>
+            </template>
+          </el-table-column>
+        </template>
         <template v-else>
           <el-table-column
-            :formatter="
+              :formatter="
               typeof field.formatter === 'function' ? field.formatter : null
             "
-            :key="field.prop"
-            :prop="field.prop"
-            :label="field.label"
-            :width="field.width ? field.width : null"
-            :sortable="field.sortable ? field.sortable : null"
+              :key="field.prop"
+              :prop="field.prop"
+              :label="field.label"
+              :width="field.width ? field.width : null"
+              :sortable="field.sortable ? field.sortable : null"
           />
         </template>
       </template>
@@ -68,15 +81,15 @@ export default {
     },
     customHref(field, context) {
       return field.href
-        ? typeof field.href === "function"
-          ? field.href(field.prop, context.$index, context.row)
-          : field.href
-        : "#";
+          ? typeof field.href === "function"
+              ? field.href(field.prop, context.$index, context.row)
+              : field.href
+          : "#";
     },
     customLinkLabel(field, context) {
       return typeof field.formatter === "function"
-        ? field.formatter(context.row)
-        : context.row[field.prop];
+          ? field.formatter(context.row)
+          : context.row[field.prop];
     },
   },
 };

package/src/components/NewField/index.vue

@@ -49,6 +49,7 @@
             :disabled="disabled"
             v-else
             v-model="dataModel"
+            :rows="rows"
             :type="type"
             :placeholder="placeholder"
             class="editable-cell__input"
@@ -77,6 +78,14 @@ export default {
       type: [String, Boolean, Date, Number, Array],
       default: "",
     },
+    rows: {
+      type: Number,
+      default: 3,
+    },
+    height: {
+      type: String,
+      default: 'auto',
+    },
     type: {
       type: String,
       default: "input",

package/src/components/PartColumn/EditColumn.vue

@@ -23,6 +23,8 @@
             :select-label="field.selectList ? (field.selectLabel ? field.selectLabel : 'name' ) : ''"
             :select-value="field.selectList ? (field.selectValue ? field.selectValue : 'value' ) : ''"
             :field="field.prop"
+            :rows="field.rows ? field.rows : 3"
+            :height="field.height ? field.height : 'auto'"
             :precision="field.precision ? field.precision : 0"
             :remote-method="field.remoteMethod ? field.remoteMethod : null"
             :filterable="field.filterable ? field.filterable : null"

package/src/components/PartColumn/NewColumn.vue

@@ -23,6 +23,8 @@
             :select-label="field.selectList ? (field.selectLabel ? field.selectLabel : 'name' ) : ''"
             :select-value="field.selectList ? (field.selectValue ? field.selectValue : 'value' ) : ''"
             :field="field.prop"
+            :rows="field.rows ? field.rows : 3"
+            :height="field.height ? field.height : 'auto'"
             :precision="field.precision ? field.precision : 0"
             :remote-method="field.remoteMethod ? field.remoteMethod : null"
             :filterable="field.filterable ? field.filterable : null"

package/src/styles/editable-field-component.scss

@@ -34,7 +34,6 @@
     color: #606266;
     display: inline-block;
     font-size: inherit;
-    max-height: 102px;
     line-height: 34px;
     outline: none;
     padding: 0 15px;