htui-yllkbz 1.5.44 → 1.5.46

package/package.json

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

package/src/packages/HtBaseData/index.vue

@@ -282,7 +282,7 @@
       <!-- 基础数据级联选择 -->
       <template v-else>
         <template v-if="byCode">
-          {{state.selectVal[item.code]}}
+
           <template v-if="state.configJson[item.code] && state.configJson[item.code].show">
             <el-cascader :size="size"
                          popper-class="ht-cascader-poper"

package/src/packages/HtDialog/index.ts

@@ -0,0 +1,15 @@
+/*
+ * @Descripttion: 基础数据展示组件
+ * @version: 
+ * @Author: hutao
+ * @Date: 2022-04-12 17:34:51
+ * @LastEditors: hutao
+ * @LastEditTime: 2023-04-21 16:31:50
+ */
+
+import HtDialog from "./index.vue";
+(HtDialog as any).install = function (Vue: any) {
+
+  Vue.component("HtDialog", HtDialog);
+};
+export default HtDialog;

package/src/packages/HtDialog/index.vue

@@ -0,0 +1,144 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: hutao
+ * @Date: 2022-09-28 10:24:08
+ * @LastEditors: hutao
+ * @LastEditTime: 2024-10-15 10:22:59
+-->
+<template>
+  <el-dialog
+    :visible.sync="state.visible"
+    :fullscreen="fullscreen"
+    :top="top"
+    :custom-class="customClass"
+    :append-to-body="appendToBody"
+    :close-on-press-escape="closeOnPressEscape"
+    :destroy-on-close="destroyOnClose"
+    :modal-append-to-body="modalAppendToBody"
+    :close-on-click-modal="closeOnClickModal"
+    :modal="modal"
+    :lock-scroll="lockScroll"
+    @close="close"
+    :width="width"
+    class="ht-dialog"
+    :center="center"
+    :show-close="showClose"
+    :before-close="beforClose"
+    :withHeader="withHeader"
+    :wrapperClosable="wrapperClosable"
+  >
+    <span slot="title">
+      <slot name="title">
+        <span>
+          {{ title }}
+        </span>
+      </slot>
+    </span>
+    <div class="ht-dialog-body">
+      <slot></slot>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <slot name="footer" v-if="withFooter">
+        <template>
+          <el-button
+            style="margin-right: 16px"
+            type="primary"
+            :loading="loading"
+            :disabled="disabled"
+            @click="onOk"
+          >
+            {{ okText }}
+          </el-button>
+          <el-button :loading="loading" @click="onCancel">
+            {{ cancelText }}
+          </el-button>
+        </template>
+      </slot>
+    </span>
+  </el-dialog>
+</template>
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+interface State {
+  /** 数据状态 */
+  loading: boolean;
+  /** 弹窗 */
+  visible: boolean;
+}
+@Component({
+  name: "HtDialog",
+  components: {},
+})
+export default class Index extends Vue {
+  /** 抽屉尺寸 */
+  @Prop({ default: "500px" }) width!: string;
+  /** 标题 */
+  @Prop() title!: string;
+  @Prop() loading!: boolean;
+  /** 是否禁用提交按钮 */
+  @Prop() disabled!: boolean;
+  /** 是否显示隐藏来自父级传参 */
+  @Prop() value!: boolean;
+  @Prop() fullscreen!: boolean;
+  @Prop() lockScroll!: boolean;
+  @Prop() center!: boolean;
+  @Prop({ default: "120px" }) top!: string;
+  @Prop({ default: false }) closeOnClickModal!: boolean;
+
+  @Prop({ default: true }) appendToBody!: boolean;
+  @Prop({ default: false }) wrapperClosable!: boolean;
+  /** 是否可以通过按下 ESC 关闭 Drawer	 */
+  @Prop({ default: false }) closeOnPressEscape!: boolean;
+  /** 控制是否在关闭 Drawer 之后将子元素全部销毁	 */
+  @Prop({ default: true }) destroyOnClose!: boolean;
+  /** 是否需要遮罩层	 */
+  @Prop({ default: true }) modal!: boolean;
+  /** Drawer 的自定义类名	 */
+  @Prop() customClass!: string;
+  /** 遮罩层是否插入至 body 元素上，若为 false，则遮罩层会插入至 Drawer 的父元素上	 */
+  @Prop({ default: true }) modalAppendToBody!: boolean;
+  @Prop({ default: true }) showClose!: boolean;
+  @Prop() beforClose!: any;
+  /**   控制是否显示 header 栏, 默认为 true, 当此项为 false 时, title attribute 和 title slot 均不生效 */
+  @Prop({ default: true }) withHeader!: boolean;
+  /**   控制是否显示 foot 栏, 默认为 true, 当此项为 false 时, foot attribute 和 foot slot 均不生效 */
+  @Prop({ default: true }) withFooter!: boolean;
+  /** footer的按钮是否靠右 */
+  @Prop({ default: true }) footerRight!: boolean;
+  @Prop({ default: "保存" }) okText?: string;
+  @Prop({ default: "取消" }) cancelText?: string;
+  /** 数据 */
+  state: State = {
+    loading: false,
+    visible: false,
+  };
+  /** 生命周期 */
+  /** 方法 */
+  onCancel() {
+    this.state.visible = false;
+  }
+  onOk() {
+    this.$emit("onOk", true);
+  }
+  close() {
+    this.$emit("onCancel", false);
+  }
+
+  /** 监听 */
+  @Watch("value", { immediate: true })
+  getVisible(val: boolean, old: boolean) {
+    if (val !== old) {
+      this.state.visible = val;
+    }
+  }
+  /** 监听 */
+  @Watch("state.visible", { immediate: true })
+  setVisible(val: boolean) {
+    this.$emit("input", val);
+    this.$emit("change", val);
+  }
+  /** 计算属性 */
+}
+</script>
+<style lang="scss" scoped></style>

