Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue

@@ -50,7 +50,7 @@
    // 默认禁用元素
    disabledProp: {
      type: Array,
      default: () => ["id"],
      default: () => ["id","lcstatus"],
    },
    templateOid: {
      type: String,
@@ -562,7 +562,7 @@
          maxlength: formItem.maxlength,
          filterable: true,
          referConfig:
            formItem.type == "refer" 
            formItem.type == "refer"
              ? {
                  title: formItem.text,
                  showField: formItem.showField || formItem.field,
@@ -604,7 +604,7 @@
      if (this.type === "add") {
        this.loading = false;
      }
      

      this.geDictData(dictKeys);
      this.getFormDetail();
    },

 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue

@@ -31,7 +31,7 @@
                               :label="item.label"
                               :prop="item.prop" :show-overflow-tooltip="true"
                               :sortable="item.sortable"
                               :width="item.label.length >= 4 ? '150' : item.label.length == 3 ? '120' : '90'"
                               :width="item.width"
                               align="center">
              </el-table-column>
            </el-table>
@@ -241,13 +241,12 @@
  created() {
  },
  mounted() {

  },
  activated() {
    // this.doLayout();
    this.$nextTick(() => {
      this.$refs.dataTable.doLayout()
    })
   this.doLayout()
  },
  updated() {
    this.doLayout()
  },
  watch: {
    tableHeadDataFateher: {
@@ -266,6 +265,7 @@
      handler(newval, oldval) {
        this.tableData = newval;
        this.searchResults = newval
        this.doLayout()
      },
    },
    tableHeadFindData: {
@@ -643,10 +643,13 @@
    saveRow() {
      this.editingRow = null;
    },
    //表格错行问题
    doLayout() {
      this.$nextTick(() => {
        this.$refs.crud.doLayout();
      });
        if (this.$refs.dataTable && this.$refs.dataTable.doLayout) {
          this.$refs.dataTable.doLayout();
        }
      })
    },
    //表格头渲染
    CrudHeaderRend() {
@@ -717,6 +720,7 @@
        limit: this.page.pageSize,
      }).then((res) => {
        this.tableData = res.data.data;
        this.doLayout()
      });
    },
    //多选

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java

@@ -1335,10 +1335,10 @@
                        if(existFild == null){
                            returnMap.putAll((Map) result);
                        }else{
                            Map resulMap = (Map) result;
                            for (Object o : resulMap.keySet()) {
                                if(existFild.contains(o)){
                                    returnMap.put(o,resulMap.get(o));
                            Map resulMapChild = (Map) result;
                            for (Object o : resulMapChild.keySet()) {
                                if(existFild.contains(String.valueOf(o).toLowerCase())){
                                    returnMap.put(String.valueOf(o).toLowerCase(),resulMapChild.get(o));
                                }
                            }
                        }

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java

@@ -3355,13 +3355,17 @@
                            setter.invoke(obj, ((BigDecimal) map.get(property.getName().toUpperCase())).intValue());
                            map.remove(property.getName().toUpperCase());
                        } else if (map.get(property.getName().toUpperCase()) != null) {
                            setter.invoke(obj, map.get(property.getName().toUpperCase()));
                            if(setter.getParameterTypes()[0].getSimpleName().equals("String")){
                                setter.invoke(obj, String.valueOf(map.get(property.getName().toUpperCase())));
                            }else{
                                setter.invoke(obj, map.get(property.getName().toUpperCase()));
                            }
                            map.remove(property.getName().toUpperCase());
                        }
                    }
                }
                for (Object key : map.keySet()) {
                    map.put(key, String.valueOf(map.get(key)));
                    map.put(key, map.get(key) == null ? null : String.valueOf(map.get(key)));
                }

                ((BaseModel) obj).setData(map);

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java

@@ -215,7 +215,7 @@
                // 版本规则字段不能为空
//                vo.setNullableFlag(false);
                vo.setAttributeLength(150);
                if (Arrays.asList("lastr","firstr","lastv","firstv","revisionseq","versionseq","revisionvalue","versionvalue").contains(id)){
                if (Arrays.asList("lastr","firstr","lastv","firstv").contains(id)){
                    vo.setAttributeLength(5);
                    vo.setAttrDataType(VciFieldTypeEnum.VTInteger.name());
                }