htui-yllkbz 1.3.34 → 1.3.37

package/package.json

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

package/src/App.vue

@@ -4,37 +4,38 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2022-05-17 11:31:05
+ * @LastEditTime: 2022-07-10 16:50:19
 -->
 <template>
   <div id="app">
-    <el-button type=""
-               @click="test">测试</el-button>
-    <HtSelectBaseData dataTypeId="chengbenzhongxin"
-                      v-model="state.value"
-                      @change="change"></HtSelectBaseData>
+    <el-button type="" @click="test">测试</el-button>
+    <HtSelectBaseData
+      dataTypeId="chengbenzhongxin"
+      v-model="state.value"
+      @change="change"
+    ></HtSelectBaseData>
 
-    <HtSelectOrg :clearable="true"
-                 :multiple="true"
-                 v-model="state.value"
-                 @change="testuser"></HtSelectOrg>
+    <HtSelectOrg
+      :clearable="true"
+      :multiple="false"
+      v-model="state.value"
+      @change="testuser"
+    ></HtSelectOrg>
     <!-- <HtSelectOrg :clearable="true"
                  v-model="state.value"
                  @change="testuser"></HtSelectOrg> -->
-    -------------
-
-    ----------
+    ------------- ----------
     <router-view></router-view>
   </div>
 </template>
 
 <script lang="ts">
