htui-yllkbz 1.3.79 → 1.3.81

package/package.json

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

package/src/packages/HtBaseData/index.vue

@@ -13,7 +13,7 @@
         :disabled="!!disabled"
         :size="size"
         popper-class="ht-cascader-poper"
-        class="component-item"
+        class="component-item "
         :class="comClass"
         style="width:100%"
         :style="comStyle || ''"
@@ -989,6 +989,10 @@ $primary-color: var(--primary);
   background: none;
   height: 32px !important;
 }
+.component-item-heightAuto .el-input--suffix .el-input__inner {
+  background: none;
+  height: auto !important;
+}
 .component-item .is-disabled .el-input__inner {
   background: #f5f5f5;
 }

package/src/packages/HtSelectBaseData/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 15:47:47
  * @LastEditors: hutao
- * @LastEditTime: 2022-09-27 14:50:08
+ * @LastEditTime: 2022-12-13 17:16:43
 -->
 
 <template>
@@ -26,6 +26,11 @@
         :placeholder="placeholder"
         :hide-code="hideCode"
         :disabled="disabled"
+        :com-class="
+          heightAuto
+            ? 'component-item-heightAuto ht-item-common'
+            : 'ht-item-common'
+        "
         com-style="background:#fff"
         :config-json="configJson"
         @change="getCommonData"
@@ -72,6 +77,7 @@ export default class HtSelectBaseData extends Vue {
   @Prop() value!: string;
   @Prop() org?: string;
   @Prop() size?: string;
+  @Prop() heightAuto?: string;
   @Prop() placeholder?: string;
   /** 是否通过其他Key来做下拉选择 */
   @Prop({ default: false }) byCode!: boolean;

package/src/packages/HtSelectOrg/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-11-09 15:59:32
+ * @LastEditTime: 2022-12-13 17:15:09
 -->
 <template>
   <span v-if="readonly">
@@ -25,7 +25,9 @@
     :appendToBody="appendToBody"
     com-style="background:#fff"
     :config-json="configJson"
-    com-class="ht-item-common"
+    :com-class="
+      heightAuto ? 'component-item-heightAuto ht-item-common' : 'ht-item-common'
+    "
     @change="searchCommonData"
   ></HtBaseData>
 </template>
@@ -49,6 +51,7 @@ export default class HtSelectOrg extends Vue {
   @Prop() value!: string;
   /** 是否禁用 */
   @Prop() disabled?: boolean;
+  @Prop() heightAuto?: boolean;
   @Prop() placeholder?: string;
   @Prop() org?: string;
   @Prop() size?: string;

package/src/packages/HtSelectUser/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-11-09 14:50:41
+ * @LastEditTime: 2022-12-13 17:16:14
 -->
 <template>
   <span v-if="readonly">
@@ -21,7 +21,9 @@
     com-style="background:#fff"
     :appendToBody="appendToBody"
     :config-json="configJson"
-    com-class="ht-item-common"
+    :com-class="
+      heightAuto ? 'component-item-heightAuto ht-item-common' : 'ht-item-common'
+    "
     @change="searchCommonData"
   ></HtBaseData>
 </template>
@@ -47,6 +49,7 @@ export default class HtSelectUser extends Vue {
   @Prop() size!: string;
   /** 是否禁用 */
   @Prop() disabled?: boolean;
+  @Prop() heightAuto?: boolean;
   @Prop() placeholder?: string;
   /** 是否可以清除 */
   @Prop() clearable?: boolean;

package/src/packages/HtTable/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:23:24
  * @LastEditors: hutao
- * @LastEditTime: 2022-11-07 14:42:22
+ * @LastEditTime: 2022-12-05 14:05:22
 -->
 <template>
   <div v-loading="state.loading" style="background:#fff">
@@ -17,6 +17,7 @@
         :stripe="stripe !== undefined ? stripe : true"
         :size="size || 'small'"
         :fit="fit"
+        :span-method="spanMethod"
         :header-row-style="
           headerRowStyle || { background: 'var(--primary-92)' }
         "
@@ -452,6 +453,11 @@ export default class HtTable extends Vue {
   @Prop() data!: any[];
   /**  序号对应的名称 */
   @Prop() keyName?: string;
+  /** 合并单元格 */
+  @Prop() spanMethod?: {
+    rowspan: number;
+    colspan: number;
+  };
   /** 是否启用展开行功能 */
   @Prop() isExpand?: boolean;
   /** 打开配置列 */