调整

zhangyanpeng

2024-08-03 d8e78fa8610d65f6bfa23e0dd7070672f41ba3e4

 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"> '+
@@ -3061,6 +3073,8 @@
            
            // 表格字段分组，根据tableformgroup判断tablegroupname是否表格单元格中的表单分组 
            me_tableFields = listTOTableFieldsGroupByType(me_tableFields);
            // me_tableFields = listTOTableFieldsGroupByType(me.showTableFields);
				
         }
         me_tableFields.map(t=>{
            if (t.inputtype && !t.type) {
@@ -3544,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)}
            }
            
         }
         
@@ -6338,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);
                  }
                  
               }
               
@@ -6442,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);
               }
               
            }
@@ -7647,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);
                  }
                  
               }