htui-yllkbz 1.3.58 → 1.3.61

package/package.json

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

package/src/App.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2022-07-10 16:50:19
+ * @LastEditTime: 2022-09-27 14:50:29
 -->
 <template>
   <div id="app">
@@ -12,9 +12,17 @@
     <HtSelectBaseData
       dataTypeId="chengbenzhongxin"
       v-model="state.value"
+      :multiple="false"
+      @change="change"
+    ></HtSelectBaseData>
+    <HtSelectBaseData
+      :byCode="true"
+      :multiple="false"
+      :clearable="true"
+      dataTypeId="SeverityLevel"
+      v-model="state.value"
       @change="change"
     ></HtSelectBaseData>
-
     <HtSelectOrg
       :clearable="true"
       :multiple="false"
@@ -68,7 +76,7 @@ export default class App extends Vue {
     // console.log("eeee", e);
   }
   testuser(e: any) {
-    console.log('eee', e);
+    //console.log('eee', e);
   }
   test(e: any) {
     //mgr.removeUser();

package/src/packages/HtBaseData/index.vue

@@ -247,10 +247,12 @@
           v-model="state.selectVal[item.code]"
           :disabled="!!disabled"
           :key="item.id"
+          :clearable="state.configJson[item.code].clearable"
           :style="comStyle || ''"
           :placeholder="placeholder || '请选择严重等级'"
           :filterable="!state.configJson[item.code].multiple"
           class="component-item"
+          :multiple="state.configJson[item.code].multiple"
           style="width:100%"
           @click.native="selectClick($event)"
           @change="setSelctItem(item.code)"
@@ -285,6 +287,8 @@
           :key="item.id"
           :disabled="!!disabled"
           :style="comStyle || ''"
+          :multiple="state.configJson[item.code].multiple"
+          :clearable="state.configJson[item.code].clearable"
           :placeholder="placeholder || '请选择响应列表'"
           :filterable="!state.configJson[item.code].multiple"
           class="component-item"
@@ -701,6 +705,14 @@ export default class CommonDatas extends Vue {
       default:
         break;
     }
+
+    this.$emit(
+      'change',
+      this.state.selectValData[key] && this.state.selectValData[key].length
+        ? this.state.selectValData
+        : { [key]: [] }
+    );
+    //console.log('this.state.selectValData[key]', this.state.selectValData[key]);
   }
   /** 动态设置显示面板位置 */
 

package/src/packages/HtDrawer/index.ts

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

package/src/packages/HtDrawer/index.vue

