From 0d708017d6af8b520766290cd4a3bf8f4c2c046a Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 19 Oct 2022 23:29:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=BC=96=E8=BE=91=E5=92=8C=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=9A=E9=80=89=E6=88=90=E5=91=98=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1018108 --user=陈建星 【项目设置】模版管理-创建字段类型是多选和单选成员后，可选成员列表是空 https://www.tapd.cn/55049933/s/1268961
---
 .../src/business/commons/BatchEdit.vue        |   2 +-
 .../business/commons/CustomFiledComponent.vue | 197 -----------------
 .../menu/template/CustomFieldFormList.vue     |   2 +-
 .../menu/template/CustomFiledComponent.vue    | 201 ------------------
 4 files changed, 2 insertions(+), 400 deletions(-)
 delete mode 100644 api-test/frontend/src/business/commons/CustomFiledComponent.vue
 delete mode 100644 project-management/frontend/src/business/menu/template/CustomFiledComponent.vue

diff --git a/api-test/frontend/src/business/commons/BatchEdit.vue b/api-test/frontend/src/business/commons/BatchEdit.vue
index b338c9e57b..2bff5442a4 100644
--- a/api-test/frontend/src/business/commons/BatchEdit.vue
+++ b/api-test/frontend/src/business/commons/BatchEdit.vue
@@ -71,7 +71,7 @@ import MsDialogFooter from "metersphere-frontend/src/components/MsDialogFooter";
 import {listenGoBack, removeGoBackListener} from "metersphere-frontend/src/utils";
 import EnvPopover from "@/business/automation/scenario/EnvPopover";
 import {ENV_TYPE} from "metersphere-frontend/src/utils/constants";
-import CustomFiledComponent from "@/business/commons/CustomFiledComponent";
+import CustomFiledComponent from "metersphere-frontend/src/components/template/CustomFiledComponent";
 import MsInputTag from "@/business/automation/scenario/MsInputTag";
 import {getScenarioByProjectId} from "../../api/scenario";
 import {getOwnerProjects} from "../../api/project";
