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

 Source/UBCS-WEB/src/api/template/templateAttr.js

@@ -216,6 +216,7 @@
  return request({
    url:'/api/ubcs-code/codeClassify/exportClassify',
    method: 'get',
    responseType: 'blob',
    params:{
      ...params
    }

 Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue

@@ -14,7 +14,7 @@
      </el-button-group>
      <el-button-group>
        <!--    保存-->
        <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" size="small" type="success" plain @click="addsHandler" icon="el-icon-check">保存</el-button>
        <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" size="small" type="success" plain @click.prevent="addsHandler" icon="el-icon-check">保存</el-button>
        <!--    预览排序-->
        <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">预览排序</el-button>
        <!--    删除-->
@@ -170,7 +170,7 @@
                 title="输入分组的名称">
        <el-form ref="form" label-width="70px">
          <el-form-item label="属性分组">
            <el-input v-model="attrModel"></el-input>
            <el-input v-model="attrModel" autofocus></el-input>
          </el-form-item>
          <div style="display: flex;justify-content: flex-end">
            <el-button size="small" type="primary" @click="attrHandle">提交</el-button>
@@ -218,7 +218,7 @@
      </el-dialog>
      <!--        全屏编辑-->
      <el-dialog :visible.sync="attrEditVisible" append-to-body fullscreen="true" :before-close="escEdit" >
        <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag" :editStyleFlag="editStyleFlag" :editOpenFlag="editOpenFlag" :crudArrayFlag="this.crudArrayFlag"></attrCrud>
        <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag" @editCloseChildren="editClose" :editStyleFlag="editStyleFlag" :editOpenFlag="editOpenFlag" :crudArrayFlag="this.crudArrayFlag"></attrCrud>
      </el-dialog>
      <!--      组合规则-->
      <formula-editor :systemVariableTableData="systemVariableTableData"
@@ -1677,15 +1677,15 @@
      this.attrRow = row;
    },
    //保存
    addsHandler() {
    addsHandler(event) {
      batchAddSave(JSON.parse(JSON.stringify(this.ProData))).then(res => {
        this.$message.success('保存成功')
        this.editOpenFlag=false
        this.editOpenFlag=false;
        this.$emit('editCloseChildren')
      }).catch(()=>{
        this.$message.warning('保存失败，请查看控制台输出！')
      })
    },

    //表格行编辑
    handleCellClicks(row, column) {
       if(this.editOpenFlag){
@@ -1705,6 +1705,7 @@
           }
           // this.$refs.referConfigFormDialog.onloadAttrData();
         }else if(column.property == 'classifyInvokeText'){
           this.injectVisible=true;
           if (this.CurrentCell.classifyInvokeAttr != '') {
             this.injectOption = {
               classifyInvokeAttr: this.CurrentCell.classifyInvokeAttr,
@@ -1889,6 +1890,7 @@
          this.$set(this.attrSelectList[0],'classifyInvokeText',data)
        }
        this.injectHandleReset()

      if(this.injectOption.classifyInvokeLevel !== 'min'){
        this.injectOption.classifyInvokeLevel=this.injectOption.classifyNumber;
      }else  {
@@ -1995,6 +1997,10 @@
    editOpen(){
      this.editOpenFlag=true;
    },
    //定义一个关闭编辑的方法供子组件使用
    editClose(){
      this.editOpenFlag=false;
    },
    //批量设置switch
    batchSetFlag(value){
      this.attrSelectList.forEach(item=>{

 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue

@@ -742,7 +742,7 @@
    ExportExcel(){
      if(this.nodeClickList){
        exportClassify({oid:this.nodeClickList.oid}).then(res=>{
          func.downloadFileByBlob(res);
          func.downloadFileByBlobHandler(res);
        })
      }else {
        this.$message.warning('请先选择要导出的主题库分类')

 Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue

@@ -13,6 +13,7 @@
    </span>
  </basic-container>


</template>

<script>

 Source/UBCS-WEB/vue.config.js

@@ -26,10 +26,11 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        target: 'http://localhost:37000',
        // target: 'http://localhost:37000',
        // target: 'http://192.168.1.51:37000',
        // target: 'http://dev.vci-tech.com:37000',
        target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.104:37000',
        // target: 'http://192.168.0.103:37000',
        // target: 'http://192.168.1.63:37000',
        // target: 'http://192.168.3.7:37000',
        //远程演示服务地址,可用于直接启动项目

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

@@ -3672,7 +3672,48 @@
        } else {
            if (StringUtils.isNotBlank(referConfigVO.getParentFieldName()) && StringUtils.isNotBlank(queryObject.getParentOid())) {
                queryObject.getConditionMap().put(referConfigVO.getParentFieldName(), queryObject.getParentOid());
            }
                //查询全部的信息
                String parentOidSql = "";
                if (StringUtils.isNotBlank(referConfigVO.getParentValue())) {
                    String temp = referConfigVO.getParentValue();
                    if (temp.startsWith(QueryOptionConstant.IN)) {
                        temp = temp.substring((QueryOptionConstant.IN).length()).trim();
                        parentOidSql = " in " + "('" + queryObject.getParentOid() + "')";
                    } else if (temp.startsWith(QueryOptionConstant.NOTIN)) {
                        parentOidSql = " not in " + "('" + queryObject.getParentOid() + "')";
                    } else if (temp.startsWith(QueryOptionConstant.NOTEQUAL)) {
                        temp = temp.substring((QueryOptionConstant.NOTEQUAL).length()).trim();
                        parentOidSql = QueryOptionConstant.NOTEQUAL + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
                    } else if (temp.startsWith(QueryOptionConstant.MORETHAN)) {
                        temp = temp.substring((QueryOptionConstant.MORETHAN).length()).trim();
                        parentOidSql = QueryOptionConstant.MORETHAN + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
                    } else if (temp.startsWith(QueryOptionConstant.MORE)) {
                        temp = temp.substring((QueryOptionConstant.MORE).length()).trim();
                        parentOidSql = QueryOptionConstant.MORE + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
                    } else if (temp.startsWith(QueryOptionConstant.LESSTHAN)) {
                        temp = temp.substring((QueryOptionConstant.LESSTHAN).length()).trim();
                        parentOidSql = QueryOptionConstant.LESSTHAN + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
                    } else if (temp.startsWith(QueryOptionConstant.LESS)) {
                        temp = temp.substring((QueryOptionConstant.LESS).length()).trim();
                        parentOidSql = QueryOptionConstant.LESS + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
                    } else if (temp.startsWith(QueryOptionConstant.ISNOTNULL)) {
                        parentOidSql = " is not null";
                    } else if (temp.startsWith(QueryOptionConstant.ISNULL)) {
                        parentOidSql = " is  null";
                    } else if (temp.contains("*")) {
                        parentOidSql = " like " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'").replace("*", "%");
                    } else {
                        parentOidSql = " = " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
                    }

                }
                //查询全部的信息
                queryObject.getConditionMap().put("oid", QueryOptionConstant.IN + "(select oid from " +
                    getTableName(referConfigVO.getReferType()) +
                    " START WITH " + referConfigVO.getParentFieldName() + " " +
                    parentOidSql +
                    " CONNECT BY PRIOR " + oidFieldName + " = " + referConfigVO.getParentFieldName() + ")");
            }
        }
        LambdaQueryWrapper<CodeClassify> lqw = new LambdaQueryWrapper<>();
        String sql = queryObject.getConditionMap().get("oid").substring(3);