@@ -0,0 +1,123 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: hutao
+ * @Date: 2022-09-28 10:24:08
+ * @LastEditors: hutao
+ * @LastEditTime: 2022-09-28 11:22:34
+-->
+<template>
+  <el-drawer
+    :visible.sync="state.visible"
+    :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"
+    :size="size"
+    :show-close="showClose"
+    :withHeader="withHeader"
+    :wrapperClosable="wrapperClosable"
+  >
+    <span slot="title">
+      <slot name="title"
+        ><span style="font-size:18px;font-weight:bold">{{ title }}</span></slot
+      >
+    </span>
+
+    <div
+      style="overflow:hidden;;padding:0 16px"
+      :style="
+        `height:calc(100vh - ${withFooter ? '90px' : '0px'} - ${
+          withHeader ? '100px' : '0px'
+        })`
+      "
+    >
+      <el-scrollbar style="height: calc(100% + 19px)">
+        <slot></slot>
+      </el-scrollbar>
+    </div>
+    <el-divider v-if="withFooter"></el-divider>
+    <slot name="foot" v-if="withFooter">
+      <div>
+        <el-button style="margin-left:20px" @click="onCancel">取消</el-button>
+        <el-button style="margin-left:20px" type="primary" @click="onOk"
+          >确定</el-button
+        >
+      </div></slot
+    >
+  </el-drawer>
+</template>
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+interface State {
+  /** 数据状态 */
+  loading: boolean;
+  /** 弹窗 */
+  visible: boolean;
+}
+@Component({
+  name: 'HtDrawer',
+  components: {},
+})
+export default class Index extends Vue {
+  /** 抽屉尺寸 */
+  @Prop({ default: '50%' }) size!: string;
+  /** 标题 */
+  @Prop() title!: string;
+  /** 是否显示隐藏来自父级传参 */
+  @Prop() value!: boolean;
+  /** 展开方式 参考elemen UI */
+  @Prop({ default: 'rtl' }) direction!: string;
+
+  @Prop({ default: true }) appendToBody!: boolean;
+  @Prop({ default: false }) wrapperClosable!: boolean;
+  /** 是否可以通过按下 ESC 关闭 Drawer	 */
+  @Prop({ default: false }) closeOnPressEscape!: boolean;
+  /** 控制是否在关闭 Drawer 之后将子元素全部销毁	 */
+  @Prop({ default: false }) destroyOnClose!: boolean;
+  /** 是否需要遮罩层	 */
+  @Prop({ default: true }) modal!: boolean;
+  /** Drawer 的自定义类名	 */
+  @Prop() customClass!: string;
+  /** 遮罩层是否插入至 body 元素上，若为 false，则遮罩层会插入至 Drawer 的父元素上	 */
+  @Prop({ default: true }) modalAppendToBody!: boolean;
+  @Prop({ default: true }) showClose!: boolean;
+  /**   控制是否显示 header 栏, 默认为 true, 当此项为 false 时, title attribute 和 title slot 均不生效 */
+  @Prop({ default: true }) withHeader!: boolean;
+  /**   控制是否显示 foot 栏, 默认为 true, 当此项为 false 时, foot attribute 和 foot slot 均不生效 */
+  @Prop({ default: true }) withFooter!: boolean;
+  /** 数据 */
+  state: State = {
+    loading: false,
+    visible: false,
+  };
+  /** 生命周期 */
+  /** 方法 */
+  onCancel() {
+    this.state.visible = false;
+    this.$emit('onCancel', false);
+  }
+  onOk() {
+    this.$emit('onOk', true);
+  }
+
+  /** 监听 */
+  @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/HtSelectBaseData/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 15:47:47
  * @LastEditors: hutao
- * @LastEditTime: 2022-09-15 10:04:16
+ * @LastEditTime: 2022-09-27 14:50:08
 -->
 
 <template>
@@ -34,7 +34,8 @@
       <HtShowBaseData
         :hide-code="hideCode"
         :show-all-level="showAllLevels"
-        :base-data-id="value"
+        :base-data-id="!byCode ? value : undefined"
+        :base-data-value="byCode ? value : undefined"
         :base-data-info="true"
         com-style="font-size:12px"
         style="font-size:12px"
@@ -71,6 +72,8 @@ export default class HtSelectBaseData extends Vue {
   @Prop() org?: string;
   @Prop() size?: string;
   @Prop() placeholder?: string;
+  /** 是否通过其他Key来做下拉选择 */
+  @Prop({ default: false }) byCode!: boolean;
   /** 是否禁用 */
   @Prop({ default: false }) disabled?: boolean;
   /* 是否只读 */
@@ -107,13 +110,17 @@ export default class HtSelectBaseData extends Vue {
       if (this.multiple) {
         const arr: string[] = [];
         dep.forEach((item: any) => {
-          arr.push(item.id);
+          arr.push(item[this.byCode ? 'value' : 'id']);
         });
         data = arr;
       } else {
-        data = dep[0].id;
+        data = dep[0][this.byCode ? 'value' : 'id'];
+        if (this.byCode && !isNaN(data)) {
+          data = data.toString();
+        }
       }
     }
+
     this.$emit('input', data);
     this.$emit('change', data, dep);
     // this.$emit("input", id);

package/src/packages/index.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-21 10:08:41
  * @LastEditors: hutao
- * @LastEditTime: 2022-05-15 15:58:44
+ * @LastEditTime: 2022-09-28 11:19:36
  */
 
 // 导入组件
@@ -26,12 +26,13 @@ import HtShowBaseData from './HtShowBaseData/index'
 import HtOrgInfo from './HtOrgInfo/index'
 import HtBaseData from './HtBaseData/index'
 import HtShowBaseType from './HtShowBaseType'
+import HtDrawer from './HtDrawer'
 
 
 
 
 // 存储组件列表
-const components = [HtBaseData, HtShowBaseType, HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo]
+const components = [HtBaseData, HtDrawer, HtShowBaseType, HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo]
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
 const install = function (Vue: any) {
   // 判断是否安装
@@ -48,6 +49,6 @@ export default {
   install,
   // 以下是具体的组件列表
   HtSelectTable, HtPagination, HtShowBaseType, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles,
-  HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo, HtBaseData
+  HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo, HtBaseData, HtDrawer
 }