From 070628b3ebbb94e40b971c15342e706d7bd8769f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 31 十月 2024 16:10:05 +0800
Subject: [PATCH] 调整页面
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue | 553 +++++++++++++++++++++++++++++--------------------------
1 files changed, 293 insertions(+), 260 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
index 60bf00a..1019e11 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
@@ -41,12 +41,12 @@
<el-aside width="30%">
<basic-container>
<div style="height: 85vh; overflow-y: auto">
- <el-descriptions :column="1" border size="medium" title="灞炴�ч」">
+ <el-descriptions :column="1" border size="medium" title="灞炴�ч」" :labelStyle="{width:'120px'}">
<el-descriptions-item>
<template slot="label">
鍚嶇О
</template>
- <div style="width: 330px">
+ <div>
{{ lastItem.id }}
</div>
</el-descriptions-item>
@@ -54,16 +54,16 @@
<template slot="label">
鏍囩
</template>
- <div style="width: 330px">
- {{ lastItem.name }}
+ <div>
+ {{ lastItem.name }}
</div>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
鎻忚堪
</template>
- <div style="width: 330px">
- {{ lastItem.description }}
+ <div>
+ {{ lastItem.description }}
</div>
</el-descriptions-item>
<el-descriptions-item>
@@ -75,17 +75,17 @@
</el-descriptions>
<!-- 鍊煎煙 -->
- <el-descriptions v-if="!isSpecialDataType" :column="1" :title="lastItem.attributeDataType" border
+ <el-descriptions v-if="!isSpecialDataType" :column="1" :title="lastItem.attributeDataType || 'VTString'" border
class="margin-top"
- size="medium">
+ size="medium" :labelStyle="{width:'120px'}">
<el-descriptions-item>
<template slot="label">
鍏佽涓虹┖
</template>
- <div style="width: 330px">
- <el-tag :type="lastItem.nullableFlag ? 'success' : 'danger'">
- {{ lastItem.nullableFlag ? '鏄�' : '鍚�' }}
- </el-tag>
+ <div>
+ <el-tag :type="lastItem.nullableFlag ? 'success' : 'danger'">
+ {{ lastItem.nullableFlag ? '鏄�' : '鍚�' }}
+ </el-tag>
</div>
</el-descriptions-item>
<el-descriptions-item v-if="accuracy">
@@ -98,121 +98,118 @@
<template slot="label">
闀垮害
</template>
- <div style="width: 330px">
- {{ lastItem.attrLength }}
+ <div>
+ {{ lastItem.attrLength }}
</div>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
榛樿鍊�
</template>
- <div style="width: 330px">
- {{ lastItem.defaultValue }}
+ <div>
+ {{ lastItem.defaultValue }}
</div>
</el-descriptions-item>
</el-descriptions>
<!-- VTString -->
<el-descriptions v-if="lastItem.attributeDataType === 'VTString' || !lastItem.attributeDataType"
- :column="1" border class="margin-top" size="medium" title="鍊煎煙">
+ :column="1" border class="margin-top" size="medium" title="鍊煎煙" :labelStyle="{width:'120px'}">
<el-descriptions-item>
<template slot="label">
褰撳墠绫诲瀷
</template>
- <div style="width: 345px">
- {{ lastItem.version ? '閾炬帴绫诲瀷' : '涓氬姟绫诲瀷' }}
+ <div>
+ {{ lastItem.version ? '閾炬帴绫诲瀷' : '涓氬姟绫诲瀷' }}
</div>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
褰撳墠绫诲瀷鍊�
</template>
- <div style="width: 345px">
- {{ lastItem.version ? lastItem.linkTypeName : lastItem.btmTypeId }}
+ <div>
+ {{ lastItem.version ? lastItem.linkTypeName : lastItem.btmTypeId }}
</div>
</el-descriptions-item>
<el-descriptions-item v-if="lastItem.version">
<template slot="label">
褰撳墠鐗堟湰娆�
</template>
- <div style="width: 345px">
- {{ lastItem.version }}
+ <div>
+ {{ lastItem.version }}
</div>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
浣跨敤鏋氫妇
</template>
- <div style="width: 345px">
- <el-tag :type="lastItem.enumId ? 'success' : 'danger'">
- {{ lastItem.enumId ? '鏄�' : '鍚�' }}
- </el-tag>
+ <div>
+ <el-tag :type="lastItem.enumId ? 'success' : 'danger'">
+ {{ lastItem.enumId ? '鏄�' : '鍚�' }}
+ </el-tag>
</div>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
褰撳墠鏋氫妇绫诲瀷
</template>
- <div style="width: 345px">
- {{ lastItem.enumId }}
+ <div>
+ {{ lastItem.enumId }}
</div>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
鍙栧�艰寖鍥�
</template>
- <div style="width: 330px; height: 80px;overflow: auto">
- <el-tag v-for="item in rangeList" plain style="margin: 5px">{{ item }}</el-tag>
+ <div>
+ <el-tag v-for="item in rangeList" plain style="margin: 3px 10px 3px 0">{{ item }}</el-tag>
</div>
</el-descriptions-item>
-
</el-descriptions>
<!-- VTInteger && VTInteger -->
<el-descriptions
v-if="lastItem.attributeDataType === 'VTInteger' || lastItem.attributeDataType === 'VTInteger'"
- :column="1" border class="margin-top" size="medium" title="鍊煎煙">
-
+ :column="1" border class="margin-top" size="medium" title="鍊煎煙" :labelStyle="{width:'120px'}">
<el-descriptions-item>
<template slot="label">
浣跨敤鏋氫妇
</template>
- <div style="width: 330px">
- <el-tag :type="lastItem.enumFlag ? 'success' : 'danger'">
- {{ lastItem.enumFlag ? '鏄�' : '鍚�' }}
- </el-tag>
+ <div>
+ <el-tag :type="lastItem.enumFlag ? 'success' : 'danger'">
+ {{ lastItem.enumFlag ? '鏄�' : '鍚�' }}
+ </el-tag>
</div>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
鏋氫妇绫诲瀷
</template>
- <div style="width: 330px">
- {{ lastItem.enumFlag }}
+ <div>
+ {{ lastItem.enumFlag }}
</div>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
鍙栧�艰寖鍥�
</template>
- <div style="width: 345px; height: 80px;overflow: auto">
- <el-tag v-for="item in rangeList" plain style="margin: 5px">{{ item }}</el-tag>
+ <div>
+ <el-tag v-for="item in rangeList" plain style="margin: 3px 10px 3px 0">{{ item }}</el-tag>
</div>
</el-descriptions-item>
</el-descriptions>
<!-- VTDouble -->
<el-descriptions v-if="lastItem.attributeDataType === 'VTDouble'"
- :column="1" border class="margin-top" size="medium" title="鍊煎煙">
+ :column="1" border class="margin-top" size="medium" title="鍊煎煙" :labelStyle="{width:'120px'}">
<el-descriptions-item>
<template slot="label">
鍙栧�艰寖鍥�
</template>
- <div style="width: 330px; height: 80px;overflow: auto">
- <el-tag v-for="item in rangeList" plain style="margin: 5px">{{ item }}</el-tag>
+ <div>
+ <el-tag v-for="item in rangeList" plain style="margin: 3px 10px 3px 0">{{ item }}</el-tag>
</div>
</el-descriptions-item>
-
</el-descriptions>
<!-- VTDate VTTime VTDateTime VTNote VTFilePath VTClob鍧囦笉鏄剧ず VTBoolean涓嶆樉绀哄�煎煙 鍙樉绀虹被鍨� -->
</div>
@@ -226,112 +223,138 @@
:visible.sync="addVisible"
append-to-body="true"
class="avue-dialog"
- width="65%"
+ width="1200px"
@close="addEscHandler"
>
- <div style="height: 650px">
- <el-form ref="form" :model="form" :rules="rules" label-width="120px" size="small">
- <el-row>
- <div class="addDialog">
- <div>
- <h3>灞炴�ч」</h3>
- <el-col :span="12">
- <el-form-item label="鍚嶇О锛�" prop="id">
- <el-input v-model="form.id"></el-input>
+ <div style="height: 550px;">
+ <el-form ref="form" :model="form" :rules="rules" label-width="120px" size="small" style="max-height: 600px;">
+ <div class="addDialog">
+ <h3 style="border-bottom: 1px solid #eee;margin: -10px 0 20px;line-height: 40px">灞炴�ч」</h3>
+ <el-col :span="8">
+ <el-form-item label="鍚嶇О锛�" prop="id">
+ <el-input v-model="form.id"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鏍囩锛�" prop="name">
+ <el-input v-model="form.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="灞炴�х被鍨嬶細" prop="attributeDataType">
+ <el-select v-model="form.attributeDataType" placeholder="璇烽�夋嫨灞炴�х被鍨�" @change="attributeDataTypeChange">
+ <el-option v-for="item in typeSelectList" :label="item" :value="item"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鎻忚堪锛�" prop="description">
+ <el-input v-model="form.description" :rows="2" type="textarea"></el-input>
+ </el-form-item>
+ </el-col>
+ <!-- VTString -->
+ <div v-if="form.attributeDataType === 'VTString'" style="clear: both">
+ <h3 style="border-bottom: 1px solid #eee;margin: -10px 0 20px;line-height: 40px">{{ form.attributeDataType }}</h3>
+ <el-col :span="8">
+ <el-form-item label="闀垮害锛�" prop="attrLength">
+ <el-input-number v-model="form.attrLength" controls-position="right" :min="0"></el-input-number>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item v-if="form.enumSwitch" label="榛樿鍊硷細" prop="defaultValue">
+ <el-select v-model="form.defaultValue">
+ <el-option v-for="(item,index) in rangeOptionValue" :key="index" :label="item"
+ :value="item"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item v-else label="榛樿鍊硷細" prop="defaultValue">
+ <el-input v-model="form.defaultValue"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鍏佽涓虹┖锛�" prop="nullableFlag">
+ <el-switch v-model="form.nullableFlag"></el-switch>
+ </el-form-item>
+ </el-col>
+ <h3 style="border-bottom: 1px solid #eee;margin: -10px 0 20px;line-height: 40px;clear: both">鍊煎煙</h3>
+ <el-col :span="8">
+ <el-form-item label="褰撳墠鍊煎煙绫诲瀷锛�" prop="attributeSelectType">
+ <el-select v-model="form.attributeSelectType" placeholder="璇烽�夋嫨灞炴�х被鍨�"
+ @change="attributeSelectTypeChange">
+ <el-option label="涓氬姟绫诲瀷" value="business"></el-option>
+ <el-option label="閾炬帴绫诲瀷" value="link"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="閫夋嫨鍙傜収绫诲瀷锛�" prop="referValue">
+ <el-input v-model="form.referValue" @focus="referFormFocusHandler" :clearable="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item v-if="form.attributeSelectType === 'link'" label="鐗堟湰娆★細" prop="version">
+ <el-select v-model="form.version" placeholder="璇烽�夋嫨鐗堟湰娆�">
+ <el-option :value="1" label="褰撳墠鐗堟湰娆�"></el-option>
+ <el-option :value="3" label="鏈�鏂扮増鏈"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <div v-if="!form.referValue" style="clear: both">
+ <el-col :span="8">
+ <el-form-item label="浣跨敤鏋氫妇锛�" prop="enumSwitch">
+ <el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="鏍囩锛�" prop="name">
- <el-input v-model="form.name"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="灞炴�х被鍨嬶細" prop="attributeDataType">
- <el-select v-model="form.attributeDataType" placeholder="璇烽�夋嫨灞炴�х被鍨�" @change="attributeDataTypeChange">
- <el-option v-for="item in typeSelectList" :label="item" :value="item"></el-option>
+ <el-col :span="8">
+ <el-form-item :label="form.enumSwitch ? '鏋氫妇閫夋嫨锛�' : '娣诲姞鍊煎煙锛�'" prop="enumSwitch">
+ <el-select v-if="form.enumSwitch" v-model="form.enumId" placeholder="璇烽�夋嫨鏋氫妇绫诲瀷" @change="enumSelectChange">
+ <el-option v-for="(item,index) in attributeDataTypePickList" :key="index" :label="item.key"
+ :value="item.key"></el-option>
</el-select>
+ <el-input v-if="!form.enumSwitch" v-model="form.enumAddValue"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="鎻忚堪锛�" prop="description">
- <el-input v-model="form.description" :rows="2" type="textarea"></el-input>
+ <el-col :span="8">
+ <el-form-item v-if="!form.enumSwitch" label-width="10px" labeldd="杩愮畻绗︼細">
+ <div>
+ <el-button size="mini" @click="enumAddHandler"> = </el-button>
+ </div>
</el-form-item>
</el-col>
-
+ <el-col :span="24" v-if="form.rangeValue.length>0">
+ <el-form-item :label="form.enumSwitch ? '褰撳墠鏋氫妇鍊硷細' : '褰撳墠鍊煎煙锛�'" prop="rangeValue">
+ <el-tag :key="item" v-for="item in rangeValueList" plain :closable="!form.enumSwitch" type="success" @close="handleRangeValueDel(item)" style="margin: 0 10px 5px 0">{{ item }}</el-tag>
+ <el-input v-model="form.rangeValue" :readonly="form.enumSwitch" type="textarea" :rows="2" style="width: 0;height:0;overflow: hidden"></el-input>
+ </el-form-item>
+ </el-col>
</div>
- <div v-if="!hideType" class="addDialogBottom">
- <div class="left">
- <h3>{{ form.attributeDataType }}</h3>
-
- <el-form-item
- v-if="form.attributeDataType !== 'VTInteger' && form.attributeDataType !== 'VTLong'
- && form.attributeDataType !== 'VTDouble' && form.attributeDataType !== 'VTBoolean'"
- label="闀垮害锛�" prop="attrLength">
- <el-input v-model="form.attrLength"></el-input>
- </el-form-item>
-
- <el-form-item v-if="form.attributeDataType === 'VTDouble'" label="绮惧害锛�" prop="precisionLength">
- <el-input v-model="form.precisionLength"></el-input>
- </el-form-item>
-
- <el-form-item v-if="form.attributeDataType === 'VTDouble'" label="闀垮害锛�" prop="scaleLength">
- <el-input v-model="form.scaleLength"></el-input>
- </el-form-item>
-
-
- <el-form-item v-if="form.attributeDataType !== 'VTBoolean' && !form.enumSwitch" label="榛樿鍊硷細"
- prop="defaultValue">
- <el-input v-model="form.defaultValue"></el-input>
- </el-form-item>
-
- <el-form-item v-if="form.attributeDataType === 'VTBoolean'" label="榛樿鍊硷細" prop="defaultValue">
- <el-select v-model="form.defaultValue">
- <el-option label="false" value="false"></el-option>
- <el-option label="true" value="true"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item v-if="form.attributeDataType !== 'VTBoolean' && form.enumSwitch" label="榛樿鍊硷細"
- prop="defaultValue">
- <el-select v-model="form.defaultValue">
- <el-option v-for="(item,index) in rangeOptionValue" :key="index" :label="item"
- :value="item"></el-option>
- </el-select>
- </el-form-item>
-
- <el-form-item label="鍏佽涓虹┖锛�" prop="nullableFlag">
- <el-switch v-model="form.nullableFlag"></el-switch>
- </el-form-item>
-
- </div>
- <el-divider direction="vertical"></el-divider>
- <!-- VTString -->
- <div v-if="form.attributeDataType === 'VTString'" class="right">
- <h3>鍊煎煙</h3>
- <el-form-item label="褰撳墠鍊煎煙绫诲瀷锛�" prop="attributeSelectType">
- <el-select v-model="form.attributeSelectType" placeholder="璇烽�夋嫨灞炴�х被鍨�"
- @change="attributeSelectTypeChange">
- <el-option label="涓氬姟绫诲瀷" value="business"></el-option>
- <el-option label="閾炬帴绫诲瀷" value="link"></el-option>
- </el-select>
- </el-form-item>
-
- <el-form-item v-if="form.attributeSelectType === 'link'" label="鐗堟湰娆★細" prop="version">
- <el-select v-model="form.version" placeholder="璇烽�夋嫨鐗堟湰娆�">
- <el-option :value="1" label="褰撳墠鐗堟湰娆�"></el-option>
- <el-option :value="3" label="鏈�鏂扮増鏈"></el-option>
- </el-select>
- </el-form-item>
-
- <el-form-item label="閫夋嫨鍙傜収绫诲瀷锛�" prop="referValue">
- <el-input v-model="form.referValue" @focus="referFormFocusHandler"></el-input>
- </el-form-item>
-
- <span v-if="!form.referValue">
+ </div>
+ <!-- VTInteger VTLong -->
+ <div v-else-if="form.attributeDataType === 'VTInteger' || form.attributeDataType === 'VTLong' " style="clear: both">
+ <h3 style="border-bottom: 1px solid #eee;margin: -10px 0 20px;line-height: 40px">{{ form.attributeDataType }}</h3>
+ <el-col :span="8">
+ <el-form-item v-if="form.enumSwitch" label="榛樿鍊硷細" prop="defaultValue">
+ <el-select v-model="form.defaultValue">
+ <el-option v-for="(item,index) in rangeOptionValue" :key="index" :label="item"
+ :value="item"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item v-else label="榛樿鍊硷細" prop="defaultValue">
+ <el-input-number v-model="form.defaultValue" controls-position="right"></el-input-number>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鍏佽涓虹┖锛�" prop="nullableFlag">
+ <el-switch v-model="form.nullableFlag"></el-switch>
+ </el-form-item>
+ </el-col>
+ <h3 style="border-bottom: 1px solid #eee;margin: -10px 0 20px;line-height: 40px;clear: both">鍊煎煙</h3>
+ <el-col :span="8">
<el-form-item label="浣跨敤鏋氫妇锛�" prop="enumSwitch">
<el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch>
</el-form-item>
-
-
+ </el-col>
+ <el-col :span="8">
<el-form-item :label="form.enumSwitch ? '鏋氫妇閫夋嫨锛�' : '娣诲姞鍊煎煙锛�'" prop="enumSwitch">
<el-select v-if="form.enumSwitch" v-model="form.enumId" placeholder="璇烽�夋嫨鏋氫妇绫诲瀷"
@change="enumSelectChange">
@@ -341,81 +364,99 @@
<el-input v-if="!form.enumSwitch" v-model="form.enumAddValue">
</el-input>
</el-form-item>
- <el-form-item v-if="!form.enumSwitch" label="杩愮畻绗︼細">
+ </el-col>
+ <el-col :span="8">
+ <el-form-item v-if="!form.enumSwitch" label-width="10px" labeldd="杩愮畻绗︼細">
<div>
- <el-button size="mini" @click="enumAddHandler"> = </el-button>
+ <el-button size="mini" @click="operationHandler('>')"> ></el-button>
+ <el-button size="mini" @click="operationHandler('<')"> <</el-button>
+ <el-button size="mini" @click="operationHandler('>=')"> >=</el-button>
+ <el-button size="mini" @click="operationHandler('<=')"> <=</el-button>
+ <el-button size="mini" @click="operationHandler('=')"> =</el-button>
+ <el-button size="mini" @click="operationHandler('!=')"> !=</el-button>
+ <el-button size="mini" @click="operationHandler('()')"> ([])</el-button>
</div>
</el-form-item>
+ </el-col>
+ <el-col :span="24" v-if="form.rangeValue.length>0">
<el-form-item :label="form.enumSwitch ? '褰撳墠鏋氫妇鍊硷細' : '褰撳墠鍊煎煙锛�'" prop="rangeValue">
- <textarea v-model="form.rangeValue" :readonly="form.enumSwitch"
- style="width: 330px; height: 80px; border: 1px solid #DCDFE6; overflow: auto; text-align: left;resize: none;">
- </textarea>
+ <el-tag :key="item" v-for="item in rangeValueList" plain :closable="!form.enumSwitch" type="success" @close="handleRangeValueDel(item)" style="margin: 0 10px 5px 0">{{ item }}</el-tag>
+ <el-input v-model="form.rangeValue" :readonly="form.enumSwitch" type="textarea" :rows="2" style="width: 0;height:0;overflow: hidden"></el-input>
</el-form-item>
- </span>
- </div>
- <!-- VTInteger VTLong -->
- <div v-if="form.attributeDataType === 'VTInteger' || form.attributeDataType === 'VTLong' "
- class="right">
- <h3>鍊煎煙</h3>
-
- <el-form-item label="浣跨敤鏋氫妇锛�" prop="enumSwitch">
- <el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch>
- </el-form-item>
-
-
- <el-form-item :label="form.enumSwitch ? '鏋氫妇閫夋嫨锛�' : '娣诲姞鍊煎煙锛�'" prop="enumSwitch">
- <el-select v-if="form.enumSwitch" v-model="form.enumId" placeholder="璇烽�夋嫨鏋氫妇绫诲瀷"
- @change="enumSelectChange">
- <el-option v-for="(item,index) in attributeDataTypePickList" :key="index" :label="item.key"
- :value="item.key"></el-option>
- </el-select>
- <el-input v-if="!form.enumSwitch" v-model="form.enumAddValue">
- </el-input>
- </el-form-item>
- <el-form-item v-if="!form.enumSwitch" label="杩愮畻绗︼細">
- <div>
- <el-button size="mini" @click="operationHandler('>')"> ></el-button>
- <el-button size="mini" @click="operationHandler('<')"> <</el-button>
- <el-button size="mini" @click="operationHandler('>=')"> >=</el-button>
- <el-button size="mini" @click="operationHandler('<=')"> <=</el-button>
- <el-button size="mini" @click="operationHandler('=')"> =</el-button>
- <el-button size="mini" @click="operationHandler('!=')"> !=</el-button>
- <el-button size="mini" @click="operationHandler('()')"> ([])</el-button>
- </div>
- </el-form-item>
- <el-form-item :label="form.enumSwitch ? '褰撳墠鏋氫妇鍊硷細' : '褰撳墠鍊煎煙锛�'" prop="rangeValue">
- <textarea v-model="form.rangeValue" :readonly="form.enumSwitch"
- style="width: 330px; height: 80px; border: 1px solid #DCDFE6; overflow: auto; text-align: left;resize: none;">
- </textarea>
- </el-form-item>
- </div>
- <!-- VTDouble -->
- <div v-if="form.attributeDataType === 'VTDouble'" class="right">
- <h3>鍊煎煙</h3>
- <el-form-item :label="form.enumSwitch ? '鏋氫妇閫夋嫨锛�' : '娣诲姞鍊煎煙锛�'" prop="enumAddValue">
- <el-input v-model="form.enumAddValue">
- </el-input>
- </el-form-item>
- <el-form-item label="杩愮畻绗︼細">
- <div>
- <el-button size="mini" @click="operationHandler('>')"> ></el-button>
- <el-button size="mini" @click="operationHandler('<')"> <</el-button>
- <el-button size="mini" @click="operationHandler('>=')"> >=</el-button>
- <el-button size="mini" @click="operationHandler('<=')"> <=</el-button>
- <el-button size="mini" @click="operationHandler('=')"> =</el-button>
- <el-button size="mini" @click="operationHandler('!=')"> !=</el-button>
- <el-button size="mini" @click="operationHandler('()')">([])</el-button>
- </div>
- </el-form-item>
- <el-form-item :label="form.enumSwitch ? '褰撳墠鏋氫妇鍊硷細' : '褰撳墠鍊煎煙锛�'" prop="rangeValue">
- <textarea v-model="form.rangeValue"
- style="width: 330px; height: 80px; border: 1px solid #DCDFE6; overflow: auto; text-align: left;resize: none;">
- </textarea>
- </el-form-item>
- </div>
- </div>
+ </el-col>
</div>
- </el-row>
+ <!-- VTDouble -->
+ <div v-else-if="form.attributeDataType === 'VTDouble'" style="clear: both">
+ <h3 style="border-bottom: 1px solid #eee;margin: -10px 0 20px;line-height: 40px">{{ form.attributeDataType }}</h3>
+ <el-col :span="8">
+ <el-form-item label="绮惧害锛�" prop="precisionLength">
+ <el-input-number v-model="form.precisionLength" controls-position="right" :min="0"></el-input-number>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="闀垮害锛�" prop="scaleLength">
+ <el-input-number v-model="form.scaleLength" controls-position="right" :min="0"></el-input-number>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item v-if="form.enumSwitch" label="榛樿鍊硷細" prop="defaultValue">
+ <el-select v-model="form.defaultValue">
+ <el-option v-for="(item,index) in rangeOptionValue" :key="index" :label="item"
+ :value="item"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item v-else label="榛樿鍊硷細" prop="defaultValue">
+ <el-input-number v-model="form.defaultValue" controls-position="right"></el-input-number>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鍏佽涓虹┖锛�" prop="nullableFlag">
+ <el-switch v-model="form.nullableFlag"></el-switch>
+ </el-form-item>
+ </el-col>
+ <h3 style="border-bottom: 1px solid #eee;margin: -10px 0 20px;line-height: 40px;clear: both">鍊煎煙</h3>
+ <el-col :span="8">
+ <el-form-item :label="form.enumSwitch ? '鏋氫妇閫夋嫨锛�' : '娣诲姞鍊煎煙锛�'" prop="enumAddValue">
+ <el-input v-model="form.enumAddValue"> </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="16">
+ <el-form-item label="杩愮畻绗︼細">
+ <div>
+ <el-button size="mini" @click="operationHandler('>')"> ></el-button>
+ <el-button size="mini" @click="operationHandler('<')"> <</el-button>
+ <el-button size="mini" @click="operationHandler('>=')"> >=</el-button>
+ <el-button size="mini" @click="operationHandler('<=')"> <=</el-button>
+ <el-button size="mini" @click="operationHandler('=')"> =</el-button>
+ <el-button size="mini" @click="operationHandler('!=')"> !=</el-button>
+ <el-button size="mini" @click="operationHandler('()')">([])</el-button>
+ </div>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24" v-if="form.rangeValue.length>0">
+ <el-form-item :label="form.enumSwitch ? '褰撳墠鏋氫妇鍊硷細' : '褰撳墠鍊煎煙锛�'" prop="rangeValue">
+ <el-tag :key="item" v-for="item in rangeValueList" plain closable type="success" @close="handleRangeValueDel(item)" style="margin: 0 10px 5px 0">{{ item }}</el-tag>
+ <el-input v-model="form.rangeValue" type="textarea" :rows="2" style="width: 0;height:0;overflow: hidden"></el-input>
+ </el-form-item>
+ </el-col>
+ </div>
+ <div v-else-if="form.attributeDataType === 'VTBoolean'" style="clear: both">
+ <h3 style="border-bottom: 1px solid #eee;margin: -10px 0 20px;line-height: 40px">{{ form.attributeDataType }}</h3>
+ <el-col :span="8">
+ <el-form-item label="榛樿鍊硷細" prop="defaultValue">
+ <el-select v-model="form.defaultValue">
+ <el-option label="false" value="false"></el-option>
+ <el-option label="true" value="true"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鍏佽涓虹┖锛�" prop="nullableFlag">
+ <el-switch v-model="form.nullableFlag"></el-switch>
+ </el-form-item>
+ </el-col>
+ </div>
+ </div>
</el-form>
<!-- 涓氬姟绫诲瀷瀵硅瘽妗� -->
@@ -438,9 +479,9 @@
>
</avue-crud>
<span slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="businessSaveHandler">纭� 瀹�</el-button>
<el-button @click="businessEmpty">娓� 绌�</el-button>
<el-button @click="businessVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="businessSaveHandler">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -471,8 +512,8 @@
</el-dialog>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="addEscHandler">鍙� 娑�</el-button>
<el-button type="primary" @click="addSaveHandler">纭� 瀹�</el-button>
+ <el-button @click="addEscHandler">鍙� 娑�</el-button>
</span>
</el-dialog>
<!--瀵煎叆 -->
@@ -495,7 +536,6 @@
@search-change="checkHandleSearch"
@search-reset="checkHandleReset"
>
-
</avue-crud>
</el-dialog>
</el-container>
@@ -627,6 +667,7 @@
searchMenuSpan: 8,
refreshBtn: false,
selection: false,
+ header:false,
column: [
{
label: '鍚嶇О',
@@ -654,6 +695,8 @@
description: "",
nullableFlag: true,
attrLength: 50,
+ precisionLength:2,//绮惧害
+ scaleLength:20,//闀垮害
enumFlag: false,
enumId: "",
enumSwitch: false,
@@ -665,7 +708,7 @@
referValue: "",
btmTypeId: "",
linkTypeName: "",
- rangeValue: ""
+ rangeValue: "" //褰撳墠鍊煎煙\褰撳墠鏋氫妇鍊�
},
typeSelectList: ['VTString', 'VTInteger', 'VTLong', 'VTDouble', 'VTBoolean', 'VTDate', 'VTTime', 'VTDateTime', 'VTNote', 'VTFilePath', 'VTClob'],
@@ -719,6 +762,12 @@
let parts = value.split('=');
return parts.length > 1 ? parts[1].trim() : value.trim();
});
+ },
+ //琛ㄥ崟绉嶅綋鍓嶅�煎煙List
+ rangeValueList(){
+ if (this.form.rangeValue) {
+ return this.form.rangeValue.split('\n');
+ }
}
},
watch: {},
@@ -872,6 +921,7 @@
})
},
+
// 鏌ョ湅浣跨敤鑼冨洿鏌ヨ
checkHandleSearch(params, done) {
const {source} = params;
@@ -880,14 +930,12 @@
this.checkViewData = this.checkViewDataSearch;
return done();
}
- ;
this.checkViewData = this.checkViewData.filter(item => {
return item.source && item.source.includes(source);
});
done();
-
},
// 鏌ョ湅浣跨敤鑼冨洿閲嶇疆
@@ -915,21 +963,20 @@
this.form.attributeSelectType = 'business'
this.form.referValue = row.btmTypeId;
}
- // console.log(row);
-
this.getEnumMapByTypeHandler(this.form.attributeDataType);
this.addVisible = true;
-
+ this.lastIndex=-1;//闃叉瑙﹀彂琛岀偣鍑讳簨浠跺悗娓呴櫎閫変腑椤�
},
// 灞炴�х被鍨嬩笅鎷夋change
attributeDataTypeChange(val) {
this.form.rangeValue = null;
+ this.form.nullableFlag=true;
this.getEnumMapByTypeHandler(val);
this.form.enumSwitch = false;
if (val === 'VTBoolean') {
this.form.defaultValue = 'false';
- } else {
+ } else{
this.form.defaultValue = '';
}
},
@@ -1072,7 +1119,12 @@
this.form.rangeValue = currentRangeArray.join('\n');
this.form.enumAddValue = "";
},
-
+ //鍒犻櫎鍊煎煙
+ handleRangeValueDel(val) {
+ let currentRangeArray = this.form.rangeValue ? this.form.rangeValue.split('\n').filter(item => item.trim() !== val) : [];
+ this.enumAddListChange =currentRangeArray;
+ this.form.rangeValue = currentRangeArray.join('\n');
+ },
// 鍊煎煙绫诲瀷鍒囨崲
attributeSelectTypeChange() {
this.$forceUpdate(); // 寮哄埗鏇存柊form缁勪欢
@@ -1175,7 +1227,6 @@
this.form.referValue = this.businessRow.name;
this.businessVisible = false;
-
},
// 涓氬姟绫诲瀷娓呯┖
@@ -1206,9 +1257,8 @@
this.linkTypeVisible = false;
},
- // 鏂板瀵硅瘽妗� 鍙栨秷浜嬩欢
+ // 鍏抽棴鏂板瀵硅瘽妗�
addEscHandler() {
- this.$refs.form.resetFields(); // 瀵规暣涓〃鍗曡繘琛岄噸缃紝灏嗘墍鏈夊瓧娈靛�奸噸缃负鍒濆鍊煎苟绉婚櫎鏍￠獙缁撴灉
this.addVisible = false;
const form = {
id: "",
@@ -1217,6 +1267,8 @@
description: "",
nullableFlag: true,
attrLength: 50,
+ precisionLength:2,//绮惧害
+ scaleLength:20,//闀垮害
enumFlag: false,
enumId: "",
enumSwitch: false,
@@ -1224,68 +1276,43 @@
range: "",
attributeSelectType: "business",
version: 1,
- defaultValue: "",
+ defaultValue: "",//榛樿鍊�
referValue: "",
btmTypeId: "",
linkTypeName: "",
rangeValue: ""
};
this.form = form;
+ this.$refs.form.clearValidate(); // 瀵规暣涓〃鍗曡繘琛岄噸缃紝灏嗘墍鏈夊瓧娈靛�奸噸缃负鍒濆鍊煎苟绉婚櫎鏍￠獙缁撴灉
},
// 鏂板淇濆瓨
addSaveHandler() {
- const form = {
- id: "",
- name: "",
- attributeDataType: "VTString",
- description: "",
- nullableFlag: true,
- attrLength: 50,
- enumFlag: false,
- enumId: "",
- enumSwitch: false,
- enumAddValue: "",
- range: "",
- attributeSelectType: "business",
- version: 1,
- defaultValue: "",
- referValue: "",
- btmTypeId: "",
- linkTypeName: "",
- rangeValue: ""
- };
this.$refs.form.validate((valid) => {
if (valid) {
+ this.form.range = this.form.rangeValue ? this.form.rangeValue.replace(/\n/g, ';') : '';
+ if (this.form.attributeSelectType === 'business') {
+ this.form.btmTypeId = this.form.referValue;
+ this.form.linkTypeName="";
+ } else {
+ this.form.linkTypeName = this.form.referValue;
+ this.form.btmTypeId="";
+ }
if (this.dialogTitle === 'add') {
- this.form.range = this.form.rangeValue ? this.form.rangeValue.replace(/\n/g, ';') : '';
- if (this.form.attributeSelectType === 'business') {
- this.form.btmTypeId = this.form.referValue;
- } else {
- this.form.linkTypeName = this.form.referValue;
- }
addAttribute(this.form).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.obj);
this.getTableList();
- this.form = form;
- this.addVisible = false;
+ this.addEscHandler();
}
})
}
if (this.dialogTitle === 'edit') {
- this.form.range = this.form.rangeValue ? this.form.rangeValue.replace(/\n/g, ';') : '';
- if (this.form.attributeSelectType === 'business') {
- this.form.btmTypeId = this.form.referValue;
- } else {
- this.form.linkTypeName = this.form.referValue;
- }
updateAttribute(this.form).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.obj);
this.getTableList();
- this.form = form;
- this.addVisible = false;
+ this.addEscHandler();
}
})
}
@@ -1330,6 +1357,11 @@
</script>
<style lang="scss" scoped>
+::v-deep {
+ .el-input-number--small {
+ width: 100%;
+ }
+}
.margin-top {
margin-top: 25px;
}
@@ -1347,13 +1379,14 @@
}
.addDialogBottom {
+ margin-top: 30px;
width: 100%;
display: flex;
flex-direction: row;
}
.addDialogBottom > .el-divider--vertical {
- width: 2px;
+ width: 1px;
height: 78%;
position: absolute;
top: 50%;
--
Gitblit v1.9.3