diff --git a/api-test/frontend/src/business/commons/CustomFiledComponent.vue b/api-test/frontend/src/business/commons/CustomFiledComponent.vue
deleted file mode 100644
index c691c3fddb..0000000000
--- a/api-test/frontend/src/business/commons/CustomFiledComponent.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <span>
-     <el-select v-if="data.type === 'select' || data.type === 'multipleSelect'"
-                :disabled="disabled"
-                :multiple="data.type === 'multipleSelect'"
-                @change="handleChange"
-                filterable v-model="data[prop]" :placeholder="$t('commons.default')">
-      <el-option
-        v-for="(item,index) in data.options ? data.options : []"
-        :key="index"
-        @change="handleChange"
-        :label="getTranslateOption(item)"
-        :value="item.value">
-      </el-option>
-    </el-select>
-
-    <el-cascader
-      v-else-if="data.type === 'cascadingSelect'"
-      expand-trigger="hover"
-      @change="handleChange"
-      :props="{label: 'text'}"
-      :options="data.options"
-      v-model="data[prop]">
-    </el-cascader>
-
-    <el-input
-      v-else-if="data.type === 'textarea'"
-      type="textarea"
-      @change="handleChange"
-      :rows="2"
-      :disabled="disabled"
-      :placeholder="$t('commons.input_content')"
-      class="custom-with"
-      v-model="data[prop]">
-    </el-input>
-
-    <el-checkbox-group
-      v-else-if="data.type === 'checkbox'"
-      :disabled="disabled"
-      v-model="data[prop]">
-      <el-checkbox v-for="(item, index) in data.options ? data.options : []"
-                   :key="index"
-                   @change="handleChange"
-                   :label="item.value">
-        {{ getTranslateOption(item) }}
-      </el-checkbox>
-    </el-checkbox-group>
-
-    <el-radio
-      v-else-if="data.type === 'radio'"
-      v-model="data[prop]"
-      :disabled="disabled"
-      v-for="(item,index) in data.options ? data.options : []"
-      :key="index"
-      @change="handleChange"
-      :label="item.value">
-      {{ getTranslateOption(item) }}
-    </el-radio>
-
-    <el-input-number
-      v-else-if="data.type === 'int'"
-      v-model="data[prop]"
-      :disabled="disabled"
-      @change="handleChange"/>
-
-    <el-input-number
-      v-else-if="data.type === 'float'"
-      :disabled="disabled"
-      @change="handleChange"
-      v-model="data[prop]" :precision="2" :step="0.1"/>
-
-     <el-date-picker
-       class="custom-with"
-       @change="handleChange"
-       v-else-if="data.type === 'date' || data.type === 'datetime'"
-       :disabled="disabled"
-       v-model="data[prop]"
-       :type="data.type === 'date' ? 'date' : 'datetime'"
-       :placeholder="$t('commons.select_date')">
-    </el-date-picker>
-
-    <el-select v-else-if="data.type === 'member' || data.type === 'multipleMember'"
-               :multiple="data.type === 'multipleMember'"
-               @change="handleChange"
-               :disabled="disabled"
-               filterable v-model="data[prop]" :placeholder="$t('commons.default')">
-       <el-option
-         v-for="(item) in memberOptions"
-         :key="item.id"
-         :label="item.name + (item.email ? ' (' + item.email + ')' : '')"
-         :value="item.id">
-       </el-option>
-    </el-select>
-
-    <ms-input-tag v-else-if="data.type === 'multipleInput'"
-                  @input="handleChange"
-                  :read-only="disabled" :currentScenario="data" :prop="prop"/>
-
-    <ms-mark-down-text v-else-if="data.type === 'richText'"
-                       :prop="prop"
-                       @change="handleChange"
-                       :default-open="defaultOpen"
-                       :data="data" :disabled="disabled"/>
-
-    <el-input class="custom-with"
-              @input="handleChange"
-              :disabled="disabled"
-              v-else v-model="data[prop]" maxlength="450" show-word-limit/>
-
-  </span>
-
-</template>
-
-<script>
-import MsTableColumn from "metersphere-frontend/src/components/table/MsTableColumn";
-import MsInputTag from "@/business/automation/scenario/MsInputTag";
-import MsMarkDownText from "metersphere-frontend/src/components/MsMarkDownText";
-import {getProjectMemberOption} from "@/api/project";
-
-export default {
-  name: "CustomFiledComponent",
-  components: {MsMarkDownText, MsInputTag, MsTableColumn},
-  props: [
-    'data',
-    'prop',
-    'form',
-    'disabled',
-    'defaultOpen',
-    'isTemplateEdit'
-  ],
-  data() {
-    return {
-      memberOptions: [],
-    };
-  },
-  mounted() {
-    if (['select', 'multipleSelect', 'checkbox', 'radio'].indexOf(this.data.type) > -1 && this.data.options) {
-      let values = this.data[this.prop];
-      if (['multipleSelect', 'checkbox'].indexOf(this.data.type) > -1) {
-        if (values && values instanceof Array) {
-          for (let i = values.length - 1; i >= 0; i--) {
-            if (!this.data.options.find(item => item.value === values[i])) {
-              // 删除已删除的选项
-              values.splice(i, 1);
-            }
-          }
-        } else {
-          // 不是数组类型，改成空数组
-          this.data[this.prop] = [];
-        }
-      } else {
-        if (!this.data.options.find(item => item.value === values)) {
-          // 没有选项则清空
-          this.data[this.prop] = '';
-        }
-      }
-    }
-    if (this.data.type === 'member' || this.data.type === 'multipleMember') {
-      getProjectMemberOption((data) => {
-        this.memberOptions = data;
-        if (this.data.name === '责任人' && this.data.system && this.isTemplateEdit) {
-          this.memberOptions.unshift({id: 'CURRENT_USER', name: '创建人', email: ''});
-        }
-      });
-    }
-  },
-  methods: {
-    getTranslateOption(item) {
-      return item.system ? this.$t(item.text) : item.text;
-    },
-    handleChange() {
-      if (this.form) {
-        this.$set(this.form, this.data.name, this.data[this.prop]);
-      }
-      this.$forceUpdate();
-    },
-  }
-};
-</script>
-
-<style scoped>
-.el-select {
-  width: 100%;
-}
-
-.el-date-editor.el-input {
-  width: 100%;
-}
-
-.custom-with :deep( .el-input__inner) {
-  height: 32px;
-}
-
-:deep( .el-input--suffix .el-input__inner) {
-  height: 32px;
-}
-</style>
diff --git a/project-management/frontend/src/business/menu/template/CustomFieldFormList.vue b/project-management/frontend/src/business/menu/template/CustomFieldFormList.vue
index bb40631988..c48007e21b 100644
--- a/project-management/frontend/src/business/menu/template/CustomFieldFormList.vue
+++ b/project-management/frontend/src/business/menu/template/CustomFieldFormList.vue
@@ -75,7 +75,7 @@ import MsTableOperatorButton from "metersphere-frontend/src/components/MsTableOp
 import MsTable from "metersphere-frontend/src/components/table/MsTable";
 import MsTableColumn from "metersphere-frontend/src/components/table/MsTableColumn";
 import FieldCustomDataTableItem from "./FieldCustomDataTableItem";
