From 52ffefd06e59cbd56c1a919972866592379cfed2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 21 九月 2023 11:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 71 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index adfb9af..8b5bc4c 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -23,7 +23,8 @@
</el-button-group>
<el-button-group>
<!-- 淇濆瓨-->
- <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-check" plain size="small"
+ <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-check" plain
+ size="small"
type="success" @click.prevent="addsHandler">淇濆瓨
</el-button>
<!-- 棰勮鎺掑簭-->
@@ -67,11 +68,14 @@
</el-button-group>
<!-- 鏄惁寮�鍚紪杈� -->
<el-button-group>
- <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && !editOpenFlag && attrEditVisible == false && attrFlagChiledren==false" icon="el-icon-view" plain
- size="small"
- @click="editOpen">寮�鍚紪杈�
+ <el-button
+ v-if="(!checkStatus|| crudLCStatus=='Editing') && !editOpenFlag && attrEditVisible == false && attrFlagChiledren==false"
+ icon="el-icon-view" plain
+ size="small"
+ @click="editOpen">寮�鍚紪杈�
</el-button>
- <el-select v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" v-model="selectvalue" placeholder="璇烽�夋嫨"
+ <el-select v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" v-model="selectvalue"
+ placeholder="璇烽�夋嫨"
size="small">
<el-option
v-for="item in selectoptions"
@@ -325,17 +329,20 @@
align="center"
>
<template slot-scope="{ row }">
- <el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' ||item.edit == 'refer' )"
- :ref="'input' + row.oid"
- v-show="!AddCellFlag"
- v-model="row[item.prop]"
- @blur="saveRows(row)"
- ></el-input>
- <el-input-number v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
+ <el-input
+ v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' ||item.edit == 'refer' )"
+ v-show="!AddCellFlag"
+ :ref="'input' + row.oid"
+ v-model="row[item.prop]"
+ @blur="saveRows(row)"
+ ></el-input>
+ <el-input-number v-if="editingRows === row && editShows== item.prop && item.edit == 'number'"
+ v-model="row[item.prop]"
:style="{width:(item.width-10)+'px'}"
controls-position="right"
size="small" @blur="saveRows"></el-input-number>
- <el-select v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " slot="prepend" v-model="row[item.prop]" allow-create default-first-option
+ <el-select v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " slot="prepend"
+ v-model="row[item.prop]" allow-create default-first-option
filterable
@blur="selectChangeHandler(item.editConfig,index)">
<el-option
@@ -431,7 +438,7 @@
},
crudArrayFlag: {
handler(newval, oldval) {
- console.log('crudArrayFlag', newval)
+ // console.log('crudArrayFlag', newval)
}
},
crudArray: {
@@ -455,16 +462,6 @@
}
}
},
- // editingRows:{
- // handler(newval,oldval){
- // if(newval){
- // const inputElement = document.querySelector(`#inputRef${newval.oid}`);
- // if (inputElement) {
- // inputElement.focus();
- // };
- // }
- // }
- // },
ProData: {
handler(newval, oldval) {
if (newval) {
@@ -485,7 +482,7 @@
},
editOpenFlag: {
handler(newval, oldval) {
- console.log('editOpenFlag', newval)
+ // console.log('editOpenFlag', newval)
},
deep: true,
immediate: true
@@ -495,7 +492,7 @@
data() {
return {
// 淇濆瓨鍗曞厓鏍肩姸鎬�
- AddCellFlag:false,
+ AddCellFlag: false,
//鍏ㄥ睆缂栬緫楂樺害鐘舵��
editStyleFlag: false,
loading: false,
@@ -1091,12 +1088,12 @@
{
label: "灞炴�ц嫳鏂囧悕绉�",
prop: "id",
- width:100,
+ width: 100,
},
{
label: "灞炴�т腑鏂囧悕绉�",
prop: "name",
- width:100,
+ width: 100,
},
{
label: "闀垮害",
@@ -1802,7 +1799,7 @@
this.editOpenFlag = false;
// 璋冪敤鐖剁粍浠朵慨鏀规寜閽姸鎬�
this.$emit('editCloseChildren')
- this.AddCellFlag=true;
+ this.AddCellFlag = true;
}).catch(() => {
this.$message.warning('淇濆瓨澶辫触锛岃鏌ョ湅鎺у埗鍙拌緭鍑猴紒')
});
@@ -2024,7 +2021,13 @@
},
//鍒嗙被娉ㄥ叆淇濆瓨
injectAddHandle() {
- const { classifyInvokeAttr, classifyInvokeAttrName, classifyInvokeLevel, classifyInvokeEditFlag, classifyNumber } = this.injectOption;
+ const {
+ classifyInvokeAttr,
+ classifyInvokeAttrName,
+ classifyInvokeLevel,
+ classifyInvokeEditFlag,
+ classifyNumber
+ } = this.injectOption;
const data = {
"娉ㄥ叆绫诲瀷": classifyInvokeAttr,
@@ -2112,7 +2115,7 @@
this.editStyleFlag = true;
this.attrEditVisible = true;
this.attrFlag = true;
- this.AddCellFlag=true;
+ this.AddCellFlag = true;
}
},
@@ -2126,7 +2129,7 @@
updataFormlaContent(val) {
if (this.CurrentCell) {
this.$set(this.CurrentCell, 'componentRule', val.replace(/"/g, ''))
- this.componentRuleText= this.CurrentCell.componentRule
+ this.componentRuleText = this.CurrentCell.componentRule
} else {
this.$set(this.attrRow, 'componentRule', val.replace(/"/g, ''))
}
@@ -2143,12 +2146,12 @@
},
// 鎺掑簭 this.AddCellFlag=false;
sortChange(val) {
- console.log(val)
+ // console.log(val)
},
//寮�鍚紪杈�
editOpen() {
this.editOpenFlag = true;
- this.AddCellFlag=false;
+ this.AddCellFlag = false;
},
//瀹氫箟涓�涓叧闂紪杈戠殑鏂规硶渚涘瓙缁勪欢浣跨敤
editClose() {
--
Gitblit v1.9.3