htui-yllkbz 1.3.58 → 1.3.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.3.58",
+  "version": "1.3.59",
   "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-07-10 16:50:19
+ * @LastEditTime: 2022-09-27 14:50:29
 -->
 <template>
   <div id="app">
@@ -12,9 +12,17 @@
     <HtSelectBaseData
       dataTypeId="chengbenzhongxin"
       v-model="state.value"
+      :multiple="false"
+      @change="change"
+    ></HtSelectBaseData>
+    <HtSelectBaseData
+      :byCode="true"
+      :multiple="false"
+      :clearable="true"
+      dataTypeId="SeverityLevel"
+      v-model="state.value"
       @change="change"
     ></HtSelectBaseData>
-
     <HtSelectOrg
       :clearable="true"
       :multiple="false"
@@ -68,7 +76,7 @@ export default class App extends Vue {
     // console.log("eeee", e);
   }
   testuser(e: any) {
-    console.log('eee', e);
+    //console.log('eee', e);
   }
   test(e: any) {
     //mgr.removeUser();

package/src/packages/HtBaseData/index.vue

@@ -247,10 +247,12 @@
           v-model="state.selectVal[item.code]"
           :disabled="!!disabled"
           :key="item.id"
+          :clearable="state.configJson[item.code].clearable"
           :style="comStyle || ''"
           :placeholder="placeholder || '请选择严重等级'"
           :filterable="!state.configJson[item.code].multiple"
           class="component-item"
+          :multiple="state.configJson[item.code].multiple"
           style="width:100%"
           @click.native="selectClick($event)"
           @change="setSelctItem(item.code)"
@@ -285,6 +287,8 @@
           :key="item.id"
           :disabled="!!disabled"
           :style="comStyle || ''"
+          :multiple="state.configJson[item.code].multiple"
+          :clearable="state.configJson[item.code].clearable"
           :placeholder="placeholder || '请选择响应列表'"
           :filterable="!state.configJson[item.code].multiple"
           class="component-item"
@@ -701,6 +705,14 @@ export default class CommonDatas extends Vue {
       default:
         break;
     }
+
+    this.$emit(
+      'change',
+      this.state.selectValData[key] && this.state.selectValData[key].length
+        ? this.state.selectValData
+        : { [key]: [] }
+    );
+    //console.log('this.state.selectValData[key]', this.state.selectValData[key]);
   }
   /** 动态设置显示面板位置 */
 

package/src/packages/HtSelectBaseData/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 15:47:47
  * @LastEditors: hutao
- * @LastEditTime: 2022-09-15 10:04:16
+ * @LastEditTime: 2022-09-27 14:50:08
 -->
 
 <template>
@@ -34,7 +34,8 @@
       <HtShowBaseData
         :hide-code="hideCode"
         :show-all-level="showAllLevels"
-        :base-data-id="value"
+        :base-data-id="!byCode ? value : undefined"
+        :base-data-value="byCode ? value : undefined"
         :base-data-info="true"
         com-style="font-size:12px"
         style="font-size:12px"
@@ -71,6 +72,8 @@ export default class HtSelectBaseData extends Vue {
   @Prop() org?: string;
   @Prop() size?: string;
   @Prop() placeholder?: string;
+  /** 是否通过其他Key来做下拉选择 */
+  @Prop({ default: false }) byCode!: boolean;
   /** 是否禁用 */
   @Prop({ default: false }) disabled?: boolean;
   /* 是否只读 */
@@ -107,13 +110,17 @@ export default class HtSelectBaseData extends Vue {
       if (this.multiple) {
         const arr: string[] = [];
         dep.forEach((item: any) => {
-          arr.push(item.id);
+          arr.push(item[this.byCode ? 'value' : 'id']);
         });
         data = arr;
       } else {
-        data = dep[0].id;
+        data = dep[0][this.byCode ? 'value' : 'id'];
+        if (this.byCode && !isNaN(data)) {
+          data = data.toString();
+        }
       }
     }
+
     this.$emit('input', data);
     this.$emit('change', data, dep);
     // this.$emit("input", id);