Merge remote-tracking branch 'origin/master'

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

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

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

@@ -1104,6 +1106,8 @@
        indexClassName: "序号",
        indexLabelClassName: '序号',
        index: true,
        indexFixed:false,
        selectionFixed:false,
        border: true,
        addBtn: false,
        menu: false,
@@ -1113,7 +1117,7 @@
          {
            label: "属性英文名称",
            prop: "id",
            width: 100,
            width: 130,
          },
          {
            label: "属性中文名称",
@@ -1551,6 +1555,7 @@
  },
  computed: {
    ...mapGetters(["permission"]),
    //页面按钮权限
    permissionList() {
      return {
        busineStatus: this.vaildData(this.permission.classifyTree.attr_add, false),
@@ -1795,7 +1800,6 @@
      this.attrSelectList = [row];
      this.$refs.referAttrCrud.setCurrentRow(row);
      this.$refs.referAttrCrud.toggleRowSelection(row); //选中当前行

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