htui-yllkbz 1.3.84 → 1.3.86

package/src/packages/HtSelectTimeSlot/index.vue

@@ -0,0 +1,186 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: hutao
+ * @Date: 2022-06-07 10:26:42
+ * @LastEditors: hutao
+ * @LastEditTime: 2023-01-03 17:13:38
+-->
+<template>
+  <div style="display:flex">
+    <span v-if="readonly">{{ state.data.years }}</span>
+
+    <el-input-number
+      v-else
+      :step="1"
+      :style="`width:calc(40px + ${width || 'auto'})`"
+      :readonly="readonly"
+      :disabled="disabled"
+      style="margin-left:90px"
+      v-model="state.data.years"
+      controls-position="right"
+      @change="changeData($event, 'years')"
+      :min="0"
+      :max="9999"
+    ></el-input-number>
+    <span>年</span>
+    <select-month
+      :width="width"
+      :readonly="readonly"
+      :disabled="disabled"
+      v-model="state.data.months"
+      @change="changeData($event, 'months')"
+    ></select-month>
+    <span v-if="!readonly">月</span>
+    <select-days
+      :width="width"
+      :readonly="readonly"
+      :disabled="disabled"
+      v-model="state.data.days"
+      @change="changeData($event, 'days')"
+    ></select-days>
+
+    <span v-if="!readonly">天</span>
+    <select-hours
+      :width="width"
+      :disabled="disabled"
+      :readonly="readonly"
+      v-model="state.data.hours"
+      @change="changeData($event, 'hours')"
+    ></select-hours>
+    <span v-if="!readonly">时</span>
+    <select-min
+      :width="width"
+      :readonly="readonly"
+      :disabled="disabled"
+      v-model="state.data.min"
+      @change="changeData($event, 'min')"
+    ></select-min>
+    <span v-if="!readonly">分</span>
+  </div>
+</template>
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+import SelectDays from '../HtSelectCron/selectDays.vue';
+import SelectHours from '../HtSelectCron/selectHours.vue';
+import SelectMin from '../HtSelectCron/selectMin.vue';
+import SelectMonth from '../HtSelectCron/selectMonth.vue';
+interface State {
+  /** 数据状态 */
+  loading: boolean;
+  data: {
+    months?: string;
+    years?: string;
+    days?: string;
+    hours?: string;
+    min?: string;
+  };
+}
+@Component({
+  name: 'HtSelectTimeSlot',
+  components: {
+    SelectDays,
+    SelectHours,
+    SelectMin,
+    SelectMonth,
+  },
+})
+export default class Index extends Vue {
+  @Prop() value?: string;
+  @Prop() readonly?: boolean;
+  @Prop() disabled?: boolean;
+  @Prop() width?: number | string;
+  /** 数据 */
+  state: State = {
+    loading: false,
+    data: {
+      months: '0',
+      years: '0',
+      days: '0',
+      hours: '0',
+      min: '0',
+    },
+  };
+  /** 数据变化 */
+  changeData(e: string, key: 'years' | 'months' | 'days' | 'hours' | 'min') {
+    if (!/(^[0-9]\d*$)/.test(e)) {
+      this.$notify.error('只能输入非负的整数');
+      return;
+    }
+    this.state.data[key] = e;
+    this.setValue();
+  }
+  setValue() {
+    let data: string | undefined = 'P';
+    const { months, years, days, hours, min } = this.state.data;
+    if (years && years !== '0') {
+      data = data + years + 'Y';
+    }
+    if (months && months !== '0') {
+      data = data + months + 'M';
+    }
+    if (days && days !== '0') {
+      data = data + days + 'D';
+    }
+    if (hours && hours !== '0') {
+      data = data + 'T' + hours + 'H';
+    }
+    if (min && min !== '0') {
+      if (data.includes('T')) {
+        data = data + min + 'M';
+      } else {
+        data = data + 'T' + min + 'M';
+      }
+    }
+    if (data === 'P') {
+      data = undefined;
+    }
+    this.$emit('input', data);
+    this.$emit('change', data);
+  }
+
+  @Watch('value', { immediate: true })
+  getValue(value?: string) {
+    if (value) {
+      const data = value.replace('P', '');
+      let d1 = data.split('T')[0];
+      let d2 = data.split('T')[1];
+      if (d1.includes('Y')) {
+        this.state.data.years = d1.split('Y')[0];
+        d1 = d1.split('Y')[1];
+      }
+      if (d1.includes('M')) {
+        this.state.data.months = d1.split('M')[0];
+        d1 = d1.split('M')[1];
+      }
+      if (d1.includes('D')) {
+        this.state.data.days = d1.split('D')[0];
+        d1 = d1.split('D')[1];
+      }
+      if (d2 && d2.includes('H')) {
+        this.state.data.hours = d2.split('H')[0];
+        d2 = d2.split('H')[1];
+      }
+      if (d2 && d2.includes('M')) {
+        this.state.data.min = d2.split('M')[0];
+        d2 = d2.split('M')[1];
+      }
+
+      //
+    } else {
+      this.state.data = {
+        years: '0',
+        months: '0',
+        days: '0',
+        hours: '0',
+        min: '0',
+      };
+    }
+  }
+  /** 生命周期 */
+  /** 方法 */
+  /** 监听 */
+  /** 计算属性 */
+}
+</script>
+<style lang="scss" scoped></style>