package/src/packages/HtDrawer/index.vue

@@ -7,71 +7,70 @@
  * @LastEditTime: 2024-10-15 10:24:26
 -->
 <template>
-  <el-drawer :visible.sync="state.visible"
-             :class="htClass"
-             :direction="direction"
-             :custom-class="customClass"
-             :append-to-body="appendToBody"
-             :close-on-press-escape="closeOnPressEscape"
-             :destroy-on-close="destroyOnClose"
-             :modal-append-to-body="modalAppendToBody"
-             :modal="modal"
-             @close="close"
-             :size="size"
-             :show-close="showClose"
-             :withHeader="withHeader"
-             :wrapperClosable="wrapperClosable">
+  <el-drawer
+    :visible.sync="state.visible"
+    :class="htClass"
+    :direction="direction"
+    :custom-class="customClass"
+    :append-to-body="appendToBody"
+    :close-on-press-escape="closeOnPressEscape"
+    :destroy-on-close="destroyOnClose"
+    :modal-append-to-body="modalAppendToBody"
+    :modal="modal"
+    @close="close"
+    :size="size"
+    :show-close="showClose"
+    :withHeader="withHeader"
+    :wrapperClosable="wrapperClosable"
+  >
     <span slot="title">
-      <slot name="title"><span style="font-size:var(--font-size-main-title,18px);font-weight:bold;">{{
-          title
-        }}</span></slot>
+      <slot name="title">
+        <span style="display: inline-block; height: 24px; line-height: 24px">
+          {{ title }}
+        </span>
+      </slot>
     </span>
