提交

fhKeeper/formulahousekeeper/plugIn/form-design-master/src/components.d.ts

@@ -25,7 +25,6 @@ declare module 'vue' {
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRate: typeof import('element-plus/es')['ElRate']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSelectV2: typeof import('element-plus/es')['ElSelectV2']
     ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSpace: typeof import('element-plus/es')['ElSpace']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']

fhKeeper/formulahousekeeper/plugIn/form-design-master/src/components/personnelSearch.vue

@@ -185,12 +185,11 @@ onMounted(() => {
 </script>
 
 <template>
-  <el-select-v2 v-model="selectedValue" :multiple="multiple" :size="size"
-    :loading="selectLoading" :placeholder="placeholder" :disabled="disabled" :clearable="clearable" filterable collapse-tags :options="personnelArray"
+  <!-- <el-select-v2 v-model="selectedValue" :multiple="multiple" :size="size"
+    :loading="selectLoading" :placeholder="placeholder" :disabled="disabled" :clearable="clearable" filterable collapse-tags :options="(personnelArray || [])"
     :style="`width: ${width}`" :class="`custom-select-v2-reset ${!controlTranslation.visibleFlag ? 'setUpInputReset' : ''}`"
      @change="updateValue"
     @visible-change="visibleChange" :filter-method="filterMethod">
-    <!-- 单选 -->
     <template #prefix v-if="!multiple">
       <div class="selectV2SingleChoiceReset">
         <div v-if="!controlTranslation.visibleFlag" class="selectSingleChoice" :style="`line-height: ${textSize[size].height};font-size:${textSize[size].fontSize}`">
@@ -199,18 +198,12 @@ onMounted(() => {
           </template>
           <template v-else>
             <span style="color: #606266;">
-              <template v-if="userInfo.userNameNeedTranslate == 1">
-                <ww-open-data type="userName" :openid="getSelectedLabel"></ww-open-data>
-              </template>
-              <template v-else>
-                {{ getSelectedLabel }}
-              </template>
+              {{ getSelectedLabel }}
             </span>
           </template>
         </div>
       </div>
     </template>
-    <!-- 多选 -->
     <template #prefix v-if="multiple">
       <div class="selectV2SingleChoiceTwoReset">
         <div class="selectSingleChoice" :style="`line-height: ${textSize[size].height};font-size:${textSize[size].fontSize}`">
@@ -219,30 +212,63 @@ onMounted(() => {
           </template>
           <template v-else>
             <el-tag type="info" :size="size" closable @close="tagClose" style="margin-right: 5px;">
-              <template v-if="userInfo.userNameNeedTranslate == 1">
-                <ww-open-data type="userName" :openid="getSelectedLabel"></ww-open-data>
-              </template>
-              <template v-else>
-                {{ getSelectedLabel }}
-              </template>
+              {{ getSelectedLabel }}
             </el-tag>
             <el-tag type="info" :size="size" v-if="selectedValue.length > 1">+{{ selectedValue.length }}</el-tag>
           </template>
         </div>
       </div>
     </template>
-    <!-- 基础 -->
     <template #default="{ item }">
       <div class="flex items-center">
-        <template v-if="userInfo.userNameNeedTranslate == 1">
-          <ww-open-data type="userName" :openid="item.label"></ww-open-data>
-        </template>
-        <template v-else>
-          {{ item.label }}
-        </template>
+        {{ item.label }}
       </div>
     </template>
-  </el-select-v2>
+  </el-select-v2> -->
+
+  <el-select v-model="selectedValue" :multiple="multiple" :size="size"
+    :loading="selectLoading" :placeholder="placeholder" :disabled="disabled" :clearable="clearable" filterable collapse-tags
+    :style="`width: ${width}`" :class="`custom-select-v2-reset ${!controlTranslation.visibleFlag ? 'setUpInputReset' : ''}`"
+     @change="updateValue"
+    @visible-change="visibleChange" :filter-method="filterMethod">
+    <template #prefix v-if="!multiple">
+      <div class="selectV2SingleChoiceReset">
+        <div v-if="!controlTranslation.visibleFlag" class="selectSingleChoice" :style="`line-height: ${textSize[size].height};font-size:${textSize[size].fontSize}`">
+          <template v-if="getSelectedLabel == placeholder">
+            <span style="color: #A8ABB2">{{ placeholder }}</span> 
+          </template>
+          <template v-else>
+            <span style="color: #606266;">
+              {{ getSelectedLabel }} a
+            </span>
+          </template>
+        </div>
+      </div>
+    </template>
+    <template #prefix v-if="multiple">
+      <div class="selectV2SingleChoiceTwoReset">
+        <div class="selectSingleChoice" :style="`line-height: ${textSize[size].height};font-size:${textSize[size].fontSize}`">
+          <template v-if="getSelectedLabel == placeholder">
+            <span style="color: #A8ABB2">{{ placeholder }}</span> 
+          </template>
+          <template v-else>
+            <el-tag type="info" :size="size" closable @close="tagClose" style="margin-right: 5px;">
+              {{ getSelectedLabel }} a
+            </el-tag>
+            <el-tag type="info" :size="size" v-if="selectedValue.length > 1">+{{ selectedValue.length }}</el-tag>
+          </template>
+        </div>
+      </div>
+    </template>
+    <el-option
+      v-for="item in (personnelArray || [])"
+      :key="item.value"
+      :label="item.label"
+      :value="item.value"
+    >
+      <span style="float: left">{{ item.label }}</span>
+    </el-option>
+  </el-select>
 </template>
 reset
 <style lang="scss">
@@ -250,10 +276,8 @@ reset
   position: relative;
   .selectV2SingleChoiceReset, .selectV2SingleChoiceTwoReset {
     position: absolute;
-    margin-left: 12px;
     display: flex;
     align-items: center;
-    top: 50%;
     transform: translate(0,-50%);
     .selectSingleChoice {
       background: #fff;
@@ -268,10 +292,28 @@ reset
     }
   }
 
+  .selectV2SingleChoiceReset {
+    top: 50%;
+    left: 14px;
+  }
+
   .selectV2SingleChoiceTwoReset {
     position: relative;
     transform: translate(0);
-    margin-left: 6px;
+  }
+
+  .el-input__inner::placeholder {
+    color: transparent !important;
+  }
+
+  .el-select__tags {
+    .el-tag {
+      display: none !important;
+    }
+  }
+
+  .el-select-tags-wrapper {
+    width: 110px !important;
   }
 }