htui-yllkbz 1.2.37 → 1.2.41

package/package.json

@@ -1,54 +1,55 @@
-{
-  "name": "htui-yllkbz",
-  "version": "1.2.37",
-  "typings": "types/index.d.ts",
-  "main": "lib/htui.common.js",
-  "style": "lib/htui.css",
-  "private": false,
-  "files": [
-    "lib/**",
-    "types",
-    "src"
-  ],
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint",
-    "lib": "vue-cli-service build --target lib --name htui --dest lib src/packages/index.ts",
-    "publish": "npm run lib && npm publish",
-    "build-exports": "vue-cli-service build --dest dist/components --target wc-async --name xhsj src/exports/* --inline-vue"
-  },
-  "dependencies": {
-    "axios": "^0.21.0",
-    "core-js": "^3.6.5",
-    "element-ui": "^2.14.1",
-    "htui-yllkbz": "^1.2.35",
-    "mavon-editor": "^2.10.4",
-    "moment": "^2.29.1",
-    "vue": "^2.6.11",
-    "vue-class-component": "^7.2.3",
-    "vue-kst-auth": "^2.1.15",
-    "vue-property-decorator": "^8.4.2",
-    "vue-router": "^3.2.0",
-    "vuex": "^3.4.0"
-  },
-  "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^2.33.0",
-    "@typescript-eslint/parser": "^2.33.0",
-    "@vue/cli-plugin-babel": "^4.5.0",
-    "@vue/cli-plugin-eslint": "^4.5.0",
-    "@vue/cli-plugin-typescript": "^4.5.0",
-    "@vue/cli-service": "^4.5.0",
-    "@vue/eslint-config-prettier": "^6.0.0",
-    "@vue/eslint-config-typescript": "^5.0.2",
-    "compression-webpack-plugin": "^3.0.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-prettier": "^3.1.3",
-    "eslint-plugin-vue": "^6.2.2",
-    "prettier": "^1.19.1",
-    "sass": "^1.26.5",
-    "sass-loader": "^8.0.2",
-    "typescript": "~3.9.3",
-    "vue-template-compiler": "^2.6.11"
-  }
-}
+{
+  "name": "htui-yllkbz",
+  "version": "1.2.41",
+  "typings": "types/index.d.ts",
+  "main": "lib/htui.common.js",
+  "style": "lib/htui.css",
+  "private": false,
+  "files": [
+    "lib/**",
+    "types",
+    "src"
+  ],
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint",
+    "lib": "vue-cli-service build --target lib --name htui --dest lib src/packages/index.ts",
+    "publish": "npm run lib && npm publish",
+    "build-exports": "vue-cli-service build --dest dist/components --target wc-async --name xhsj src/exports/* --inline-vue"
+  },
+  "dependencies": {
+    "axios": "^0.21.0",
+    "core-js": "^3.6.5",
+    "element-ui": "^2.14.1",
+    "html2canvas": "1.0.0-rc.1",
+    "htui-yllkbz": "^1.2.35",
+    "mavon-editor": "^2.10.4",
+    "moment": "^2.29.1",
+    "vue": "^2.6.11",
+    "vue-class-component": "^7.2.3",
+    "vue-kst-auth": "^2.1.15",
+    "vue-property-decorator": "^8.4.2",
+    "vue-router": "^3.2.0",
+    "vuex": "^3.4.0"
+  },
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^2.33.0",
+    "@typescript-eslint/parser": "^2.33.0",
+    "@vue/cli-plugin-babel": "^4.5.0",
+    "@vue/cli-plugin-eslint": "^4.5.0",
+    "@vue/cli-plugin-typescript": "^4.5.0",
+    "@vue/cli-service": "^4.5.0",
+    "@vue/eslint-config-prettier": "^6.0.0",
+    "@vue/eslint-config-typescript": "^5.0.2",
+    "compression-webpack-plugin": "^3.0.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-prettier": "^3.1.3",
+    "eslint-plugin-vue": "^6.2.2",
+    "prettier": "^1.19.1",
+    "sass": "^1.26.5",
+    "sass-loader": "^8.0.2",
+    "typescript": "~3.9.3",
+    "vue-template-compiler": "^2.6.11"
+  }
+}

package/src/packages/HtCountDown/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-21 16:24:07
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-26 11:19:26
+ * @LastEditTime: 2021-12-29 10:11:23
 -->
 <template>
   <div>
