Browse Source

fix: 添加参数时放开对象类型

yanglzh 2 years ago
parent
commit
37079f4d30

+ 2 - 1
src/views/iot/device/product/component/editOption.vue

@@ -23,7 +23,8 @@
 					<el-form-item label="元素类型" prop="type">
 					<el-form-item label="元素类型" prop="type">
 						<el-select v-model="elementType.type" placeholder="请选择元素类型" @change="seletChanges">
 						<el-select v-model="elementType.type" placeholder="请选择元素类型" @change="seletChanges">
 							<el-option-group v-for="group in typeData" :key="group.label" :label="group.label">
 							<el-option-group v-for="group in typeData" :key="group.label" :label="group.label">
-								<el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" :disabled="['array', 'object', 'enum', 'date'].includes(item.type)" />
+								<el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" :disabled="['array', 'enum'].includes(item.type)" />
+								<!-- <el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" :disabled="['array', 'object', 'enum', 'date'].includes(item.type)" /> -->
 							</el-option-group>
 							</el-option-group>
 						</el-select>
 						</el-select>
 					</el-form-item>
 					</el-form-item>

+ 2 - 1
src/views/iot/device/product/component/typeItem.vue

@@ -56,7 +56,8 @@
           <el-input v-model="item.name" placeholder="属性名称" class="flex1" />
           <el-input v-model="item.name" placeholder="属性名称" class="flex1" />
           <el-select v-model="item.valueType.type" placeholder="请选择元素类型" style="width: 140px;">
           <el-select v-model="item.valueType.type" placeholder="请选择元素类型" style="width: 140px;">
             <el-option-group v-for="group in typeData" :key="group.label" :label="group.label">
             <el-option-group v-for="group in typeData" :key="group.label" :label="group.label">
-              <el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" :disabled="['array', 'object', 'enum', 'date'].includes(item.type)" />
+              <!-- <el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" :disabled="['array', 'object', 'enum', 'date'].includes(item.type)" /> -->
+              <el-option v-for="item in group.options" :key="item.type" :label="item.title" :value="item.type" />
             </el-option-group>
             </el-option-group>
           </el-select>
           </el-select>
           <el-icon @click="addObject" v-if="index == 0">
           <el-icon @click="addObject" v-if="index == 0">