htui-yllkbz 1.3.46 → 1.3.47

package/lib/htui.common.js

@@ -77410,12 +77410,12 @@ SelectTable.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_SelectTable = (SelectTable);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"484e272b-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/PageInfo/index.vue?vue&type=template&id=abb473c6&
-var PageInfovue_type_template_id_abb473c6_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-pagination',{attrs:{"background":_vm.background,"hide-on-single-page":_vm.hideOnSinglePage,"disabled":!!_vm.disabled,"small":!!_vm.small,"current-page":_vm.state.pageInfo.currentPage,"page-size":_vm.state.pageInfo.maxResultCount,"page-sizes":_vm.pageSizes||[10, 20, 30, 40, 50, 100],"layout":_vm.layout||'total, sizes, prev, pager, next, jumper',"total":_vm.state.pageInfo.totalCount},on:{"current-change":_vm.handleCurrentChange,"size-change":_vm.handelSizeChange}})}
-var PageInfovue_type_template_id_abb473c6_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"484e272b-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/PageInfo/index.vue?vue&type=template&id=67c7b902&
+var PageInfovue_type_template_id_67c7b902_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-pagination',{attrs:{"background":_vm.background,"hide-on-single-page":_vm.hideOnSinglePage,"disabled":!!_vm.disabled,"small":!!_vm.small,"current-page":_vm.state.pageInfo.currentPage,"page-size":_vm.state.pageInfo.maxResultCount,"page-sizes":_vm.pageSizes || [10, 20, 30, 40, 50, 100],"layout":_vm.layout || 'total, sizes, prev, pager, next, jumper',"total":_vm.state.pageInfo.totalCount},on:{"current-change":_vm.handleCurrentChange,"size-change":_vm.handelSizeChange}})}
+var PageInfovue_type_template_id_67c7b902_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/packages/PageInfo/index.vue?vue&type=template&id=abb473c6&
+// CONCATENATED MODULE: ./src/packages/PageInfo/index.vue?vue&type=template&id=67c7b902&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
 var es_number_constructor = __webpack_require__("a9e3");
@@ -77478,7 +77478,7 @@ var PageInfovue_type_script_lang_ts_HtPagination = /*#__PURE__*/function (_Vue)
           maxResultCount = _this$state$pageInfo$ === void 0 ? 0 : _this$state$pageInfo$,
           currentPage = _this$state$pageInfo.currentPage;
       this.state.pageInfo.skipCount = (currentPage - 1) * maxResultCount;
-      this.$emit("onchange", this.state.pageInfo);
+      this.$emit('onchange', this.state.pageInfo);
     }
     /** 更新每页条数 */
 