package/src/packages/HtTable/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:23:24
  * @LastEditors: hutao
- * @LastEditTime: 2022-12-05 14:05:22
+ * @LastEditTime: 2023-01-09 11:01:05
 -->
 <template>
   <div v-loading="state.loading" style="background:#fff">
@@ -417,7 +417,7 @@ import HtUploadFiles from '@/packages/HtUploadFiles/index.vue';
 import HtShowBaseData from '@/packages/HtShowBaseData';
 import HtOrgInfo from '@/packages/HtOrgInfo';
 import ElmentUI from 'element-ui';
-Vue.use(ElmentUI, { zIndex: 3000 });
+Vue.use(ElmentUI);
 interface State {
   pageInfo: PageInfoType;
   loading: boolean;

package/src/packages/HtUpload/index.vue

@@ -1,72 +1,82 @@
 <template>
   <div class="files-view">
-    <el-upload action="/files/api/filing/file/upload"
-               :on-success="handleSuccess"
-               :accept="state.accept"
-               :before-upload="handelBeforeLoad"
-               :headers="headers"
-               :file-list="state.fileData.fileList"
-               list-type="picture-card"
-               multiple
-               :disabled="onlyShow"
-               :class="{ 'only-show': onlyShow }">
-      <i slot="default"
-         class="el-icon-plus"></i>
-      <div slot="file"
-           slot-scope="{ file }"
-           :title="file.fileName">
-        <img class="el-upload-list__item-thumbnail"
-             v-if="file.fileType&&file.fileType.includes('image')"
-             :src="`/files/api/filing/file/download/${file.fileToken}`"
-             :alt="file.fileName"
-             fit="fill" />
-        <img class="el-upload-list__item-thumbnail"
-             v-else
-             :src="showIcon(file)"
-             :alt="file.fileName"
-             fit="fill" />
+    <el-upload
+      action="/files/api/filing/file/upload"
+      :on-success="handleSuccess"
+      :accept="state.accept"
+      :before-upload="handelBeforeLoad"
+      :headers="headers"
+      :file-list="state.fileData.fileList"
+      list-type="picture-card"
+      multiple
+      :disabled="onlyShow"
+      :class="{ 'only-show': onlyShow }"
+    >
+      <i slot="default" class="el-icon-plus"></i>
+      <div slot="file" slot-scope="{ file }" :title="file.fileName">
+        <img
+          class="el-upload-list__item-thumbnail"
+          v-if="file.fileType && file.fileType.includes('image')"
+          :src="`/files/api/filing/file/download/${file.fileToken}`"
+          :alt="file.fileName"
+          fit="fill"
+        />
+        <img
+          class="el-upload-list__item-thumbnail"
+          v-else
+          :src="showIcon(file)"
+          :alt="file.fileName"
+          fit="fill"
+        />
 
         <span class="el-upload-list__item-actions">
-          <span class="el-upload-list__item-preview"
-                v-if="file.fileType&&file.fileType.includes('image')"
-                @click="handlePictureCardPreview(file)">
+          <span
+            class="el-upload-list__item-preview"
+            v-if="file.fileType && file.fileType.includes('image')"
+            @click="handlePictureCardPreview(file)"
+          >
             <i class="el-icon-zoom-in"></i>
           </span>
-          <span v-if="!state.disabled"
-                class="el-upload-list__item-delete"
-                @click="handleDownload(file)">
+          <span
+            v-if="!state.disabled"
+            class="el-upload-list__item-delete"
+            @click="handleDownload(file)"
+          >
             <i class="el-icon-download"></i>
           </span>
-          <span v-if="!state.disabled &&!onlyShow"
-                class="el-upload-list__item-delete"
-                @click="handleRemove(file)">
+          <span
+            v-if="!state.disabled && !onlyShow"
+            class="el-upload-list__item-delete"
+            @click="handleRemove(file)"
+          >
             <i class="el-icon-delete"></i>
           </span>
         </span>
       </div>
     </el-upload>
-    <el-dialog :visible.sync="state.dialogVisible"
-               :modal-append-to-body="false"
-               :modal="false"
-               :append-to-body="true">
+    <el-dialog
+      :visible.sync="state.dialogVisible"
+      :modal-append-to-body="false"
+      :modal="false"
+      :append-to-body="true"
+    >
       <article style="height: calc(100vh - 200px); overflow: auto;">
-        <img :src="state.dialogImageUrl"
-             alt="" />
+        <img :src="state.dialogImageUrl" alt="" />
       </article>
     </el-dialog>
   </div>
 </template>
 <script lang="ts">
-import { Vue, Component, Prop, Watch } from "vue-property-decorator";
-import { baseConfig } from "vue-kst-auth";
-import Video from "@/icon/vedio.png";
-import Pdf from "@/icon/pdf.png";
-import Word from "@/icon/word.png";
-import Txt from "@/icon/txt.png";
-import Ppt from "@/icon/ppt.png";
-import Excel from "@/icon/excel.png";
-import OtherPng from "@/icon/other.png";
-import { InFile, UploadType } from "../type";
+import { Vue, Component, Prop, Watch } from 'vue-property-decorator';
+import { baseConfig } from 'vue-kst-auth';
+import Video from '@/icon/vedio.png';
+import Pdf from '@/icon/pdf.png';
+import Word from '@/icon/word.png';
+import Txt from '@/icon/txt.png';
+import Ppt from '@/icon/ppt.png';
+import Excel from '@/icon/excel.png';
+import OtherPng from '@/icon/other.png';
+import { InFile, UploadType } from '../type';
 
 interface State {
   /** 数据状态 */
@@ -96,13 +106,13 @@ export default class HtUpload extends Vue {
   state: State = {
     loading: false,
     accept:
-      ".png, .jpg, .jpeg,.mp4,.pdf,.doc,.docx,.txt,.ppt,.pptx,.xls,.xlsx,.gif",
+      '.png, .jpg, .jpeg,.mp4,.pdf,.doc,.docx,.txt,.ppt,.pptx,.xls,.xlsx,.gif',
     fileData: {
       file: undefined,
       fileList: [],
     },
 
-    dialogImageUrl: "",
+    dialogImageUrl: '',
     dialogVisible: false,
     disabled: false,
   };
@@ -117,21 +127,21 @@ export default class HtUpload extends Vue {
   }
   /** 方法 */
   showIcon(file: InFile, name?: string) {
-    const fileName = file.fileName || "";
+    const fileName = file.fileName || '';
     const fileType = file.fileType;
     let url = OtherPng;
 
-    if (fileName?.lastIndexOf(".docx") > -1) url = Word;
-    if (fileName?.lastIndexOf(".pptx") > -1) url = Ppt;
+    if (fileName?.lastIndexOf('.docx') > -1) url = Word;
+    if (fileName?.lastIndexOf('.pptx') > -1) url = Ppt;
     if (!fileType) {
       return url;
     }
-    if (fileType.includes("video")) url = Video;
-    if (fileType.includes("doc")) url = Word;
-    if (fileType.includes("excel") || fileType.includes("sheet")) url = Excel;
-    if (fileType.includes("pdf")) url = Pdf;
-    if (fileType.includes("text")) url = Txt;
-    if (fileType.includes("ppt")) url = Ppt;
+    if (fileType.includes('video')) url = Video;
+    if (fileType.includes('doc')) url = Word;
+    if (fileType.includes('excel') || fileType.includes('sheet')) url = Excel;
+    if (fileType.includes('pdf')) url = Pdf;
+    if (fileType.includes('text')) url = Txt;
+    if (fileType.includes('ppt')) url = Ppt;
 
     return url;
   }
@@ -156,7 +166,7 @@ export default class HtUpload extends Vue {
         }
       }
     });
