Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/Master/MasterTree.vue

@@ -114,7 +114,7 @@
            });
            this.$emit("coderuleoid", this.coderuleoid)
            this.$emit('Treedata', this.Treedata)
            console.log(this.Treedata)
            // console.log(this.Treedata)
          }
        }
      }).catch(res => {
@@ -152,6 +152,7 @@
    TableHeadRend() {
      const index = this.$route.query.id.indexOf('@');
      const result = this.$route.query.id.substring(0, index);
      // console.log(this.$route)
      return new Promise((resolve, reject) => {
        MasterTable({
          codeClassifyOid: this.nodeClickList.oid,
@@ -190,7 +191,7 @@
    async nodeClick(data) {
      try {
        // console.log(data)
        this.TreeValue = data.label.split(" ")[0].trim();
        this.TreeValue = data.label.split("</span>")[1].trim();
        // console.log('TreeValue',this.TreeValue)
        this.$emit('TreeValue', this.TreeValue)
        this.nodeClickList = data;

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

@@ -941,7 +941,8 @@
        limit: this.page.pageSize,
        ['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
      }).then(res => {
        this.tableData = res.data.data
        this.tableData = res.data.data;
        // this.page.total = res.data.data.total;
      })
    }


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

@@ -320,7 +320,7 @@
      ></refer-config-dialog>

    </div>
    <div>

      <el-table v-if="this.crudArrayFlag"
                ref="referAttrCrud"
                v-loading="loading"
@@ -395,7 +395,6 @@
        </el-table-column>
      </el-table>
    </div>
  </div>
</template>

<script>
@@ -1555,7 +1554,6 @@
  },
  computed: {
    ...mapGetters(["permission"]),
    //页面按钮权限
    permissionList() {
      return {
        busineStatus: this.vaildData(this.permission.classifyTree.attr_add, false),
@@ -1800,6 +1798,7 @@
      this.attrSelectList = [row];
      this.$refs.referAttrCrud.setCurrentRow(row);
      this.$refs.referAttrCrud.toggleRowSelection(row); //选中当前行

      this.attrOid = row.oid;
      this.attrRow = row;
    },

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

@@ -3,7 +3,7 @@
  <el-container>
    <!--    左侧菜单-->
    <el-aside>
      <basic-container style="overflow:hidden;">
      <basic-container>
        <div>
          <div>
            <div style="display: flex; flex-direction: column;">
@@ -23,6 +23,17 @@
            <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
            </div>
          </div>
<!--          左侧树-->
          <div style="height: calc(100vh - 230px);overflow: auto">
            <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
                       :defaultExpandAll="false"
                       :option="Treeoption"
                       class="classifyTree"
                       @node-click="nodeClick"
            >
            </avue-tree>
          </div>

          <!--        树节点添加对话框-->
          <el-dialog v-loading="AddLoading" :before-close="TreeEscHandler"
                     :title="this.TreeFlag ? '添加分类' :'添加主题库'" :visible.sync="TreeAddFormVisible" append-to-body
@@ -69,15 +80,6 @@
                              :nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
                              @referTreeForm="referTreeForm"></classifyTreeform>
          </el-dialog>
<!--          左侧树-->
          <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
                     :defaultExpandAll="false"
                     :option="Treeoption"
                     class="classifyTree"
                     style="height: calc(100vh - 230px)"
                     @node-click="nodeClick"
          >
          </avue-tree>
        </div>
      </basic-container>
    </el-aside>
@@ -404,7 +406,6 @@
import {mapGetters} from "vuex";
export default {
  name: "classifyTrees.vue",
  inject: ["crudTreeData"],
  data() {
    return {
      masterRow: null,
@@ -1630,7 +1631,7 @@
}

.el-aside {
  height: calc(100% - 30px);
  //height: calc(100% - 30px);
}

.el-main {

 Source/UBCS-WEB/src/views/modeling/Business.vue

@@ -68,20 +68,6 @@
                </el-tag>
                <span v-else></span>
              </el-descriptions-item>
              <!-- <el-descriptions-item>
            <template slot="label">
              <i class="el-icon-s-ticket"></i>
              标签
            </template>
            {{obj.hashtag}}
          </el-descriptions-item> -->
              <!-- <el-descriptions-item>
            <template slot="label">
              <i class="el-icon-arrow-up"></i>
              继承自
            </template>
            {{ obj.sss }}
          </el-descriptions-item> -->
              <el-descriptions-item :contentStyle="descriptionOption.contentStyle"
                                    :labelStyle="descriptionOption.labelStyle">
                <template slot="label">
@@ -98,17 +84,17 @@
                </template>
                {{ obj.lifeCycleName ? obj.lifeCycleName + '(' + obj.lifeCycleId + ')' : '' }}
              </el-descriptions-item>
              <el-descriptions-item :contentStyle="descriptionOption.contentStyle"
                                    :labelStyle="descriptionOption.labelStyle">
                <template slot="label">
                  <i :class="icons.view"></i>
                  视图
                </template>
                <el-tag v-if="obj.viewText" size="small">
                  {{ obj.viewText }}
                </el-tag>
                <span v-else></span>
              </el-descriptions-item>
<!--              <el-descriptions-item :contentStyle="descriptionOption.contentStyle"-->
<!--                                    :labelStyle="descriptionOption.labelStyle">-->
<!--                <template slot="label">-->
<!--                  <i :class="icons.view"></i>-->
<!--                  视图-->
<!--                </template>-->
<!--                <el-tag v-if="obj.viewText" size="small">-->
<!--                  {{ obj.viewText }}-->
<!--                </el-tag>-->
<!--                <span v-else></span>-->
<!--              </el-descriptions-item>-->
              <!-- <el-descriptions-item>
            <template slot="label">
              <i class="el-icon-arrow-down"></i>

 Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue

@@ -48,14 +48,14 @@
                  placeholder="请选择，留空则不进行管理">
        </el-input>
      </el-form-item>
      <div>
        <el-form-item label="开启视图" label-width="100px" class="viewFlag">
          <el-switch v-model="btmType.viewFlag" active-color="#13ce66" @change="viewChange"></el-switch>
        </el-form-item>
        <el-form-item label="视图语句" label-width="100px" class="viewInput">
          <el-input v-model="btmType.view" :prefix-icon="icons.view" :disabled="!btmType.viewFlag"></el-input>
        </el-form-item>
      </div>
<!--      <div>-->
<!--        <el-form-item label="开启视图" label-width="100px" class="viewFlag">-->
<!--          <el-switch v-model="btmType.viewFlag" active-color="#13ce66" @change="viewChange"></el-switch>-->
<!--        </el-form-item>-->
<!--        <el-form-item label="视图语句" label-width="100px" class="viewInput">-->
<!--          <el-input v-model="btmType.view" :prefix-icon="icons.view" :disabled="!btmType.viewFlag"></el-input>-->
<!--        </el-form-item>-->
<!--      </div>-->
      <el-form-item label="描述" label-width="100px" class="description">
        <el-input v-model="btmType.description"
                  :prefix-icon="icons.desc"
@@ -203,7 +203,7 @@
  watch: {
    btmType: {
      handler(newval, oldval) {
        console.log('监听', newval, oldval)
        // console.log('监听', newval, oldval)
      },
      deep: true,
      immediate: true
@@ -563,7 +563,7 @@
    },
    // 添加业务类型
    submitBtmType() {
      console.log(this.btmType);
      // console.log(this.btmType);
      if (!this.btmType.attributes){
         this.$message.warning("还没有为业务类型选择属性");
         return;
@@ -611,7 +611,6 @@
    },
    // 列表编辑保存
    cellEditSave(row,index) {
      // console.log("1111111111111111111111")
      this.btmType.attributes[index].name = row.name
      this.btmType.attributes[index].defaultValue = row.defaultValue;
      this.btmType.attributes[index].description = row.description;

 Source/UBCS-WEB/src/views/modeling/classifyTree.vue

@@ -1,41 +1,18 @@
<template>
  <classifyTrees :crudData="crudTreeData"
  ></classifyTrees>
  <classifyTrees></classifyTrees>
</template>

<script>

export default {
  name: "classifyTree.vue",
  //使用provide传递给子组件
  //父传子有问题，暂时没解决，用provide代替父传子，子传父还是用$emit传递，注意！！！其他组件不能使用同样的类名否则会报错。
  provide() {
    return {
      crudTreeData: this.crudTreeData,
    }

  },
  data() {
    return {
      aaa: 1,
      crudTreeData: [
        {
          value: 0,
          column: [
            {
              cash: "测试0"
            }
          ]
        },
        {
          value: 1,
          column: [
            {
              cash: "测试1"
            }
          ]
        }
      ],
      arr : [
        {
          name: 'Alice',