@@ -77527,10 +77527,10 @@ __decorate([Prop()], PageInfovue_type_script_lang_ts_HtPagination.prototype, "pa
 
 __decorate([Prop()], PageInfovue_type_script_lang_ts_HtPagination.prototype, "layout", void 0);
 
-__decorate([Watch("pageInfo")], PageInfovue_type_script_lang_ts_HtPagination.prototype, "setpageInfo", null);
+__decorate([Watch('pageInfo')], PageInfovue_type_script_lang_ts_HtPagination.prototype, "setpageInfo", null);
 
 PageInfovue_type_script_lang_ts_HtPagination = __decorate([vue_class_component_esm({
-  name: "HtPagination"
+  name: 'HtPagination'
 })], PageInfovue_type_script_lang_ts_HtPagination);
 /* harmony default export */ var PageInfovue_type_script_lang_ts_ = (PageInfovue_type_script_lang_ts_HtPagination);
 // CONCATENATED MODULE: ./src/packages/PageInfo/index.vue?vue&type=script&lang=ts&
@@ -77545,8 +77545,8 @@ PageInfovue_type_script_lang_ts_HtPagination = __decorate([vue_class_component_e
 
 var PageInfo_component = normalizeComponent(
   packages_PageInfovue_type_script_lang_ts_,
-  PageInfovue_type_template_id_abb473c6_render,
-  PageInfovue_type_template_id_abb473c6_staticRenderFns,
+  PageInfovue_type_template_id_67c7b902_render,
+  PageInfovue_type_template_id_67c7b902_staticRenderFns,
   false,
   null,
   null,

package/lib/htui.umd.js

@@ -77419,12 +77419,12 @@ SelectTable.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_SelectTable = (SelectTable);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"484e272b-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/PageInfo/index.vue?vue&type=template&id=abb473c6&
-var PageInfovue_type_template_id_abb473c6_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-pagination',{attrs:{"background":_vm.background,"hide-on-single-page":_vm.hideOnSinglePage,"disabled":!!_vm.disabled,"small":!!_vm.small,"current-page":_vm.state.pageInfo.currentPage,"page-size":_vm.state.pageInfo.maxResultCount,"page-sizes":_vm.pageSizes||[10, 20, 30, 40, 50, 100],"layout":_vm.layout||'total, sizes, prev, pager, next, jumper',"total":_vm.state.pageInfo.totalCount},on:{"current-change":_vm.handleCurrentChange,"size-change":_vm.handelSizeChange}})}
-var PageInfovue_type_template_id_abb473c6_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"484e272b-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/PageInfo/index.vue?vue&type=template&id=67c7b902&
+var PageInfovue_type_template_id_67c7b902_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-pagination',{attrs:{"background":_vm.background,"hide-on-single-page":_vm.hideOnSinglePage,"disabled":!!_vm.disabled,"small":!!_vm.small,"current-page":_vm.state.pageInfo.currentPage,"page-size":_vm.state.pageInfo.maxResultCount,"page-sizes":_vm.pageSizes || [10, 20, 30, 40, 50, 100],"layout":_vm.layout || 'total, sizes, prev, pager, next, jumper',"total":_vm.state.pageInfo.totalCount},on:{"current-change":_vm.handleCurrentChange,"size-change":_vm.handelSizeChange}})}
+var PageInfovue_type_template_id_67c7b902_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/packages/PageInfo/index.vue?vue&type=template&id=abb473c6&
+// CONCATENATED MODULE: ./src/packages/PageInfo/index.vue?vue&type=template&id=67c7b902&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
 var es_number_constructor = __webpack_require__("a9e3");
@@ -77487,7 +77487,7 @@ var PageInfovue_type_script_lang_ts_HtPagination = /*#__PURE__*/function (_Vue)
           maxResultCount = _this$state$pageInfo$ === void 0 ? 0 : _this$state$pageInfo$,
           currentPage = _this$state$pageInfo.currentPage;
       this.state.pageInfo.skipCount = (currentPage - 1) * maxResultCount;
-      this.$emit("onchange", this.state.pageInfo);
+      this.$emit('onchange', this.state.pageInfo);
     }
     /** 更新每页条数 */
 
@@ -77536,10 +77536,10 @@ __decorate([Prop()], PageInfovue_type_script_lang_ts_HtPagination.prototype, "pa
 
 __decorate([Prop()], PageInfovue_type_script_lang_ts_HtPagination.prototype, "layout", void 0);
 
-__decorate([Watch("pageInfo")], PageInfovue_type_script_lang_ts_HtPagination.prototype, "setpageInfo", null);
+__decorate([Watch('pageInfo')], PageInfovue_type_script_lang_ts_HtPagination.prototype, "setpageInfo", null);
 
 PageInfovue_type_script_lang_ts_HtPagination = __decorate([vue_class_component_esm({
-  name: "HtPagination"
+  name: 'HtPagination'
 })], PageInfovue_type_script_lang_ts_HtPagination);
 /* harmony default export */ var PageInfovue_type_script_lang_ts_ = (PageInfovue_type_script_lang_ts_HtPagination);
 // CONCATENATED MODULE: ./src/packages/PageInfo/index.vue?vue&type=script&lang=ts&
@@ -77554,8 +77554,8 @@ PageInfovue_type_script_lang_ts_HtPagination = __decorate([vue_class_component_e
 
 var PageInfo_component = normalizeComponent(
   packages_PageInfovue_type_script_lang_ts_,
-  PageInfovue_type_template_id_abb473c6_render,
-  PageInfovue_type_template_id_abb473c6_staticRenderFns,
+  PageInfovue_type_template_id_67c7b902_render,
+  PageInfovue_type_template_id_67c7b902_staticRenderFns,
   false,
   null,
   null,

package/package.json

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

package/src/packages/PageInfo/index.vue

@@ -4,48 +4,36 @@
  * @Author: hutao
  * @Date: 2021-12-08 11:30:56
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-09 18:04:54
--->
-
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: hutao
- * @Date: 2021-11-22 10:00:05
- * @LastEditors: hutao
- * @LastEditTime: 2021-11-22 18:07:40
+ * @LastEditTime: 2022-08-22 14:28:25
 -->
 <template>
-  <el-pagination @current-change="handleCurrentChange"
-                 :background="background"
-                 @size-change="handelSizeChange"
-                 :hide-on-single-page="hideOnSinglePage"
-                 :disabled="!!disabled"
-                 :small="!!small"
-                 :current-page="state.pageInfo.currentPage"
-                 :page-size="state.pageInfo.maxResultCount"
-                 :page-sizes="pageSizes||[10, 20, 30, 40, 50, 100]"
-                 :layout="layout||'total, sizes, prev, pager, next, jumper'"
-                 :total="state.pageInfo.totalCount">
+  <el-pagination
+    @current-change="handleCurrentChange"
+    :background="background"
+    @size-change="handelSizeChange"
+    :hide-on-single-page="hideOnSinglePage"
+    :disabled="!!disabled"
+    :small="!!small"
+    :current-page="state.pageInfo.currentPage"
+    :page-size="state.pageInfo.maxResultCount"
+    :page-sizes="pageSizes || [10, 20, 30, 40, 50, 100]"
+    :layout="layout || 'total, sizes, prev, pager, next, jumper'"
+    :total="state.pageInfo.totalCount"
+  >
   </el-pagination>
 </template>
-<script lang='ts'>
-import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-import { PageInfoType } from "../type";
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+import { PageInfoType, PageType } from '../type';
 interface State {
   /** 数据状态 */
   loading: boolean;
   /** 分页信息 */
-  pageInfo: {
-    currentPage: number;
-    maxResultCount: number;
-    skipCount: number;
-    totalCount: number;
-  };
+  pageInfo: PageType;
 }
 
 @Component({
-  name: "HtPagination",
+  name: 'HtPagination',
 })
 export default class HtPagination extends Vue {
   /**  通用样式 */
@@ -91,7 +79,7 @@ export default class HtPagination extends Vue {
     this.state.pageInfo.currentPage = val || 1;
     const { maxResultCount = 0, currentPage } = this.state.pageInfo;
     this.state.pageInfo.skipCount = (currentPage - 1) * maxResultCount;
-    this.$emit("onchange", this.state.pageInfo);
+    this.$emit('onchange', this.state.pageInfo);
   }
   /** 更新每页条数 */
   handelSizeChange(val: number) {
@@ -100,7 +88,7 @@ export default class HtPagination extends Vue {
     this.handleCurrentChange(1);
   }
   /** 监听 */
-  @Watch("pageInfo")
+  @Watch('pageInfo')
   setpageInfo(val: PageInfoType) {
     const pageInfo: PageInfoType = val;
     this.state.pageInfo = {

package/src/packages/common.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2022-07-18 15:01:02
  * @LastEditors: hutao
- * @LastEditTime: 2022-07-18 15:03:00
+ * @LastEditTime: 2022-08-10 18:34:12
  */
 import moment from "moment";
 
@@ -67,4 +67,26 @@ export const dateLess = (fromDate: string, toDate: string) => {
     return "-"
   }
 
+}
+/** 根据id获取基础信息中名称
+ * @parmas id 基础数据id
+ * @parmas showobj 是否返回单个对象 否则返回name
+ */
+export function getCommDataName(id?: string, showobj = false) {
+  if (!id) {
+    return undefined
+  }
+  /** 基础数据 */
+  const commonDatas = window.localStorage.getItem("commonDatas") || "";
+  if (commonDatas) {
+    const baseData = JSON.parse(commonDatas).baseData.items;
+    const data = baseData.find((item: any) => item.id === id)
+    if (showobj) {
+      return data
+    }
+    else {
+      return data.name
+    }
+  }
+  return undefined;
 }

package/src/packages/type.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-25 17:05:17
  * @LastEditors: hutao
- * @LastEditTime: 2022-04-06 17:22:32
+ * @LastEditTime: 2022-08-22 14:28:19
  */
 /** 初始的默认条数 */
 export const defalutPageSize = 10
@@ -91,6 +91,15 @@ export interface PageInfoType {
   skipCount: number;
   totalCount: number;
 }
+/** 分页返回时候的分页信息 */
+export interface PageType {
+
+  currentPage: number;
+  maxResultCount: number;
+  skipCount: number;
+  totalCount: number;
+
+}
 /**  附件相关配置 */
 export interface InFile {
   fileName: string;