@lx-frontend/wrap-element-ui 0.4.6-beta.0 → 0.4.6-beta.1

package/package.json

@@ -1,10 +1,18 @@
 {
   "name": "@lx-frontend/wrap-element-ui",
-  "version": "0.4.6-beta.0",
+  "version": "0.4.6-beta.1",
   "description": "wrap-element-ui",
   "author": "Vic <18373209286@163.com>",
   "main": "packages/index.js",
   "private": false,
+  "scripts": {
+    "serve": "npm run build:style && vue-cli-service serve",
+    "build:style": "gulp build --gulpfile packages/theme-default/gulpfile.js",
+    "dist": "npm run build:style && vue-cli-service build",
+    "build:single": "webpack --config build/build-one-by-one.js",
+    "lint": "vue-cli-service lint",
+    "test:unit": "vue-cli-service test:unit"
+  },
   "dependencies": {
     "cheerio": "^1.0.0-rc.2",
     "core-js": "^3.3.2",
@@ -36,13 +44,5 @@
     "typescript": "~3.5.3",
     "vue-template-compiler": "^2.7.16",
     "webpack-cli": "^3.3.10"
-  },
-  "scripts": {
-    "serve": "npm run build:style && vue-cli-service serve",
-    "build:style": "gulp build --gulpfile packages/theme-default/gulpfile.js",
-    "dist": "npm run build:style && vue-cli-service build",
-    "build:single": "webpack --config build/build-one-by-one.js",
-    "lint": "vue-cli-service lint",
-    "test:unit": "vue-cli-service test:unit"
   }
-}
+}

package/packages/LxTable/src/LxTable.vue

@@ -26,8 +26,8 @@
       <ElTableColumn
         v-if="
           customConfig &&
-          customConfig.selection &&
-          customConfig.selection.isOpenSelection
+            customConfig.selection &&
+            customConfig.selection.isOpenSelection
         "
         type="selection"
         :width="customConfig.selection.width"
@@ -48,7 +48,7 @@
             template
             :name="`${keys[index]}_header`"
             :keys="keys[index]"
-            :row="returnSelf<TableData>(scope.row)"
+            :row="returnSelf(scope.row)"
             :lable="scope.column"
             :column="scope.$index"
             v-if="getFieldFromConfig(keys[index], 'scopeHeader')"
@@ -60,7 +60,10 @@
         </template>
         <template #default="scope">
           <!-- 支持keys字段为'car.id'或者'id' -->
-          <div v-if="keys[index].indexOf('.') != -1">
+          <!-- @vue-expect-error 这里判断完是数组应该不报ts错误 -->
+          <div
+            v-if="Array.isArray(keys[index]) && keys[index].indexOf('.') != -1"
+          >
             <!-- 一个td需要展示多个字段名 -->
             <div v-if="Array.isArray(keys[index])">
               <div v-for="(array, i) in keys[index]" :key="i">
@@ -69,6 +72,7 @@
             </div>
             <!-- 字段formatters存在,数据过滤-->
             <span v-else-if="getFieldFromConfig(keys[index], 'formatters')">
+              <!-- @vue-expect-error 这里判断完是数组应该不报ts错误 -->
               {{
                 formatterMethods(
                   scope.row[keys[index].split(".")[0]][
@@ -83,7 +87,7 @@
               template
               :name="keys[index]"
               :keys="keys[index]"
-              :row="returnSelf<TableData>(scope.row)"
+              :row="returnSelf(scope.row)"
               :lable="scope.column"
               :column="scope.$index"
               v-else-if="getFieldFromConfig(keys[index], 'template')"
@@ -92,6 +96,7 @@
             <div v-else>
               <!-- 传入不需要截取的列 -->
               <span v-if="getFieldFromConfig(keys[index], 'templateCutOut')">
+                <!-- @vue-expect-error 忽略ts错误不改动-->
                 {{
                   formateValue(
                     scope.row[keys[index].split(".")[0]][
@@ -100,6 +105,7 @@
                   )
                 }}
               </span>
+              <!-- @vue-expect-error 忽略ts错误不改动-->
               <Ellipsis
                 v-else
                 :popoverName="popoverName"
@@ -116,6 +122,7 @@
               >
                 <template #popover>
                   <div>
+                    <!-- @vue-expect-error 忽略ts错误不改动-->
                     {{
                       formateValue(
                         scope.row[keys[index].split(".")[0]][
@@ -137,6 +144,7 @@
             </div>
             <!-- 字段formatters存在,数据过滤-->
             <span v-else-if="getFieldFromConfig(keys[index], 'formatters')">
+              <!-- @vue-expect-error 忽略ts错误不改动-->
               {{
                 formatterMethods(
                   scope.row[keys[index]],
@@ -149,7 +157,7 @@
               template
               :name="keys[index]"
               :keys="keys[index]"
-              :row="returnSelf<TableData>(scope.row)"
+              :row="returnSelf(scope.row)"
               :lable="scope.column"
               :column="scope.$index"
               v-else-if="getFieldFromConfig(keys[index], 'template')"
@@ -160,6 +168,7 @@
               <span v-if="getFieldFromConfig(keys[index], 'templateCutOut')">
                 {{ formateValue(scope.row[keys[index]]) }}
               </span>
+                   <!-- @vue-expect-error 忽略ts错误不改动-->
               <Ellipsis
                 v-else
                 :popoverName="popoverName"
@@ -187,7 +196,11 @@
     </ElPagination>
   </div>
 </template>
-<script lang="ts" setup generic="K = any, TableData = Record<string, any>">
+<script
+  lang="ts"
+  setup
+  generic="K extends (string | number) | (string | number)[], TableData = Record<string, any>"
+>
 import Ellipsis from "../../Ellipsis";
 
 const $emit = defineEmits([
@@ -225,8 +238,8 @@ const props = withDefaults(
     tableRowClassName: () => ({}),
   }
 );
-function returnSelf<Data> (data: Data){
-  return data
+function returnSelf(data: TableData): TableData {
+  return data;
 }
 const handleCurrentChange = (val: any) => {
   $emit("handleCurrentChange", val);
@@ -262,7 +275,12 @@ const formateValue = (val: string | number | string[]) => {
   }
   return val || val === 0 ? val : "--";
 };
-const getFieldFromConfig = (index: string | number, name: string | number) => {
+const getFieldFromConfig = (
+  index: (string | number) | (string | number)[],
+  name: string | number
+) => {
+  if (Array.isArray(index)) return;
+
   return (
     props.customConfig &&
     props.customConfig[index] &&