-    this.$emit("change", this.state.fileData);
+    this.$emit('change', this.state.fileData);
   }
   handleRemove(file: InFile) {
     const index = this.state.fileData.fileList.findIndex(
@@ -165,7 +175,7 @@ export default class HtUpload extends Vue {
     if (index >= 0) {
       this.state.fileData.file = { ...file };
       this.state.fileData.fileList.splice(index, 1);
-      this.$emit("change", this.state.fileData);
+      this.$emit('change', this.state.fileData);
     }
   }
   handlePictureCardPreview(file: InFile) {
@@ -174,26 +184,26 @@ export default class HtUpload extends Vue {
   }
   /** 上传文件之前的判断 */
   handelBeforeLoad(file: any) {
-    const ff = file.name.lastIndexOf(".");
+    const ff = file.name.lastIndexOf('.');
     const type = file.name.slice(ff + 1);
     const uploadTyps = [
-      "mp4",
-      "avi",
-      "pdf",
-      "doc",
-      "docx",
-      "txt",
-      "ppt",
-      "pptx",
-      "png",
-      "gif",
-      "jpg",
-      "xls",
-      "xlsx",
+      'mp4',
+      'avi',
+      'pdf',
+      'doc',
+      'docx',
+      'txt',
+      'ppt',
+      'pptx',
+      'png',
+      'gif',
+      'jpg',
+      'xls',
+      'xlsx',
     ];
 
     if (!uploadTyps.includes(type)) {
-      this.$notify.warning("上传格式不正确");
+      this.$notify.warning('上传格式不正确');
       return false;
     }
     //  const type=file.name.lastIndex;
@@ -205,7 +215,7 @@ export default class HtUpload extends Vue {
     const downloadHref = `/files/api/filing/file/download/${file.fileToken}`;
 
     /** 创建a标签并为其添加属性 */
-    const downloadLink = document.createElement("a");
+    const downloadLink = document.createElement('a');
     downloadLink.href = downloadHref;
     downloadLink.download = `${file.fileName}`;
     /** 触发点击事件执行下载 */
@@ -214,16 +224,18 @@ export default class HtUpload extends Vue {
     window.URL.revokeObjectURL(downloadHref);
   }
   /** 监听 */
-  @Watch("tokens")
+  @Watch('tokens')
   onToken() {
-    this.state.fileData.fileList = [...this.tokens];
+    if (Array.isArray(this.tokens)) {
+      this.state.fileData.fileList = [...this.tokens];
+    }
   }
   /** 计算属性 */
   /** 获取授权头部信息 */
   get headers() {
     return {
-      _tenant: baseConfig.getCookie("__tenant"),
-      Authorization: "Bearer" + baseConfig.getCookie("Abp.AuthToken"),
+      _tenant: baseConfig.getCookie('__tenant'),
+      Authorization: 'Bearer' + baseConfig.getCookie('Abp.AuthToken'),
     };
   }
 }

package/src/packages/common.ts

@@ -4,9 +4,10 @@
  * @Author: hutao
  * @Date: 2022-07-18 15:01:02
  * @LastEditors: hutao
- * @LastEditTime: 2022-10-13 11:22:09
+ * @LastEditTime: 2023-01-03 14:20:57
  */
 import moment from "moment";
+import { FormValues, TimeModes } from "./type";
 
 /**    生成唯一Id
  * @params e 生成的id位数 默认32
@@ -151,7 +152,69 @@ export function getCommDataItem(type: "users" | "organizationUnit" | "dictionary
       }
   }
 
-  return
+
 
 
 }
+
+
+export const getCronExpressionByPartition = ({
+  minute,
+  month,
+  hour,
+  weekDay,
+  periodUnit,
+  day,
+}: FormValues) => {
+  switch (periodUnit as TimeModes) {
+    case TimeModes.Minute:
+      return `0 */${minute || 0} * * * ?`;
+    case TimeModes.Hour:
+      return `0 ${minute || 0} * * * ?`;
+    case TimeModes.Day:
+      return `0 ${minute || 0} ${hour || 0} * * ?`;
+    case TimeModes.Week:
+      return `0 ${minute || 0} ${hour || 0} ? * ${weekDay || 0}`;
+    case TimeModes.Month:
+      return `0 ${minute || 0} ${hour || 0} ${day || 0} * ?`;
+    case TimeModes.Year:
+      return `0 ${minute || 0} ${hour || 0} ${day || 0} ${month || 0} ?`;
+    default:
+      return '0 */10 * * * ?';
+  }
+};
+
+const computePeriodUnit = (cronExpression: string) => {
+  const partitions = cronExpression.split(' ');
+  const stars = partitions.filter(item => item === '*').length;
+  switch (stars) {
+    case 3:
+      return partitions[1].includes('/') ? TimeModes.Minute : TimeModes.Hour;
+    case 2:
+      return TimeModes.Day;
+    case 1:
+      return partitions[partitions.length - 1] === '?'
+        ? TimeModes.Month
+        : TimeModes.Week;
+    case 0:
+      return TimeModes.Year;
+    default:
+      return TimeModes.Minute;
+  }
+};
+export const getTimeValues = (cronExpression: string) => {
+  const partitions = cronExpression.split(' ');
+  const currentPeriodUnit = computePeriodUnit(cronExpression);
+  let minute = +((partitions[1] || ([] as string[])).includes('/')
+    ? partitions[1].slice(2) // slice(2) to remove */
+    : partitions[1]);
+  // min minute duration is 10
+  if (currentPeriodUnit === 'Minute' && minute < 10) {
+    minute = 10;
+  }
+  const hour = +partitions[2] || 0;
+  const day = +partitions[3] || 1;
+  const month = +partitions[4] || 1;
+  const weekDay = +partitions[5] || 1;
+  return { minute, hour, day, month, weekDay, periodUnit: currentPeriodUnit };
+};

package/src/packages/index.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-21 10:08:41
  * @LastEditors: hutao
- * @LastEditTime: 2022-09-28 11:19:36
+ * @LastEditTime: 2023-01-09 16:45:52
  */
 
 // 导入组件
@@ -27,12 +27,15 @@ import HtOrgInfo from './HtOrgInfo/index'
 import HtBaseData from './HtBaseData/index'
 import HtShowBaseType from './HtShowBaseType'
 import HtDrawer from './HtDrawer'
+import HtSelectCron from './HtSelectCron'
+import HtSelectTimeSlot from './HtSelectTimeSlot'
+import HtMore from './HtMore'
 
 
 
 
 // 存储组件列表
-const components = [HtBaseData, HtDrawer, HtShowBaseType, HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo]
+const components = [HtMore, HtSelectTimeSlot, HtSelectCron, 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,7 +51,7 @@ export default {
   // 导出的对象必须具有 install，才能被 Vue.use() 方法安装
   install,
   // 以下是具体的组件列表
-  HtSelectTable, HtPagination, HtShowBaseType, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles,
-  HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo, HtBaseData, HtDrawer
+  HtSelectTable, HtPagination, HtShowBaseType, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtMore,
+  HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo, HtBaseData, HtDrawer, HtSelectCron, HtSelectTimeSlot
 }
 

package/src/packages/type.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-25 17:05:17
  * @LastEditors: hutao
- * @LastEditTime: 2022-10-08 11:43:12
+ * @LastEditTime: 2023-01-03 14:20:13
  */
 /** 初始的默认条数 */
 export const defalutPageSize = 10
@@ -98,6 +98,26 @@ export interface PageType {
   skipCount: number;
   totalCount: number;
 
+}
+/** cron表达式相关类型 */
+export enum TimeModes {
+  Minute = 'Minute',
+  Hour = 'Hour',
+  Day = 'Day',
+  Week = 'Week',
+  Month = 'Month',
+  Year = 'Year',
+}
+export interface FormValues {
+
+  periodUnit?: TimeModes;
+  month?: number;
+  day?: number;
+  hour?: number;
+  minute?: number;
+  weekDay?: number;
+  cronExpression?: string;
+
 }
 /**  附件相关配置 */
 export interface InFile {