-
-    <div style="overflow:hidden;padding:0 16px"
-         :style="
-        `height:calc(100vh - ${withFooter ? '56px' : '0px'} - ${
-          withHeader ? (htClass === 'ht-new-drawer' ? '60px' : '90px') : '0px'
-        })`
-      ">
-      <el-scrollbar style="height: calc(100% + 19px)">
+    <div
+      style="overflow: hidden; padding: 0 16px"
+      :style="`height:calc(100vh - ${withFooter ? '72px' : '0px'} - ${
+        withHeader ? (htClass === 'ht-new-drawer' ? '60px' : '56px') : '0px'
+      })`"
+    >
+      <el-scrollbar style="height: calc(100% + 17px)">
         <slot></slot>
       </el-scrollbar>
     </div>
     <!-- <el-divider v-if="withFooter"></el-divider> -->
-    <div style="margin-top:16px">
-      <slot name="foot"
-            v-if="withFooter">
-        <template v-if="!footerRight">
+    <div v-if="withFooter">
+      <slot name="foot">
+        <div style="text-align: right; padding: 16px; box-sizing: border-box">
           <template v-if="!readonly">
-            <el-button style="margin-left:24px"
-                       :disabled="disabled"
-                       :loading="loading"
-                       type="primary"
-                       @click="onOk">{{ okText }}</el-button>
-            <el-button :loading="loading"
-                       style="margin-left:16px"
-                       @click="onCancel">{{ cancelText }}</el-button>
-          </template>
-          <el-button v-else
-                     :loading="loading"
-                     style="margin-left:24px"
-                     @click="onCancel">{{ cancelText }}</el-button>
-        </template>
-        <template v-else>
-          <template v-if="!readonly"><el-button style="margin-right:24px;float:right"
-                       type="primary"
-                       :loading="loading"
-                       :disabled="disabled"
-                       @click="onOk">{{ okText }}</el-button>
-            <el-button :loading="loading"
-                       style="margin-right:16px;float:right"
-                       @click="onCancel">{{ cancelText }}</el-button>
+            <el-button
+              style="margin-right: 16px"
+              type="primary"
+              :loading="loading"
+              :disabled="disabled"
+              @click="onOk"
+            >
+              {{ okText }}
+            </el-button>
+            <el-button
+              :loading="loading"
+              style="margin-right: 16px"
+              @click="onCancel"
+            >
+              {{ cancelText }}
+            </el-button>
           </template>
-          <el-button v-else
-                     :loading="loading"
-                     style="margin-left:24px"
-                     @click="onCancel">{{ cancelText }}</el-button>
-        </template>
+          <el-button
+            v-else
+            :loading="loading"
+            style="margin-left: 16px"
+            @click="onCancel"
+          >
+            {{ cancelText }}
+          </el-button>
+        </div>
       </slot>
     </div>
   </el-drawer>

package/src/packages/HtModel/index.vue

@@ -7,47 +7,52 @@
  * @LastEditTime: 2024-10-15 10:22:59
 -->
 <template>
-  <el-dialog :visible.sync="state.visible"
-             :fullscreen="fullscreen"
-             :top="top"
-             :custom-class="customClass"
-             :append-to-body="appendToBody"
-             :close-on-press-escape="closeOnPressEscape"
-             :destroy-on-close="destroyOnClose"
-             :modal-append-to-body="modalAppendToBody"
-             :close-on-click-modal="closeOnClickModal"
-             :modal="modal"
-             :lock-scroll="lockScroll"
-             @close="close"
-             :width="width"
-             class="ht-model"
-             :center="center"
-             :show-close="showClose"
-             :before-close="beforClose"
-             :withHeader="withHeader"
-             :wrapperClosable="wrapperClosable">
+  <el-dialog
+    :visible.sync="state.visible"
+    :fullscreen="fullscreen"
+    :top="top"
+    :custom-class="customClass"
+    :append-to-body="appendToBody"
+    :close-on-press-escape="closeOnPressEscape"
+    :destroy-on-close="destroyOnClose"
+    :modal-append-to-body="modalAppendToBody"
+    :close-on-click-modal="closeOnClickModal"
+    :modal="modal"
+    :lock-scroll="lockScroll"
+    @close="close"
+    :width="width"
+    class="ht-model"
+    :center="center"
+    :show-close="showClose"
+    :before-close="beforClose"
+    :withHeader="withHeader"
+    :wrapperClosable="wrapperClosable"
+  >
     <span slot="title">
-      <slot name="title"><span style="font-size:var(--font-size-main-title,18px);font-weight:bold;padding:0px 0 0 12px">{{
-          title
-        }}</span></slot>
+      <slot name="title">
+        <span>
+          {{ title }}
+        </span>
+      </slot>
     </span>
     <div class="ht-model-body">
       <slot></slot>
     </div>
-    <span slot="footer"
-          class="dialog-footer ht-model-footer"
-          :style="!footerRight ? 'text-align:left' : ''">
-      <slot name="footer"
-            v-if="withFooter">
+    <span slot="footer" class="dialog-footer">
+      <slot name="footer" v-if="withFooter">
         <template>
-          <el-button style="margin-right:12px;"
-                     type="primary"
-                     :loading="loading"
-                     :disabled="disabled"
-                     @click="onOk">{{ okText }}</el-button>
-          <el-button :loading="loading"
-                     style="margin-right:6px"
-                     @click="onCancel">{{ cancelText }}</el-button>
+          <el-button
+            style="margin-right: 16px"
+            type="primary"
+            :loading="loading"
+            :disabled="disabled"
+            @click="onOk"
+          >
+            {{ okText }}
+          </el-button>
+          <el-button :loading="loading" @click="onCancel">
+            {{ cancelText }}
+          </el-button>
         </template>
       </slot>
     </span>