htui-yllkbz 1.3.29 → 1.3.32

package/package.json

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

package/src/App.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2022-05-15 16:04:55
+ * @LastEditTime: 2022-05-17 11:31:05
 -->
 <template>
   <div id="app">
@@ -13,14 +13,16 @@
     <HtSelectBaseData dataTypeId="chengbenzhongxin"
                       v-model="state.value"
                       @change="change"></HtSelectBaseData>
-    <HtSelectBaseData dataTypeId="positions"
-                      :multiple="false"
-                      v-model="state.value"
-                      @change="change"></HtSelectBaseData>
+
     <HtSelectOrg :clearable="true"
+                 :multiple="true"
+                 v-model="state.value"
                  @change="testuser"></HtSelectOrg>
+    <!-- <HtSelectOrg :clearable="true"
+                 v-model="state.value"
+                 @change="testuser"></HtSelectOrg> -->
     -------------
-    <HtShowBaseType value="DeviceSystemType"></HtShowBaseType>
+
     ----------
     <router-view></router-view>
   </div>
@@ -29,7 +31,8 @@
 <script lang="ts">
 import { Component, Vue } from "vue-property-decorator";
 import HtSelectBaseData from "@/packages/HtSelectBaseData";
-import HtSelectOrg from "@/packages/HtSelectUser";
+import HtSelectOrg from "@/packages/HtSelectOrg";
+import HtSelectUser from "@/packages/HtSelectUser";
 import HtShowBaseType from "@/packages/HtShowBaseType";
 import { mgr } from "@/plugins/oidc-client";
 @Component({
@@ -41,7 +44,7 @@ import { mgr } from "@/plugins/oidc-client";
 })
 export default class App extends Vue {
   state = {
-    value: undefined,
+    value: ["95bd1bfd-59d8-f88b-2b65-39f97d1da058"],
   };
   /** 生命周期 */
   created() {
@@ -63,8 +66,8 @@ export default class App extends Vue {
   change() {
     // console.log("eeee", e);
   }
-  testuser() {
-    //console.log("eee", e);
+  testuser(e: any) {
+    console.log("eee", e);
   }
   test(e: any) {
     //mgr.removeUser();

package/src/packages/HtBaseData/index.vue

@@ -12,7 +12,7 @@
                    class="component-item"
                    :class="comClass"
                    :style="comStyle || ''"
-                   filterable
+                   :filterable="!state.configJson['departmentId'].multiple"
                    :clearable="state.configJson['departmentId'].clearable"
                    :placeholder="`请选择部门`"
                    :collapse-tags="state.configJson['departmentId'].collapseTags"
@@ -58,7 +58,7 @@
     <!-- 选择人员 -->
     <el-select v-model="state.selectVal['userId']"
                placeholder="请选择人员"
-               filterable
+               :filterable="!state.configJson['userId'].multiple"
                :disabled="!!disabled"
                :style="comStyle || ''"
                class="component-item"
@@ -98,7 +98,7 @@
       <el-cascader v-if="!state.configJson['departmentUser'].panel"
                    :disabled="!!disabled"
                    class="component-item"
-                   filterable
+                   :filterable="!state.configJson['departmentUser'].multiple"
                    :class="comClass"
                    :style="comStyle || ''"
                    :clearable="state.configJson['departmentUser'].clearable"
@@ -150,7 +150,7 @@
       </el-cascader>
       <el-cascader-panel v-else
                          :style="panStyle"
-                         filterable
+                         :filterable="!state.configJson['departmentUser'].multiple"
                          class="component-item"
                          :placeholder="`请选择部门下人员`"
                          v-model="state.selectVal['departmentUser']"
@@ -206,7 +206,7 @@
                    :key="item.id"
                    :style="comStyle || ''"
                    placeholder="请选择严重等级"
-                   filterable
+                   :filterable="!state.configJson[item.code].multiple"
                    class="component-item"
                    @click.native="selectClick($event)"
                    @change="setSelctItem(item.code)">
@@ -235,7 +235,7 @@
                    :disabled="!!disabled"
                    :style="comStyle || ''"
                    placeholder="请选择响应列表"
-                   filterable
+                   :filterable="!state.configJson[item.code].multiple"
                    class="component-item"
                    @click.native="selectClick($event)"
                    @change="setSelctItem(item.code)">
@@ -266,7 +266,7 @@
                        class="component-item"
                        :style="comStyle || ''"
                        :key="item.id"
-                       filterable
+                       :filterable="!state.configJson[item.code].multiple"
                        :clearable="state.configJson[item.code].clearable"
                        @click.native="selectClick($event)"
                        v-model="state.selectVal[item.code]"
@@ -632,6 +632,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) => {
@@ -653,21 +654,25 @@ export default class CommonDatas extends Vue {
   /** 设置下拉数据(级联选择) */
   setSelctData(key: string, e?: string) {
     const value = e || this.state.selectVal[key];
-
+    const multiple = this.state.configJson[key].multiple;
     const ref: any | undefined = (this.$refs[key] as any)[0] || this.$refs[key];
-
-    let checkList = [];
-    if (ref && ref.getCheckedNodes() && ref.getCheckedNodes()[0] !== null) {
+    let checkList: any[] = [];
+    if (multiple) {
       checkList = ref.getCheckedNodes();
-      this.state.selectValData[key] = [checkList[0].data];
-    } else if (
-      ref &&
-      ref.getCheckedNodes() &&
-      ref.getCheckedNodes()[0] === null
-    ) {
-      checkList = [ref.panel.getNodeByValue(value)];
-    }
+    } else {
+      if (ref && ref.getCheckedNodes() && ref.getCheckedNodes()[0] !== null) {
+        //checkList = ref.getCheckedNodes();
 
+        checkList = [ref.panel.getNodeByValue(value)];
+        //this.state.selectValData[key] = [checkList[0].data];
+      } else if (
+        ref &&
+        ref.getCheckedNodes() &&
+        ref.getCheckedNodes()[0] === null
+      ) {
+        checkList = [ref.panel.getNodeByValue(value)];
+      }
+    }
     /** 过滤在多选模式下，Tag时触发删除 */
     const checkNodes = checkList.filter((item: any) => {
       return value?.includes(item.data.id);
@@ -686,7 +691,10 @@ export default class CommonDatas extends Vue {
     if (!e && !this.state.selectVal[key]) {
       this.state.selectValData[key] = [];
     }
-    this.$emit("change", this.state.selectValData);
+    this.$emit(
+      "change",
+      this.state.selectValData[key] ? this.state.selectValData : { [key]: [] }
+    );
   }
   /** 基础数据递归处理 */
   recursion(data: Array<BaseDataDto>) {

package/src/packages/HtSelectBaseData/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 15:47:47
  * @LastEditors: hutao
- * @LastEditTime: 2022-04-24 09:46:42
+ * @LastEditTime: 2022-06-12 09:45:43
 -->
 
 <template>
@@ -66,6 +66,7 @@ export default class HtSelectBaseData extends Vue {
   @Prop({ default: false }) readonly?: boolean;
   /**  级联id */
   @Prop() dataTypeId!: string;
+  @Prop() collapseTags!: boolean;
   /** 展示时候是否隐藏value */
   @Prop() hideCode!: boolean;
   @Prop({ default: false }) clearable!: boolean;
@@ -125,6 +126,7 @@ export default class HtSelectBaseData extends Vue {
       disabled: this.disabled,
       showAllLevels: this.showAllLevels,
       multiple: this.multiple,
+      collapseTags: this.collapseTags,
       code: dataTypeId,
       data: {},
       checkStrictly: this.checkStrictly,

package/src/packages/HtSelectOrg/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-04-13 13:45:57
+ * @LastEditTime: 2022-06-12 09:52:13
 -->
 <template>
   <span v-if="readonly">
@@ -46,6 +46,7 @@ export default class HtSelectOrg extends Vue {
   @Prop({ default: false }) multiple?: boolean;
   @Prop({ default: true }) showAllLevels?: boolean;
   @Prop({ default: true }) checkStrictly?: boolean;
+  @Prop() collapseTags!: boolean;
   /* 是否只读 */
   @Prop({ default: false }) readonly?: boolean;
   @Prop({ default: false }) panel?: boolean;
@@ -86,6 +87,7 @@ export default class HtSelectOrg extends Vue {
         code: "departmentId",
         data: {},
         checkStrictly: this.checkStrictly,
+        collapseTags: this.collapseTags,
         panel: this.panel,
         key: this.value,
         clearable: this.clearable,

package/src/packages/HtSelectUser/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2022-04-13 13:27:23
+ * @LastEditTime: 2022-06-12 09:52:33
 -->
 <template>
 
@@ -49,6 +49,7 @@ export default class HtSelectUser extends Vue {
   /* 是否只读 */
   @Prop({ default: false }) readonly?: boolean;
   @Prop({ default: false }) panel?: boolean;
+  @Prop({ default: false }) collapseTags?: boolean;
   /** 数据 */
   state: State = {
     loading: false,
@@ -85,9 +86,10 @@ export default class HtSelectUser extends Vue {
         multiple: this.multiple,
         code: "departmentUser",
         data: {},
-        checkStrictly: this.checkStrictly,
+        checkStrictly: false,
         panel: this.panel,
         key: this.value,
+        collapseTags: this.collapseTags,
         clearable: this.clearable,
       },
     });