Merge remote-tracking branch 'origin/master'

src/components/BsUi/Descriptions/index.vue

@@ -15,7 +15,7 @@
       <a-descriptions v-if="!isEmpty(items)" :bordered="false" v-bind="extraProps">
         <a-descriptions-item v-for="(item, index) in items" :key="index" v-bind="item.extraProps">
           <template #label>
-            <slot v-if="item.labelSlot" :name="item.labelSlot"></slot>
+            <slot v-if="item.labelSlot" :name="item.labelSlot" :label="item.label" :value="item.value"></slot>
 
             <div v-else class="help-config">
               <a-tooltip placement="top" v-if="item?.helpConfig?.enable">
@@ -31,7 +31,7 @@
 
           <template v-if="item.valueSlot">
            <div class="value_slot">
-             <slot :name="item.valueSlot"></slot>
+             <slot :name="item.valueSlot" :label="item.label" :value="item.value"></slot>
            </div>
           </template>
           <template v-if="!item.valueSlot">
@@ -141,7 +141,8 @@
     }
     .value_slot {
       position: absolute;
-      top: -5px;
+      bottom: 0;
+      transform: translateY(100%);
     }
   }
 </style>

src/components/BsUi/DicTag/index.vue

@@ -0,0 +1,18 @@
+<template>
+  <div class="dic-tag">
+    <a-space>
+      <a-tag v-for="(tag, idx) in dicts" :key="idx">{{ tag.valueName }}</a-tag>
+    </a-space>
+  </div>
+</template>
+
+<script setup>
+  const props = defineProps({
+    dicts: {
+      required: true,
+      default: [],
+    },
+  });
+</script>
+
+<style lang="scss" scoped></style>

src/components/BsUi/OrgUserSelector/components/ModalSelector.vue

@@ -8,7 +8,9 @@
     @ok="handleOk"
   >
     <div class="content">
-      <a-input type="text" placeholder="请输入关键字" v-model:value="keyWord" :allow-clear="true" />
+      <a-form-item-rest>
+        <a-input type="text" placeholder="请输入关键字" v-model:value="keyWord" :allow-clear="true" />
+      </a-form-item-rest>
 
       <a-breadcrumb separator=">">
         <a-breadcrumb-item v-for="(item, idx) in breadcrumbPaths" :key="idx">{{ item }}</a-breadcrumb-item>
@@ -194,6 +196,14 @@
     flex-direction: column;
     gap: 10px;
 
+    :deep(.ant-input-status-error) {
+      box-shadow: none !important;
+    }
+    :deep(.ant-input-affix-wrapper) {
+      border: 1px solid #d9d9d9 !important;
+      box-shadow: none !important;
+    }
+
     .content-bottom {
       width: 100%;
       display: flex;

src/components/BsUi/OrgUserSelector/components/OrgTree.vue

@@ -7,7 +7,9 @@
 <template>
   <div class="tree-container">
     <a-row class="smart-margin-bottom10">
-      <a-input v-model:value.trim="keywords" placeholder="请输入部门名称" />
+      <a-form-item-rest>
+        <a-input v-model:value.trim="keywords" placeholder="请输入部门名称" />
+      </a-form-item-rest>
     </a-row>
     <a-tree
       v-if="!_.isEmpty(departmentTreeData)"
@@ -229,6 +231,15 @@
     border-right: 1px solid rgba(#000, .1);
     padding-right: 10px;
 
+    :deep(.ant-input-status-error) {
+      border: 1px solid #d9d9d9 !important;
+      box-shadow: none !important;
+    }
+    :deep(.ant-input-affix-wrapper) {
+      border: 1px solid #d9d9d9 !important;
+      box-shadow: none !important;
+    }
+
     .tree {
       height: 618px;
       margin-top: 10px;

src/components/BsUi/OrgUserSelector/index.vue

@@ -85,6 +85,11 @@ import {SCENE_TYPE, SELECT_MULTIPLE} from '/@/components/BsUi/constant.js';
   const selectChange = (value) => {};
 
   const setOptions = (valObj) => {
+    if(isEmpty(valObj)) {
+      options.value = [];
+      return false;
+    }
+
     if (isArray(valObj)) {
       options.value = valObj.map((v) => ({
         label: v[props.labelKey],

src/components/BsUi/index.js

@@ -11,6 +11,7 @@ import BsDescriptions from "./Descriptions/index.vue"
 import BsContentsWrapper from "./ContentsWrapper/index.vue"
 import BsTabs from "./Tabs/index.vue"
 import BsEllipsisText from "./EllipsisText/index.vue"
+import BsDicTag from "./DicTag/index.vue"
 
 const BsUi = {
   install(app) {
@@ -25,6 +26,7 @@ const BsUi = {
     app.component('BsContentsWrapper', BsContentsWrapper)
     app.component('BsTabs', BsTabs);
     app.component('BsEllipsisText', BsEllipsisText);
+    app.component('BsDicTag', BsDicTag)
   },
 };
 
@@ -47,5 +49,6 @@ export {
   BsDescriptions,
   BsContentsWrapper,
   BsTabs,
-  BsEllipsisText
+  BsEllipsisText,
+  BsDicTag
 };