@@ -32,6 +32,10 @@ export default class HtCountDown extends Vue {
   @Prop() times!: number;
   /**  是否启动 */
   @Prop() start?: boolean;
+  /**  是否是秒表 */
+  @Prop() stopwatch?: boolean;
+  /**  刷新频率 --默认1000毫秒 */
+  @Prop() frequency?: number;
 
   /** 数据 */
   state: State = {
@@ -39,16 +43,49 @@ export default class HtCountDown extends Vue {
     count: 0,
   };
   timer: any = undefined;
+
   created() {
     /**  如果是传入的秒数 */
+
+    if (!this.stopwatch) {
+      if (this.times) {
+        this.state.count = this.times;
+      }
+      /**  如果传入的是哪一天 */
+      if (this.date) {
+        const sec =
+          (new Date(this.date).getTime() - new Date().getTime()) / 1000;
+        this.state.count = sec > 0 ? sec : 0;
+      }
+    } else {
+      //如果是秒表则启动秒表计时:
+      this.startStopWatch(true);
+    }
+  }
+  /**  秒表 */
+  startStopWatch(reset: boolean) {
+    if (reset) {
+      this.state.count = 0;
+    }
+
+    this.timer = setInterval(() => {
+      this.state.count = parseFloat(
+        (this.state.count + this.getFrequency / 1000).toFixed(5)
+      );
+    }, this.getFrequency);
+  }
+  /**  重置 */
+  reset() {
     if (this.times) {
+      clearInterval(this.timer);
       this.state.count = this.times;
+      this.getTimer();
     }
-    /**  如果传入的是哪一天 */
-    if (this.date) {
-      this.state.count =
-        (new Date(this.date).getTime() - new Date().getTime()) / 1000;
+    if (this.stopwatch) {
+      clearInterval(this.timer);
+      this.startStopWatch(true);
     }
+    //
   }
   /**  时间倒计时开始 */
   getTimer() {
@@ -57,12 +94,16 @@ export default class HtCountDown extends Vue {
       if (this.state.count === 0) {
         clearInterval(this.timer);
       }
-    }, 1000);
+    }, this.getFrequency);
   }
   dateLess() {
     const total: number = this.state.count;
+
+    if (this.stopwatch) {
+      return total;
+    }
     if (!total) {
-      return 0;
+      return "--";
     }
     const day: number = parseInt((total / (24 * 60 * 60)).toString()); //计算整数天数
     const afterDay: number = total - day * 24 * 60 * 60; //取得算出天数后剩余的秒数
@@ -106,18 +147,25 @@ export default class HtCountDown extends Vue {
     if (val !== false) {
       /**  如果传入的是哪一天 */
       if (this.date) {
-        this.state.count =
+        const sec =
           (new Date(this.date).getTime() - new Date().getTime()) / 1000;
+        this.state.count = sec > 0 ? sec : 0;
       }
-      if (!this.date && !this.times) {
+      if (this.stopwatch) {
+        this.startStopWatch(false);
+      } else if (!this.date && !this.times) {
         this.$notify.error("请先传入完成的参数");
         return;
+      } else {
+        this.getTimer();
       }
-      this.getTimer();
     } else {
       clearInterval(this.timer);
     }
   }
+  get getFrequency() {
+    return this.frequency || 1000;
+  }
 }
 </script>
 <style lang='scss' scoped></style>

package/src/packages/HtTable/index.vue

@@ -5,7 +5,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:23:24
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-23 14:58:42
+ * @LastEditTime: 2022-01-04 09:30:09
 -->
 <template>
   <div v-loading="state.loading">
@@ -120,6 +120,13 @@
                   </div>
                   <span v-else>--</span>
                 </template>
+                <!-- 处理部门人员 -->
+                <template v-else-if="item.type==='boolean'">
+                  <el-tag :type="'success'"
+                          v-if="getPropByPath(row,item.key)">是</el-tag>
+                  <el-tag type="danger"
+                          v-else>否</el-tag>
+                </template>
                 <!-- 其他 -->
                 <span v-else>{{getPropByPath(row,item.key)}}</span>
               </slot>
@@ -157,7 +164,6 @@
 </template>
 <script lang='ts'>
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-import { _axios } from "vue-kst-auth";
 import { Column, PageInfoType } from "@/packages/type";
 import PageInfo from "@/packages/PageInfo/index.vue";
 interface State {

package/src/packages/index.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-21 10:08:41
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-26 11:20:23
+ * @LastEditTime: 2022-01-04 09:47:12
  */
 
 // 导入组件
@@ -19,6 +19,7 @@ import HtUpload from './HtUpload/index'
 import HtMd from './HtMd/index'
 import HtCountDown from './HtCountDown/index'
 
+
 // 存储组件列表
 const components = [HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown]
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册

package/src/packages/type.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-25 17:05:17
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-23 11:33:43
+ * @LastEditTime: 2022-01-04 09:36:14
  */
 /** 初始的默认条数 */
 export const defalutPageSize = 10
@@ -68,8 +68,8 @@ export interface Column {
   hide?: boolean;
   /**  时间是否跨行展示 */
   spread?: boolean;
-  /** 通过type展示相应的数据  用户id|部门id|时间格式化*/
-  type?: 'userId' | 'org' | 'time' | 'common',
+  /** 通过type展示相应的数据  用户id|部门id|时间格式化|是否布尔值*/
+  type?: 'userId' | 'org' | 'time' | 'common' | 'booolean',
   /**    只有当type='common'时候有效  数据类型个ca common里面的一样但不包括时间 时间使用time  */
   commonType?: 'userId' | 'departmentId' | 'baseDataId' | 'roleId' | 'baseDataName' | 'baseDataValue',
   showOverflowTooltip?: boolean,

package/src/shims-vue.d.ts

@@ -4,10 +4,15 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-21 14:28:09
+ * @LastEditTime: 2021-12-29 10:23:59
  */
 declare module "*.vue" {
   import Vue from "vue";
   export default Vue;
 }
+declare module "*.js" {
+  const body: any
+
+  export default body;
+}
 declare module "*.png"

package/src/views/About.vue

@@ -4,34 +4,42 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-26 11:14:55
+ * @LastEditTime: 2022-01-04 09:47:44
 -->
 <template>
   <div>
-    <HtCountDown :times="250"
-                 :start="state.start"
-                 date="2022-01-26 19:10:11">
-      <template slot-scope="{timeStr,time}">
-        {{timeStr}}
-        {{time}}
-      </template>
-    </HtCountDown>
+
     <el-button type=""
-               @click="state.start=!state.start"></el-button>
+               @click="test">test</el-button>
+    <!-- <ht-count-down :stopwatch="true"
+                     :frequency="200"
+                     :start="!state.start">
+        <template slot-scope="{timeStr}">
+          {{timeStr}}
+        </template>
+      </ht-count-down>
+      <ht-count-down :stopwatch="true"
+                     :start="!state.start">
+        <template slot-scope="{timeStr}">
+          {{timeStr}}
+        </template>
+      </ht-count-down> -->
+
     <ht-md v-model="state.content"
            :subfield="true"></ht-md>
-    <HtTable :data="state.data"
-             @onchange="test"
-             :height="200"
-             :columns="state.columns">
-      <div slot="sex"
-           slot-scope="{row}">{{row.sex?'男':'女'}}</div>
-      <div slot="age"
-           slot-scope="{row}">
-        <el-tag>{{row.age}}</el-tag>
-      </div>
-      <div slot="header_name">测试名字</div>
-    </HtTable>
+    <div ref="ht-pdf">
+      <HtTable :data="state.data"
+               :height="200"
+               :columns="state.columns">
+        <div slot="sex"
+             slot-scope="{row}">{{row.sex?'男':'女'}}</div>
+        <div slot="age"
+             slot-scope="{row}">
+          <el-tag>{{row.age}}</el-tag>
+        </div>
+        <div slot="header_name">测试名字</div>
+      </HtTable>
+    </div>
     <!-- <el-dropdown>
       <el-select placeholder="请选择">
       </el-select>
@@ -144,10 +152,24 @@ export default class Index extends Vue {
     ],
   };
   /** 生命周期 */
+  created() {
+    //this.rewriteGetComputedStyle();
+  }
   /** 方法 */
   test() {
+    (this.$refs.pdf as any).exportPdf(this.$refs["ht-pdf"]);
     //console.log("ee", e);
   }
+  // rewriteGetComputedStyle() {
+  //   const getComputedStyle = window.getComputedStyle;
+  //   window.getComputedStyle = function (element: any, property) {
+  //     console.log("element", element, typeof element);
+  //     if (element != "localhost:8080") {
+  //       return getComputedStyle(element.host || element, property);
+  //     }
+  //     return "";
+  //   };
+  // }
   save(e: string, f: string) {
     console.log("e,f", e, f);
   }