htui-yllkbz 1.4.13 → 1.4.15

package/package.json

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

package/src/packages/HtTable/htTableColumn.vue

@@ -24,13 +24,34 @@
     :min-width="item.minWidth"
     :width="item.width"
   >
-    <template v-for="(child, childindex) in item.children">
+    <template v-if="item.children && item.children.length">
       <HtTableColumn
         :item="child"
+        v-for="(child, childindex) in item.children"
         @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 }">
       <slot :name="item.key" :row="row" :column="column" :rowIndex="$index">
@@ -207,7 +228,7 @@ import HtShowBaseData from '@/packages/HtShowBaseData';
 import HtOrgInfo from '@/packages/HtOrgInfo';
 import HtUploadFiles from '@/packages/HtUploadFiles/index.vue';
 import HtSelectUnit from '@/packages/HtSelectUnit';
-import { getPropByPath } from './table-span-method';
+
 interface State {
   /** 数据状态 */
   loading: boolean;
@@ -234,8 +255,34 @@ export default class Index extends Vue {
   };
   /** 生命周期 */
   /** 方法 */
+  // getPropByPath(obj: any, path: string, strict = true) {
+  //   return getPropByPath(obj, path, strict);
+  // }
   getPropByPath(obj: any, path: string, strict = true) {
-    return getPropByPath(obj, path, strict);
+    let tempObj = obj;
+    path = path.replace(/\[(\w+)\]/g, '.$1');
+    path = path.replace(/^\./, '');
+
+    const keyArr = path.split('.');
+    let i = 0;
+    for (let len = keyArr.length; i < len - 1; ++i) {
+      if (!tempObj && !strict) break;
+      const key = keyArr[i];
+      if (key in tempObj) {
+        tempObj = tempObj[key];
+      } else {
+        if (strict) {
+          throw new Error(`table中${path}字段发生错误,请检查`);
+        }
+        break;
+      }
+    }
+    // return {
+    //   o: tempObj,
+    //   k: keyArr[i],
+    //   v: tempObj ? tempObj[keyArr[i]] : null,
+    // };
+    return tempObj ? tempObj[keyArr[i]] : null;
   }
   /** 监听 */
   /** 计算属性 */

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/views/About.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2023-04-09 15:46:52
+ * @LastEditTime: 2023-04-09 18:46:03
 -->
 <template>
   <div>
@@ -41,13 +41,29 @@
         :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>
 </template>
 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator';
-import HtTable from '@/packages/HtTable/table.vue';
+import HtTable from '@/packages/HtTable/index.vue';
 import HtCountDown from '@/packages/HtCountDown/index.vue';
 import HtSelectUser from '@/packages/HtSelectUser/index.vue';
 import HtSelectOrg from '@/packages/HtSelectOrg/index.vue';
@@ -134,6 +150,12 @@ export default class Index extends Vue {
         disabled: true,
         deafaultShow: true,
       },
+      {
+        title: 'selectable',
+        key: 'selectable',
+        width: '300px',
+        type: 'boolean',
+      },
       {
         title: '姓额外名',
         key: 'namey',
@@ -144,7 +166,7 @@ export default class Index extends Vue {
           },
           {
             title: '名',
-            key: 'time',
+            key: 'time1',
             type: 'date',
             align: 'center',
           },