-import CustomFiledComponent from "./CustomFiledComponent";
+import CustomFiledComponent from "metersphere-frontend/src/components/template/CustomFiledComponent";
 import {SYSTEM_FIELD_NAME_MAP} from "metersphere-frontend/src/utils/table-constants";
 import {getCustomFields} from "../../../api/template";
 
diff --git a/project-management/frontend/src/business/menu/template/CustomFiledComponent.vue b/project-management/frontend/src/business/menu/template/CustomFiledComponent.vue
deleted file mode 100644
index ba61faf475..0000000000
--- a/project-management/frontend/src/business/menu/template/CustomFiledComponent.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-<template>
-  <span>
-     <el-select v-if="data.type === 'select' || data.type === 'multipleSelect'"
-                :disabled="disabled"
-                :multiple="data.type === 'multipleSelect'"
-                @change="handleChange"
-                filterable v-model="data[prop]" :placeholder="$t('commons.default')">
-      <el-option
-        v-for="(item,index) in data.options ? data.options : []"
-        :key="index"
-        @change="handleChange"
-        :label="getTranslateOption(item)"
-        :value="item.value">
-      </el-option>
-    </el-select>
-
-    <el-cascader
-      v-else-if="data.type === 'cascadingSelect'"
-      expand-trigger="hover"
-      @change="handleChange"
-      :props="{label: 'text'}"
-      :options="data.options"
-      v-model="data[prop]">
-    </el-cascader>
-
-    <el-input
-      v-else-if="data.type === 'textarea'"
-      type="textarea"
-      @change="handleChange"
-      :rows="2"
-      :disabled="disabled"
-      :placeholder="$t('commons.input_content')"
-      class="custom-with"
-      v-model="data[prop]">
-    </el-input>
-
-    <el-checkbox-group
-      v-else-if="data.type === 'checkbox'"
-      :disabled="disabled"
-      v-model="data[prop]">
-      <el-checkbox
-        v-for="(item, index) in data.options ? data.options : []"
-        :key="index"
-        @change="handleChange"
-        :label="item.value">
-        {{ getTranslateOption(item) }}
-      </el-checkbox>
-    </el-checkbox-group>
-
-    <el-radio
-      v-else-if="data.type === 'radio'"
-      v-model="data[prop]"
-      :disabled="disabled"
-      v-for="(item,index) in data.options ? data.options : []"
-      :key="index"
-      @change="handleChange"
-      :label="item.value">
-      {{ getTranslateOption(item) }}
-    </el-radio>
-
-    <el-input-number
-      v-else-if="data.type === 'int'"
-      v-model="data[prop]"
-      :disabled="disabled"
-      @change="handleChange"/>
-
-    <el-input-number
-      v-else-if="data.type === 'float'"
-      :disabled="disabled"
-      @change="handleChange"
-      v-model="data[prop]" :precision="2" :step="0.1"/>
-
-     <el-date-picker
-       class="custom-with"
-       @change="handleChange"
-       v-else-if="data.type === 'date' || data.type === 'datetime'"
-       :disabled="disabled"
-       v-model="data[prop]"
-       :type="data.type === 'date' ? 'date' : 'datetime'"
-       :placeholder="$t('commons.select_date')">
-    </el-date-picker>
-
-    <el-select
-      v-else-if="data.type === 'member' || data.type === 'multipleMember'"
-      :multiple="data.type === 'multipleMember'"
-      @change="handleChange"
-      :disabled="disabled"
-      filterable v-model="data[prop]" :placeholder="$t('commons.default')">
-       <el-option
-         v-for="(item) in memberOptions"
-         :key="item.id"
-         :label="item.name + (item.email ? ' (' + item.email + ')' : '')"
-         :value="item.id">
-       </el-option>
-    </el-select>
-
-    <ms-input-tag
-      v-else-if="data.type === 'multipleInput'"
-      @input="handleChange"
-      :read-only="disabled"
-      :currentScenario="data"
-      :prop="prop"/>
-
-    <ms-mark-down-text
-      v-else-if="data.type === 'richText'"
-      :prop="prop"
-      @change="handleChange"
-      :default-open="defaultOpen"
-      :data="data" :disabled="disabled"/>
-
-    <el-input
-      class="custom-with"
-      @input="handleChange"
-      :disabled="disabled"
-      v-else v-model="data[prop]" maxlength="450" show-word-limit/>
-
-  </span>
-
-</template>
-
-<script>
-import MsTableColumn from "metersphere-frontend/src/components/table/MsTableColumn";
-import MsInputTag from "metersphere-frontend/src/components/MsInputTag";
-import MsMarkDownText from "metersphere-frontend/src/components/MsMarkDownText";
-import {getProjectMemberOption} from "metersphere-frontend/src/api/user"
-
-export default {
-  name: "CustomFiledComponent",
-  components: {MsMarkDownText, MsInputTag, MsTableColumn},
-  props: [
-    'data',
-    'prop',
-    'form',
-    'disabled',
-    'defaultOpen',
-    'isTemplateEdit'
-  ],
-  data() {
-    return {
-      memberOptions: [],
-    };
-  },
-  mounted() {
-    if (['select', 'multipleSelect', 'checkbox', 'radio'].indexOf(this.data.type) > -1 && this.data.options) {
-      let values = this.data[this.prop];
-      if (['multipleSelect', 'checkbox'].indexOf(this.data.type) > -1) {
-        if (values && values instanceof Array) {
-          for (let i = values.length - 1; i >= 0; i--) {
-            if (!this.data.options.find(item => item.value === values[i])) {
-              // 删除已删除的选项
-              values.splice(i, 1);
-            }
-          }
-        } else {
-          // 不是数组类型，改成空数组
-          this.data[this.prop] = [];
-        }
-      } else {
-        if (!this.data.options.find(item => item.value === values)) {
-          // 没有选项则清空
-          this.data[this.prop] = '';
-        }
-      }
-    }
-    if (this.data.type === 'member' || this.data.type === 'multipleMember') {
-      getProjectMemberOption((data) => {
-        this.memberOptions = data;
-        if (this.data.name === '责任人' && this.data.system && this.isTemplateEdit) {
-          this.memberOptions.unshift({id: 'CURRENT_USER', name: '创建人', email: ''});
-        }
-      });
-    }
-  },
-  methods: {
-    getTranslateOption(item) {
-      return item.system ? this.$t(item.text) : item.text;
-    },
-    handleChange() {
-      this.$forceUpdate();
-    },
-  }
-};
-</script>
-
-<style scoped>
-.el-select {
-  width: 100%;
-}
-
-.el-date-editor.el-input {
-  width: 100%;
-}
-
-.custom-with :deep( .el-input__inner) {
-  height: 32px;
-}
-
-:deep( .el-input--suffix .el-input__inner) {
-  height: 32px;
-}
-</style>