htui-yllkbz 1.4.14 → 1.4.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.4.14",
+  "version": "1.4.16",
   "port": "8082",
   "typings": "types/index.d.ts",
   "main": "lib/htui.common.js",

package/src/packages/HtTable/htTableColumn.vue

@@ -31,10 +31,29 @@
         @showFiles="(val) => $emit('showFiles', val)"
         :fromColumn="true"
         :key="`${child.key}_${childindex}_1`"
-      ></HtTableColumn>
+      >
+        <template :slot="child.key" slot-scope="scope">
+          <slot
+            :name="child.key"
+            :row="scope.row"
+            :column="scope.column"
+            :rowIndex="scope.rowIndex"
+          >
+          </slot>
+        </template>
+        <!-- <template slot="title" slot-scope="{ data }">
+          <slot name="title" :data="data"></slot
+        ></template> -->
+        <template slot-scope="scope" :slot="'header_' + child.key">
+          <slot
+            :name="'header_' + child.key"
+            :column="scope.column"
+            :$index="scope.$index"
+          ></slot>
+        </template>
+      </HtTableColumn>
     </template>
     <template slot-scope="{ row, column, $index }">
-      {{ item.type }}
       <slot :name="item.key" :row="row" :column="column" :rowIndex="$index">
         <!-- 处理部门 -->
         <template v-if="item.type === 'org'">
@@ -253,7 +272,7 @@ export default class Index extends Vue {
         tempObj = tempObj[key];
       } else {
         if (strict) {
-          throw new Error(`table中${path}字段发生错误,请检查`);
+          // throw new Error(`table中${path}字段发生错误,请检查`);
         }
         break;
       }

package/src/packages/HtTable/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:23:24
  * @LastEditors: hutao
- * @LastEditTime: 2023-04-09 16:12:58
+ * @LastEditTime: 2023-04-10 10:08:02
 -->
 <template>
   <div v-loading="state.loading" style="background:#fff">
@@ -138,7 +138,27 @@
             :key="`${item.key}_${index}`"
             :item="item"
             @showFiles="showFiles"
-          ></HtTableColumn>
+          >
+            <template :slot="item.key" slot-scope="scope">
+              <slot
+                :name="item.key"
+                :row="scope.row"
+                :column="scope.column"
+                :rowIndex="scope.rowIndex"
+              >
+              </slot>
+            </template>
+            <template
+              slot-scope="{ column, $index }"
+              :slot="'header_' + item.key"
+            >
+              <slot
+                :name="'header_' + item.key"
+                :column="column"
+                :$index="$index"
+              ></slot>
+            </template>
+          </HtTableColumn>
         </template>
       </el-table>
     </article>

package/src/packages/HtTable/table-span-method.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2023-04-09 14:33:12
  * @LastEditors: hutao
- * @LastEditTime: 2023-04-09 16:12:06
+ * @LastEditTime: 2023-04-10 18:22:09
  */
 /**  处理table里面根据字段获取对应的值 */
 export function getPropByPath(obj: any, path: string, strict = true) {
@@ -21,7 +21,7 @@ export function getPropByPath(obj: any, path: string, strict = true) {
       tempObj = tempObj[key];
     } else {
       if (strict) {
-        throw new Error(`table中${path}字段发生错误,请检查`);
+        //throw new Error(`table中${path}字段发生错误,请检查`);
       }
       break;
     }

package/src/views/About.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2023-04-09 16:48:04
+ * @LastEditTime: 2023-04-09 18:46:03
 -->
 <template>
   <div>
@@ -41,6 +41,22 @@
         :height="500"
         :columns="state.columns"
       >
+        jjjj
+        <template slot="name" slot-scope="{ row }">
+          ----{{ row.name }}----yy
+        </template>
+        <template slot="time1" slot-scope="{ row }">
+          ----{{ row.name }}----yy
+        </template>
+        <template slot="header_time1">
+          次数
+        </template>
+        <template slot="header_selectable">
+          是否看一下
+        </template>
+        <template slot="selectable" slot-scope="{ row }">
+          ----{{ row.selectable }}----yy
+        </template>
       </HtTable>
     </div>
   </div>
@@ -150,7 +166,7 @@ export default class Index extends Vue {
           },
           {
             title: '名',
-            key: 'time',
+            key: 'time1',
             type: 'date',
             align: 'center',
           },