-import { Component, Vue } from "vue-property-decorator";
-import HtSelectBaseData from "@/packages/HtSelectBaseData";
-import HtSelectOrg from "@/packages/HtSelectOrg";
-import HtSelectUser from "@/packages/HtSelectUser";
-import HtShowBaseType from "@/packages/HtShowBaseType";
-import { mgr } from "@/plugins/oidc-client";
+import { Component, Vue } from 'vue-property-decorator';
+import HtSelectBaseData from '@/packages/HtSelectBaseData';
+import HtSelectOrg from '@/packages/HtSelectOrg';
+import HtSelectUser from '@/packages/HtSelectUser';
+import HtShowBaseType from '@/packages/HtShowBaseType';
+import { mgr } from '@/plugins/oidc-client';
 @Component({
   components: {
     HtSelectBaseData,
@@ -44,14 +45,14 @@ import { mgr } from "@/plugins/oidc-client";
 })
 export default class App extends Vue {
   state = {
-    value: ["95bd1bfd-59d8-f88b-2b65-39f97d1da058"],
+    value: ['95bd1bfd-59d8-f88b-2b65-39f97d1da058'],
   };
   /** 生命周期 */
   created() {
     // 动态加载引用文件
-    const files = this.$store.getters.getBaseData("files");
+    const files = this.$store.getters.getBaseData('files');
     const filesKeys = Object.keys(files);
-    let heatStr = document.getElementsByTagName("head")[0].innerHTML;
+    let heatStr = document.getElementsByTagName('head')[0].innerHTML;
     filesKeys.forEach((cur) => {
       const src = files[cur];
       if (src && /\.css$/.test(src.toString())) {
@@ -61,13 +62,13 @@ export default class App extends Vue {
         heatStr += `<link rel="icon" href="${src}">`;
       }
     });
-    document.getElementsByTagName("head")[0].innerHTML = heatStr;
+    document.getElementsByTagName('head')[0].innerHTML = heatStr;
   }
   change() {
     // console.log("eeee", e);
   }
   testuser(e: any) {
-    console.log("eee", e);
+    console.log('eee', e);
   }
   test(e: any) {
     //mgr.removeUser();
@@ -126,14 +127,14 @@ export default class App extends Vue {
 
 <style lang="scss">
 #app {
-  font-family: "SourceHanSansCN-Normal", "Avenir", Helvetica, Arial, sans-serif;
+  font-family: 'SourceHanSansCN-Normal', 'Avenir', Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   color: #505050;
   font-size: 14px;
 }
 body {
-  font-family: "SourceHanSansCN-Normal";
+  font-family: 'SourceHanSansCN-Normal';
   font-size: 14px;
 }
 </style>

package/src/packages/HtBaseData/index.vue

@@ -16,7 +16,7 @@
         :style="comStyle || ''"
         :filterable="!state.configJson['departmentId'].multiple"
         :clearable="state.configJson['departmentId'].clearable"
-        :placeholder="`请选择部门`"
+        :placeholder="placeholder || `请选择部门`"
         :collapse-tags="state.configJson['departmentId'].collapseTags"
         v-model="state.selectVal['departmentId']"
         :show-all-levels="state.configJson['departmentId'].showAllLevels"
@@ -40,7 +40,7 @@
         class="component-item"
         :class="comClass"
         :style="comStyle || ''"
-        :placeholder="`请选择部门`"
+        :placeholder="placeholder || `请选择部门`"
         v-model="state.selectVal['departmentId']"
         :props="{
           label: 'name',
@@ -63,7 +63,7 @@
     <!-- 选择人员 -->
     <el-select
       v-model="state.selectVal['userId']"
-      placeholder="请选择人员"
+      :placeholder="placeholder || '请选择人员'"
       :filterable="!state.configJson['userId'].multiple"
       :disabled="!!disabled"
       :style="comStyle || ''"
@@ -118,7 +118,7 @@
         :class="comClass"
         :style="comStyle || ''"
         :clearable="state.configJson['departmentUser'].clearable"
-        :placeholder="`请选择部门下人员`"
+        :placeholder="placeholder || `请选择部门下人员`"
         :collapse-tags="state.configJson['departmentUser'].collapseTags"
         v-model="state.selectVal['departmentUser']"
         :show-all-levels="state.configJson['departmentUser'].showAllLevels"
@@ -145,7 +145,7 @@
               float: left;
               width: 14px;
               height: 14px;
-              background: #4ecc7a;
+              background: var(--primary);
               line-height: 34px;
               margin-top: 10px;
               border-radius: 10px;
@@ -174,7 +174,7 @@
         :style="panStyle"
         :filterable="!state.configJson['departmentUser'].multiple"
         class="component-item"
-        :placeholder="`请选择部门下人员`"
+        :placeholder="placeholder || `请选择部门下人员`"
         v-model="state.selectVal['departmentUser']"
         :props="{
           label: 'name',
@@ -198,7 +198,7 @@
               float: left;
               width: 14px;
               height: 14px;
-              background: #4ecc7a;
+              background: var(--primary);
               line-height: 34px;
               margin-top: 10px;
               border-radius: 10px;
@@ -233,7 +233,7 @@
           :disabled="!!disabled"
           :key="item.id"
           :style="comStyle || ''"
-          placeholder="请选择严重等级"
+          :placeholder="placeholder || '请选择严重等级'"
           :filterable="!state.configJson[item.code].multiple"
           class="component-item"
           @click.native="selectClick($event)"
@@ -268,7 +268,7 @@
           :key="item.id"
           :disabled="!!disabled"
           :style="comStyle || ''"
-          placeholder="请选择响应列表"
+          :placeholder="placeholder || '请选择响应列表'"
           :filterable="!state.configJson[item.code].multiple"
           class="component-item"
           @click.native="selectClick($event)"
@@ -303,7 +303,7 @@
         >
           <el-cascader
             v-if="!state.configJson[item.code].panel"
-            :placeholder="`请选择${item.name}`"
+            :placeholder="placeholder || `请选择${item.name}`"
             :disabled="!!disabled"
             class="component-item"
             :style="comStyle || ''"
@@ -330,7 +330,7 @@
           <el-cascader-panel
             v-else
             @click.native="selectClick($event)"
-            :placeholder="`请选择${item.name}`"
+            :placeholder="placeholder || `请选择${item.name}`"
             class="component-item"
             :key="item.id"
             :style="panStyle"
@@ -525,6 +525,7 @@ export default class CommonDatas extends Vue {
   @Prop() comClass?: string;
   /** 隐藏编码 */
   @Prop() hideCode?: boolean;
+  @Prop() placeholder?: string;
   /** 自定义style */
   @Prop() comStyle?: string;
   /** 自定义style */
@@ -678,7 +679,7 @@ export default class CommonDatas extends Vue {
   /** 动态设置显示面板位置 */
 
   selectClick(e: any) {
-    console.log('ee', e);
+    //
     // 下拉选择框列表
     //const list = window.document.getElementsByClassName("el-select-dropdown");
     // (list as any).forEach((element: any) => {
@@ -734,12 +735,15 @@ export default class CommonDatas extends Vue {
         }
       );
     }
-    if (!e && !this.state.selectVal[key]) {
+    if (!e || !e.length) {
       this.state.selectValData[key] = [];
     }
+
     this.$emit(
       'change',
-      this.state.selectValData[key] ? this.state.selectValData : { [key]: [] }
+      this.state.selectValData[key] && this.state.selectValData[key].length
+        ? this.state.selectValData
+        : { [key]: [] }
     );
   }
   /** 基础数据递归处理 */
@@ -903,7 +907,7 @@ export default class CommonDatas extends Vue {
 }
 </style>
 <style lang="scss">
-$primary-color: #4ecc7a;
+$primary-color: var(--primary);
 .component-item .el-input--suffix .el-input__inner {
   background: none;
   height: 32px !important;

package/src/packages/HtMd/index.vue

@@ -4,24 +4,26 @@
  * @Author: hutao
  * @Date: 2021-12-21 16:24:07
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-22 09:58:44
+ * @LastEditTime: 2022-07-18 14:59:56
 -->
 <template>
-  <mavon-editor v-model="state.content"
-                :subfield="subfield"
-                default_open="{}"
-                ref="md"
-                @save="save"
-                :placeholder="placeholder"
-                :editable="!disabled"
-                @imgAdd="addImg"
-                @change="change" />
+  <mavon-editor
+    v-model="state.content"
+    :subfield="subfield"
+    default_open="{}"
+    ref="md"
+    @save="save"
+    :placeholder="placeholder"
+    :editable="!disabled"
+    @imgAdd="addImg"
+    @change="change"
+  />
 </template>
-<script lang='ts'>
-import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-import mavonEditor from "mavon-editor";
-import "mavon-editor/dist/css/index.css";
-import { _axios } from "vue-kst-auth";
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+import mavonEditor from 'mavon-editor';
+import 'mavon-editor/dist/css/index.css';
+import { _axios } from 'vue-kst-auth';
 Vue.use(mavonEditor);
 interface State {
   /** 数据状态 */
@@ -43,7 +45,7 @@ export default class HtMd extends Vue {
   /** 数据 */
   state: State = {
     loading: false,
-    content: "",
+    content: '',
   };
   /** 生命周期 */
   created() {
@@ -53,17 +55,17 @@ export default class HtMd extends Vue {
   /**  添加图片 */
   addImg(e: number, f: File) {
     if (this.changImg) {
-      this.$emit("callBackImg", e, f);
+      this.$emit('callBackImg', e, f);
       return;
     }
     const formdata = new FormData();
-    formdata.append("file", f);
+    formdata.append('file', f);
     //将下面上传接口替换为你自己的服务器接口
     _axios({
-      url: "/files/api/filing/file/upload",
-      method: "post",
+      url: '/files/api/filing/file/upload',
+      method: 'post',
       data: formdata,
-      headers: { "Content-Type": "multipart/form-data" },
+      headers: { 'Content-Type': 'multipart/form-data' },
     }).then((res) => {
       if (res.status === 200) {
         (this.$refs.md as any).$img2Url(
@@ -72,28 +74,25 @@ export default class HtMd extends Vue {
         );
       }
     });
-
     //
   }
   /** 实时改变 */
   change(e: string, text: string) {
-    this.$emit("input", e);
-
-    this.$emit("change", e, text);
-
+    this.$emit('input', e);
+    this.$emit('change', e, text);
     //
   }
   /**  保存数据 */
   save(e: string, text: string) {
-    this.$emit("save", e, text);
+    this.$emit('save', e, text);
   }
 
   /** 监听 */
-  @Watch("value", { deep: true })
+  @Watch('value', { deep: true })
   onContent(val: string) {
     this.state.content = val;
   }
   /** 计算属性 */
 }
 </script>
-<style lang='scss' scoped></style>
+<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-07-10 14:38:04
+ * @LastEditTime: 2022-07-17 11:34:00
 -->
 
 <template>
@@ -20,6 +20,7 @@
       <HtBaseData
         v-else
         :org="org"
+        :placeholder="placeholder"
         :hide-code="hideCode"
         :disabled="disabled"
         com-style="background:#fff"
@@ -66,6 +67,7 @@ interface State {
 export default class HtSelectBaseData extends Vue {
   @Prop() value!: string;
   @Prop() org?: string;
+  @Prop() placeholder?: string;
   /** 是否禁用 */
   @Prop({ default: false }) disabled?: boolean;
   /* 是否只读 */

package/src/packages/HtSelectOrg/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-07-10 14:34:45
+ * @LastEditTime: 2022-07-17 11:32:50
 -->
 <template>
   <span v-if="readonly">
@@ -17,6 +17,8 @@
   </span>
   <HtBaseData
     v-else
+    :org="org"
+    :placeholder="placeholder"
     :disabled="disabled"
     com-style="background:#fff"
     :config-json="configJson"
@@ -43,6 +45,7 @@ export default class HtSelectOrg extends Vue {
   @Prop() value!: string;
   /** 是否禁用 */
   @Prop() disabled?: boolean;
+  @Prop() placeholder?: string;
   @Prop() org?: string;
   /** 是否可以清除 */
   @Prop() clearable?: boolean;

package/src/packages/HtSelectUser/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-07-10 14:34:15
+ * @LastEditTime: 2022-07-17 11:33:13
 -->
 <template>
   <span v-if="readonly">
@@ -17,6 +17,8 @@
   </span>
   <HtBaseData
     v-else
+    :org="org"
+    :placeholder="placeholder"
     :disabled="disabled"
     com-style="background:#fff"
     :config-json="configJson"
@@ -44,6 +46,7 @@ export default class HtSelectUser extends Vue {
   @Prop() org!: string;
   /** 是否禁用 */
   @Prop() disabled?: boolean;
+  @Prop() placeholder?: string;
   /** 是否可以清除 */
   @Prop() clearable?: boolean;
   @Prop({ default: true }) show?: boolean;

package/src/packages/common.ts

@@ -0,0 +1,70 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: hutao
+ * @Date: 2022-07-18 15:01:02
+ * @LastEditors: hutao
+ * @LastEditTime: 2022-07-18 15:03:00
+ */
+import moment from "moment";
+
+/**    生成唯一Id
+ * @params e 生成的id位数 默认32
+ */
+export const randomString = (e = 32) => {
+  /** 生成格式17位的时间YYYY-MM-DD HH:mm:ss.SSS加(e-17)位的随机数 */
+  const t = "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz23456789",
+    a = t.length;
+  const now = moment().format('YYYYMMDDHHmmssSSS')
+  let n = "";
+  if (e > 17) {
+    n = now
+
+    for (let i = 0; i < (e - 17); i++) {
+      n += t.charAt(Math.floor(Math.random() * a));
+    }
+  }
+  else if (e === 17) {
+    n = now
+  }
+  else {
+    for (let i = 0; i < e; i++) {
+      n += t.charAt(Math.floor(Math.random() * a));
+    }
+  }
+
+  return n;
+}
+/** 时间计算
+@params fromDate 开始时间
+@params toDate 结束时间
+ */
+export const dateLess = (fromDate: string, toDate: string) => {
+  if (fromDate && toDate) {
+    const date = new Date(fromDate);
+    const date2 = new Date(toDate);
+    const s1: number = date.getTime(),
+      s2 = date2.getTime();
+    const total: number = (s2 - s1) / 1000;
+    const day: number = parseInt((total / (24 * 60 * 60)).toString()); //计算整数天数
+    const afterDay: number = total - day * 24 * 60 * 60; //取得算出天数后剩余的秒数
+    const hour: number = parseInt((afterDay / (60 * 60)).toString()); //计算整数小时数
+    const afterHour = total - day * 24 * 60 * 60 - hour * 60 * 60; //取得算出小时数后剩余的秒数
+    const min: number = parseInt((afterHour / 60).toString()); //计算整数分
+    const afterMin: number =
+      parseInt((total - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60).toString()); //取得算出分后剩余的秒数
+    if (day === 0) {
+      if (hour === 0) {
+        return min + "分" + afterMin + "秒";
+      } else {
+        return hour + "小时" + min + "分" + afterMin + "秒";
+      }
+    } else {
+      return day + "天" + hour + "小时" + min + "分" + afterMin + "秒";
+    }
+  }
+  else {
+    return "-"
+  }
+
+}

package/src/packages/style.scss

@@ -11,3 +11,46 @@
     float: right;
   }
 }
+.component-item {
+  width: 100%;
+  + .component-item {
+    margin-top: 10px;
+  }
+}
+.item-origin {
+  border-radius: 50%;
+  border-width: 0px 7px;
+  margin-right: 6px;
+  border-style: solid;
+}
+$primary-color: var(--primary);
+.component-item .el-input--suffix .el-input__inner {
+  background: none;
+  height: 32px !important;
+}
+.component-item .is-disabled .el-input__inner {
+  background: #f5f5f5;
+}
+.ht-user-dot {
+  padding: 0;
+  margin: 0;
+  float: left;
+  width: 14px;
+  height: 14px;
+  background: $primary-color;
+  line-height: 34px;
+  margin-top: 10px;
+  border-radius: 10px;
+  margin-right: 4px;
+}
+.ht-user-name {
+  padding: 0;
+  margin: 0;
+  float: left;
+}
+.ht-user-dot-disabled {
+  background: #ccc;
+}
+.ht-user-disabled {
+  color: #ddd;
+}