From d95fc722dd4c5544e82c9da6da5b4bb548356cb2 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期一, 26 八月 2024 21:49:48 +0800
Subject: [PATCH] 调整
---
js/myelement.js | 67 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 13 deletions(-)
diff --git a/js/myelement.js b/js/myelement.js
index 45e76e4..a5993df 100644
--- a/js/myelement.js
+++ b/js/myelement.js
@@ -153,6 +153,8 @@
formatter_percent = window.top.formatter_percent;
formatter_password = window.top.formatter_password;
formatter_split = window.top.formatter_split;
+formatter_replace = window.top.formatter_replace;
+formatter_replace_val = window.top.formatter_replace_val;
formatter_prefixorunit = window.top.formatter_prefixorunit;
formatter_earlyWarning = window.top.formatter_earlyWarning;
@@ -1167,9 +1169,10 @@
' </template> '+
' <template v-else-if="tableField.type == \'icon\'"> '+
- ' <i v-if="scope.row[tableField.field] && scope.row[tableField.field] != \'0\' && tableFieldClick[tableField.field] && tableFieldClick[tableField.field].val.onclick" :class="[tableField.icon, \'h_cellclick\']" '+
+ ' <i v-if="scope.row[tableField.field] && scope.row[tableField.field] != \'0\' && tableFieldClick[tableField.field] && tableFieldClick[tableField.field].val.onclick" '+
+ ' :class="[(tableFieldClick[tableField.field] && tableFieldClick[tableField.field].val) ? tableFieldClick[tableField.field].val.icon : \'\', \'h_cellclick\']" :style="{color: (tableFieldClick[tableField.field] && tableFieldClick[tableField.field].val) ? tableFieldClick[tableField.field].val.iconcolor : \'#000\'}"'+
' @click.stop="cellValClick(scope.row, tableField, scope.row[tableField.field], \'valclick\')"></i> '+
- ' <i v-else-if="scope.row[tableField.field] && scope.row[tableField.field] != \'0\'" :class="[tableField.icon, \'h_cellclick\']" ></i> '+
+ ' <i v-else-if="scope.row[tableField.field] && scope.row[tableField.field] != \'0\'" :class="[(tableFieldClick[tableField.field] && tableFieldClick[tableField.field].val) ? tableFieldClick[tableField.field].val.icon : \'\']" :style="{color: (tableFieldClick[tableField.field] && tableFieldClick[tableField.field].val) ? tableFieldClick[tableField.field].val.iconcolor : \'#000\'}"></i> '+
' <i v-else-if="!scope.row[tableField.field] && tableField.nullicon" :class="[tableField.nullicon]" ></i> '+
//' <i v-else></i> '+
@@ -1217,6 +1220,15 @@
//鏃犵偣鍑�
' <el-tag v-else size="small" :type="(tableField.tagtype && tableField.tagtype[scope.row[tableField.field]]) ? tableField.tagtype[scope.row[tableField.field]] : \'\'">{{tableFieldClick[tableField.field].defaultval.val}}</el-tag>'+
' </template> '+
+ ' </template> '+
+ ' <template v-else-if="tableField.type == \'icon\'"> '+
+ ' <i v-if="scope.row[tableField.field] && scope.row[tableField.field] != \'0\' && tableFieldClick[tableField.field] && tableFieldClick[tableField.field].val.onclick" '+
+ ' :class="[(tableFieldClick[tableField.field] && tableFieldClick[tableField.field].val) ? tableFieldClick[tableField.field].val.icon : \'\']" :style="{color: (tableFieldClick[tableField.field] && tableFieldClick[tableField.field].val) ? tableFieldClick[tableField.field].val.iconcolor : \'#000\', \'font-size\': \'24px\'}"'+
+ ' @click.stop="cellValClick(scope.row, tableField, scope.row[tableField.field], \'valclick\')"></i> '+
+ ' <i v-else-if="scope.row[tableField.field] && scope.row[tableField.field] != \'0\'" :class="[(tableFieldClick[tableField.field] && tableFieldClick[tableField.field].val) ? tableFieldClick[tableField.field].val.icon : \'\']" :style="{color: (tableFieldClick[tableField.field] && tableFieldClick[tableField.field].val) ? tableFieldClick[tableField.field].val.iconcolor : \'#000\', \'font-size\': \'24px\'}"></i> '+
+
+ ' <i v-else-if="!scope.row[tableField.field] && tableField.nullicon" :class="[tableField.nullicon]" ></i> '+
+ //' <i v-else></i> '+
' </template> '+
//濡傛灉娌℃湁tableField.type骞朵笖鏈夊��
' <template v-else-if="scope.row[tableField.field] || scope.row[tableField.field] === 0 || scope.row[tableField.field] === false"> '+
@@ -1973,16 +1985,16 @@
// 鏁版嵁鍔犺浇鏃剁殑杞湀鍦�
'<div v-loading="istableloading" v-if="istableloading" class="h_table_loading"></div> '+
// 琛ㄦ牸宸ュ叿鏍� - 鏍囬銆佸姛鑳界粍銆佸閫�
- '<div v-if="isshowtool && ((tableAttr.istitle && tableAttr.title) || (istablebuttons && tablebuttons.length) || ((isbasicfilterfields && (tableAttr.toolbarobj && tableAttr.toolbarobj.isbasicfilterfields) && tableBasicFilterFields.length) || (isfilterfield && (tableAttr.toolbarobj && tableAttr.toolbarobj.isfilterfield))) || (tableAttr.tag && tableAttr.tag.name)) || ((tableAttr.toolbarobj && ((isbasicfilterfields && tableAttr.toolbarobj.isbasicfilterfields) || (tableAttr.toolbarobj.more_datalist && tableAttr.toolbarobj.more_datalist.length))) || (isshowShoppingcart && (tableAttr.isSelection || isSelection)) || (tableToolButtons && tableToolButtons.length))" class="h_h_table" :ref="\'h_tabletool\' + href"> '+
+ '<div v-if="isshowtool && ((tableAttr.istitle && tableAttr.title) || (istablebuttons && tablebuttons.length) || ((isbasicfilterfields && (tableAttr.toolbarobj && tableAttr.toolbarobj.isbasicfilterfields) && tableBasicFilterFields.length) || (isfilterfield && (tableAttr.toolbarobj && tableAttr.toolbarobj.isfilterfield))) || (tableAttr.tag && tableAttr.tag.name)) || ((tableAttr.toolbarobj && (tableAttr.toolbarobj.more_datalist && tableAttr.toolbarobj.more_datalist.length)) || (isshowShoppingcart && (tableAttr.isSelection || isSelection)) || (tableToolButtons && tableToolButtons.length))" class="h_h_table" :ref="\'h_tabletool\' + href"> '+
// 琛ㄦ牸鏈韩鍔熻兘锛堟爣棰樸�佸瓧娈甸『搴忋�佽〃鍒锋柊銆佽〃鏍囩锛�
'<div v-if="(tableAttr.istitle && tableAttr.title) || (istablebuttons && tablebuttons.length) || ((isbasicfilterfields && (tableAttr.toolbarobj && tableAttr.toolbarobj.isbasicfilterfields) && tableBasicFilterFields.length) || (isfilterfield && (tableAttr.toolbarobj && tableAttr.toolbarobj.isfilterfield))) || (tableAttr.tag && tableAttr.tag.name)" class="h_table_tool_left">'+
// 鏍囬
- '<div v-if="tableAttr.istitle && tableAttr.title" class="h_table_title">'+
+ '<div v-if="tableAttr.istitle && tableAttr.title" class="h_table_title ">'+
'<i class="iconfont icon-fuzhushuxian" style="color: #0270c1;"></i>'+
'<span style="font-size: 14px;">{{tableAttr.title}}</span>'+
'</div> '+
//琛ㄥ瓧娈甸厤缃�
- '<div v-if="istablebuttons && tablebuttons.length" class="h_table_title"> '+
+ '<div v-if="istablebuttons && tablebuttons.length" class="h_table_title "> '+
'<div v-if="isdraggableorder && doTableFields.length > 0" class="h_table_editfield"> '+
'<h-draggable-order-tree :switchfloat="isdraggableorder_switchfloat" :datalist="doTableFields" :selectdatalist="showTableFields" :identificationfield="identificationfield" '+
':labelfield="orderlabelfield" :isselectfield="orderisselect" :isdraggablegroup="isdraggablegroup" icon="el-icon-setting" title="琛ㄦ牸瀛楁璁剧疆" v-on:save-order="saveOrder"> '+
@@ -3060,8 +3072,8 @@
})
// 琛ㄦ牸瀛楁鍒嗙粍锛屾牴鎹畉ableformgroup鍒ゆ柇tablegroupname鏄惁琛ㄦ牸鍗曞厓鏍间腑鐨勮〃鍗曞垎缁�
- // me_tableFields = listTOTableFieldsGroupByType(me_tableFields);
- me_tableFields = listTOTableFieldsGroupByType(me.showTableFields);
+ me_tableFields = listTOTableFieldsGroupByType(me_tableFields);
+ // me_tableFields = listTOTableFieldsGroupByType(me.showTableFields);
}
me_tableFields.map(t=>{
@@ -3546,12 +3558,17 @@
else if(e.formatter == "formatter_password") {
e.formatter_f = function(a,b,c,d) {return formatter_password(a,b,c,d)}
}
-
else if(e.formatter == "formatter_earlyWarning") {
e.formatter_f = function(a,b,c,d) {return formatter_earlyWarning(a,b,c,d)}
}
-
-
+ else if(e.formatter == "formatter_replace") {
+ var format = e.formatpattern;//鏇挎崲鐨勫瓧娈垫牸寮�
+ e.formatter_f = function(a,b,c,d) {return formatter_replace(a,b,c,d, format)}
+ }
+ else if(e.formatter == "formatter_replace_val") {
+ var format = e.formatpattern;//鏇挎崲鐨勫瓧娈垫牸寮忥紝鏈夊�兼墠鏇挎崲
+ e.formatter_f = function(a,b,c,d) {return formatter_replace_val(a,b,c,d, format)}
+ }
}
@@ -5533,9 +5550,9 @@
' :disabled = "typeof (fieldObj.disabled) != \'undefined\' ? fieldObj.disabled : (disabled ? true : false)" '+
' :value="formData[fieldObj.field] && formData[fieldObj.field].length == fieldObj.options.length ? true : false" @change="handleCheckAllChange($event, fieldObj, formData)">鍏ㄩ��</el-checkbox>'+
- '<el-checkbox-group v-model="formData[fieldObj.field]" class="h_form_checkboxgroup" '+
+ '<el-checkbox-group v-model="formData[fieldObj.field]" class="h_form_checkboxgroup aaa" '+
' :disabled = "typeof (fieldObj.disabled) != \'undefined\' ? fieldObj.disabled : (disabled ? true : false)" @change="formchange($event, fieldObj)"> '+
- '<el-checkbox v-for="(o, k) in fieldObj.options" :key="k" :label="o.code"><div :style="{width: fieldObj.valuewidth ? fieldObj.valuewidth : \'100%\'}">{{o.value}}</div></el-checkbox> '+
+ '<el-checkbox v-for="(o, k) in fieldObj.options" :key="\'f_checkboxobj\' + k" :label="o.code"><div :style="{width: fieldObj.valuewidth ? fieldObj.valuewidth : \'100%\'}">{{o.value}}</div></el-checkbox> '+
'</el-checkbox-group> '+
'</div>'+
'<div v-else>'+
@@ -6340,6 +6357,14 @@
var unit = e.suffix;//鍚庣紑鎴栧崟浣�
this.formDataFace[prop] = formatter_prefixorunit(null, null, value, null, prefix, unit);
}
+ else if(e.formatter == "formatter_replace") {
+ var format = e.formatpattern;//鎷兼帴鐨勫瓧娈垫牸寮� format = "#{name}-{name}%"
+ this.formDataFace[prop] = formatter_replace(this.formData, null, value, null, format);
+ }
+ else if(e.formatter == "formatter_replace_val") {
+ var format = e.formatpattern;//鏇挎崲鐨勫瓧娈垫牸寮忥紝鏈夊�兼墠鏇挎崲
+ this.formDataFace[prop] = formatter_replace_val(this.formData, null, value, null, format);
+ }
}
@@ -6444,6 +6469,14 @@
var prefix = e.prefix;//鍓嶇紑
var unit = e.suffix;//鍚庣紑鎴栧崟浣�
this.formDataFace[prop] = formatter_prefixorunit(null, null, value, null, prefix, unit);
+ }
+ else if(e.formatter == "formatter_replace") {
+ var format = e.formatpattern;//鎷兼帴鐨勫瓧娈垫牸寮� format = "#{name}-{name}%"
+ this.formDataFace[prop] = formatter_replace(this.formData, null, value, null, format);
+ }
+ else if(e.formatter == "formatter_replace_val") {
+ var format = e.formatpattern;//鏇挎崲鐨勫瓧娈垫牸寮忥紝鏈夊�兼墠鏇挎崲
+ this.formDataFace[prop] = formatter_replace_val(this.formData, null, value, null, format);
}
}
@@ -7649,6 +7682,14 @@
var unit = e.suffix;//鍚庣紑鎴栧崟浣�
this.formDataFace[prop] = formatter_prefixorunit(null, null, value, null, prefix, unit);
}
+ else if(e.formatter == "formatter_replace") {
+ var format = e.formatpattern;//鏇挎崲鐨勫瓧娈垫牸寮�
+ this.formDataFace[prop] = formatter_replace(this.formData, null, value, null, format);
+ }
+ else if(e.formatter == "formatter_replace_val") {
+ var format = e.formatpattern;//鏇挎崲鐨勫瓧娈垫牸寮忥紝鏈夊�兼墠鏇挎崲
+ this.formDataFace[prop] = formatter_replace_val(this.formData, null, value, null, format);
+ }
}
@@ -7869,7 +7910,7 @@
'<div v-if="formAttr.istitle && formAttr.title" class="h_form_title_name">{{formAttr.title}}</div> '+
'<template v-for="(g, k) in tableFieldsGroup"> '+
- '<div v-if="g.name && g.name !=\' \' " style="margin: 0;"><i class="iconfont icon-fuzhushuxian" style="color: #0270c1;"></i><span class="h_form_group_name">{{g.name}}</span></div> '+
+ '<div v-if="g.name && g.name !=\' \' " class="h_form_group"><i class="iconfont icon-fuzhushuxian" style="color: #0270c1;"></i><span class="h_form_group_name">{{g.name}}</span></div> '+
'<div style="margin: 0; padding-left: 0px">'+
'<h-newform-a '+
//澶栭儴鍙傛暟
--
Gitblit v1.8.0