htui-yllkbz 1.3.72 → 1.3.74

package/package.json

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

package/src/packages/HtDrawer/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2022-09-28 10:24:08
  * @LastEditors: hutao
- * @LastEditTime: 2022-10-11 16:16:39
+ * @LastEditTime: 2022-11-04 09:27:46
 -->
 <template>
   <el-drawer
@@ -16,6 +16,7 @@
     :destroy-on-close="destroyOnClose"
     :modal-append-to-body="modalAppendToBody"
     :modal="modal"
+    @close="close"
     :size="size"
     :show-close="showClose"
     :withHeader="withHeader"
@@ -113,11 +114,13 @@ export default class Index extends Vue {
   /** 方法 */
   onCancel() {
     this.state.visible = false;
-    this.$emit('onCancel', false);
   }
   onOk() {
     this.$emit('onOk', true);
   }
+  close() {
+    this.$emit('onCancel', false);
+  }
 
   /** 监听 */
   @Watch('value', { immediate: true })

package/src/packages/HtUploadFiles/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2022-02-11 14:26:23
  * @LastEditors: hutao
- * @LastEditTime: 2022-02-28 09:44:36
+ * @LastEditTime: 2022-11-07 14:32:25
 -->
 <!--
  * @Descripttion: 附件列表  ------没有搞完
@@ -16,52 +16,57 @@
 -->
 <template>
   <div>
-    <el-upload class="ht-upload"
-               v-if="!disabled"
-               style="width:368px;height:108px"
-               :show-file-list="false"
-               :disabled="disabled"
-               :on-success="onSuccess"
-               :before-upload="beforeUpload"
-               drag
-               action="/files/api/filing/file/upload"
-               multiple>
+    <el-upload
+      class="ht-upload"
+      v-if="!disabled"
+      style="width:368px;height:108px"
+      :show-file-list="false"
+      :disabled="disabled"
+      :on-success="onSuccess"
+      :before-upload="beforeUpload"
+      drag
+      action="/files/api/filing/file/upload"
+      multiple
+    >
       <!-- <i class="el-icon-upload"></i> -->
-      <div style="margin-top:8px;font-size:12px;color:#999"
-           class="el-upload__text">拖动文件到此处，或<br /><em>点击上传</em></div>
+      <div
+        style="margin-top:8px;font-size:12px;color:#999"
+        class="el-upload__text"
+      >
+        拖动文件到此处，或<br /><em>点击上传</em>
+      </div>
       <!-- <div class="el-upload__tip"
                      slot="tip">只能上传jpg/png文件，且不超过5M</div> -->
     </el-upload>
     <ul class="ht-ul-upload">
-      <li :key="item.fileToken"
-          v-for=" (item,index) in state.filesInfo">
-        <a @click="downLoadFile(item)"><i class="le-icon el-icon-document"
-             style="margin-right:7px"></i>{{item.fileName}}</a>
+      <li :key="item.fileToken" v-for="(item, index) in state.filesInfo">
+        <a @click="downLoadFile(item)"
+          ><i class="le-icon el-icon-document" style="margin-right:7px"></i
+          >{{ item.fileName }}</a
+        >
         <span>
-
-          <i v-if="!disabled"
-             class="el-icon  el-icon-circle-check"></i>
-          <i v-if="!disabled"
-             class="el-icon  el-icon-close"
-             @click="delItem(item,index)"
-             title="删除"></i>
-          <i class="el-icon  el-icon-download"
-             style="margin-right:24px"
-             @click="downLoadFile(item)"
-             title="下载"></i>
+          <i v-if="!disabled" class="el-icon  el-icon-circle-check"></i>
+          <i
+            v-if="!disabled"
+            class="el-icon  el-icon-close"
+            @click="delItem(item, index)"
+            title="删除"
+          ></i>
+          <i
+            class="el-icon  el-icon-download"
+            style="margin-right:24px"
+            @click="downLoadFile(item)"
+            title="下载"
+          ></i>
         </span>
-
       </li>
     </ul>
-    <a :href="state.fileSrc"
-       target="_blank"
-       v-show="false"
-       ref="download1"></a>
+    <a :href="state.fileSrc" target="_blank" v-show="false" ref="download1"></a>
   </div>
 </template>
-<script lang='ts'>
-import { _axios } from "vue-kst-auth";
-import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+<script lang="ts">
+import { _axios } from 'vue-kst-auth';
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
 interface State {
   /** 数据状态 */
   loading: boolean;
@@ -86,10 +91,10 @@ interface CreateAttachmentDto {
   sortNum?: number;
 }
 @Component({
-  name: "HtUploadFiles",
+  name: 'HtUploadFiles',
 })
 export default class HtUploadFiles extends Vue {
-  @Prop() value!: string;
+  @Prop() value!: string | string[];
   /* 是否只读 */
   @Prop({ default: false }) readonly?: boolean;
   /** 是否禁用 */
@@ -101,14 +106,14 @@ export default class HtUploadFiles extends Vue {
   /** 数据 */
   state: State = {
     loading: false,
-    fileSrc: "",
+    fileSrc: '',
     fileToken: [],
     filesInfo: [],
     dialogVisible: false,
   };
   /** 生命周期 */
   created() {
-    this.onValue(this.value);
+    //this.onValue(this.value);
   }
   /** 方法 */
   /** 上传文件前验证 */
@@ -116,11 +121,11 @@ export default class HtUploadFiles extends Vue {
   /** 附件上传之前的判断 */
   beforeUpload(file: File) {
     const isLt10MB = file.size / 1024 / 1024 < 5;
-    const arr = ["jpg", "png", "xlsx", "lsx", "doc", "pdf"];
-    const lastArr = file.name.split(".");
+    const arr = ['jpg', 'png', 'xlsx', 'lsx', 'doc', 'pdf'];
+    const lastArr = file.name.split('.');
     const type = lastArr[lastArr.length - 1];
     if (!isLt10MB) {
-      this.$message.error("大小不能超过 5MB!");
+      this.$message.error('大小不能超过 5MB!');
     }
     if (arr.includes(type)) {
       return true;
@@ -145,7 +150,7 @@ export default class HtUploadFiles extends Vue {
   }
   /** 获取到的附件列表详情 */
   getFileInfo(id: string) {
-    _axios.get("/files/api/filing/file/" + id).then((res) => {
+    _axios.get('/files/api/filing/file/' + id).then((res) => {
       this.state.filesInfo.push(res.data);
     });
   }
@@ -168,7 +173,7 @@ export default class HtUploadFiles extends Vue {
         ) < 0
       ) {
         await _axios
-          .get("/files/api/filing/file/" + fileToken[i])
+          .get('/files/api/filing/file/' + fileToken[i])
           .then((res) => {
             this.state.filesInfo.push(res.data);
           });
@@ -180,30 +185,35 @@ export default class HtUploadFiles extends Vue {
   get fileList() {
     return [];
   }
-  @Watch("state.filesInfo")
+  @Watch('state.filesInfo')
   onFileToken(val: CreateAttachmentDto[], old: string) {
     if (!this.readonly && !this.isArray) {
       const arr: string[] = [];
       val.forEach((item) => {
         if (item.fileToken) arr.push(item.fileToken);
       });
-      this.$emit("input", arr.toString());
-      this.$emit("change", arr.toString());
+      this.$emit('input', arr.toString());
+      this.$emit('change', arr.toString());
     }
     if (this.isArray) {
-      this.$emit("change", val);
+      this.$emit('change', val);
     }
   }
-  @Watch("filesInfo", { immediate: true })
+  @Watch('filesInfo', { immediate: true })
   onArrValue(val: CreateAttachmentDto[]) {
     if (this.isArray) {
       this.state.filesInfo = val || [];
     }
   }
-  @Watch("value")
-  onValue(val: string) {
+  @Watch('value', { immediate: true })
+  onValue(val: string | string[]) {
     if (val && !this.isArray) {
-      this.state.fileToken = val.split(",");
+      if (Array.isArray(val)) {
+        this.state.fileToken = val;
+      } else {
+        this.state.fileToken = val.split(',');
+      }
+
       this.getAllFileInfo();
     } else {
       this.state.fileToken = [];
@@ -214,7 +224,7 @@ export default class HtUploadFiles extends Vue {
   }
 }
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .ht-ul-upload {
   li {
     width: 100%;
@@ -250,4 +260,4 @@ export default class HtUploadFiles extends Vue {
     }
   }
 }
-</style>
+</style>