fixed： 修改数据格式

src/api/common.ts

@@ -1,52 +0,0 @@
/*
 * @Author: Devin
 * @Date: 2022-11-21 17:09:09
 * @LastEditors: Devin
 * @LastEditTime: 2022-11-28 14:28:17
 * @Description: 公共接口
 */
import { AIotRequest } from './index';
export const CommonAPI = {
  getValueTypeList:
    '/characteristicSpecValue/findSpecValueByCharSpecId?charSpecId=101002',
  getUnitList:
    '/characteristicSpecValue/findSpecValueByCharSpecId?charSpecId=701004',
  getNodeTypeList:
    '/characteristicSpecValue/findSpecValueByCharSpecId?charSpecId=701003',
  getAlarmLevel:
    '/characteristicSpecValue/findSpecValueByCharSpecId?charSpecId=802001',
  getDeviceState:
    '/characteristicSpecValue/findSpecValueByCharSpecId?charSpecId=701008',
  uploadFile: `${import.meta.env.VITE_BASE_URL}/dmp/file/uploadFile`
};
export function getValueTypeList() {
  return AIotRequest.get({
    url: CommonAPI.getValueTypeList
  });
}
export function getUnitList() {
  return AIotRequest.get({
    url: CommonAPI.getUnitList
  });
}
export function getNodeTypeList() {
  return AIotRequest.get({
    url: CommonAPI.getNodeTypeList
  });
}
export function getAlarmLevel() {
  return AIotRequest.get({
    url: CommonAPI.getAlarmLevel
  });
}
export function getDeviceState() {
  return AIotRequest.get({
    url: CommonAPI.getDeviceState
  });
}

src/api/flow.ts

@@ -227,14 +227,14 @@ export function getServiceDetail(data: any) {
}
export const otherApi = {
  getSqlList: '/df/ipu/sql/getSqlWithPage',
  getSqlList: '/ipu/sqlMgmt/sql',
  downloadTemplate: 'ipu/file/databusTemplate/download',
  getSystemConfig: 'ipu/config/value'
};
// 获取接口详情
export function getSqlServiceList(data: any): Promise<any> {
  return AIotRequest.post({
  return AIotRequest.get({
    url: otherApi.getSqlList,
    data
  });

src/views/_components/panel/PanelGlobal.vue

@@ -121,7 +121,10 @@
    ></custom-detail-list>
    <!-- 上传下载 -->
    <custom-import v-if="dialogType === 'fileImport'"></custom-import>
    <custom-import
      v-if="dialogType === 'fileImport'"
      ref="batchCreateCustomRef"
    ></custom-import>
  </dialog-panel>
</template>
@@ -369,6 +372,18 @@ function setModelInfo() {
}
const { importModel } = setModelInfo();
// 导入导出
const batchCreateCustomRef = ref(null);
function batchCreateCustom() {
  const data = batchCreateCustomRef.value.tableData;
  table.value.customAttrs.data = [...data, ...table.value.customAttrs.data];
  table.value.customAttrs.data.map((item) => {
    item.actions = btns;
    return item;
  });
  closeDialog();
}
/** 模型声明 end */
function confirmDialog() {
@@ -381,6 +396,9 @@ function confirmDialog() {
    case 'viewCustomDetail':
      closeDialog();
      break;
    case 'fileImport':
      batchCreateCustom();
      break;
    default:
      break;
  }
@@ -392,6 +410,11 @@ function closeDialog() {
}
const customDetail = ref(null);
const btns = [
  // { label: '编辑', name: 'edit', onClick: editFn },
  { label: '删除', name: 'delete', onClick: confirmEvent }
];
// 自定义属性表格操作
function customAttrFn() {
  // if (attrInfo.value.type === 'add') {
@@ -407,8 +430,17 @@ function customAttrFn() {
  //     }
  //     return item;
  //   });
  const data = customDetail.value.attrList;
  table.value.customAttrs.data = [...data, ...table.value.customAttrs.data];
  const newData = [...data, ...table.value.customAttrs.data];
  newData.filter(
    (item, index) => newData.findIndex((t) => t.id === item.id) === index
  );
  table.value.customAttrs.data = newData;
  table.value.customAttrs.data.map((item) => {
    item.actions = btns;
    return item;
  });
  closeDialog();
}

src/views/_components/panel/global/CustomImport.vue

@@ -21,6 +21,11 @@
        <el-button type="success">文件导入</el-button>
      </el-upload>
    </div>
    <common-table
      class="global-table"
      :table-header="tableHeader"
      :table-data="tableData"
    ></common-table>
  </div>
</template>
@@ -33,6 +38,12 @@ function downTemplate() {
  window.open(downloadTemplaye());
}
const tableHeader = ref([
  { label: '属性名称', name: 'name', 'min-width': '150' },
  { label: '属性ID', name: 'id', 'min-width': '150' },
  { label: '属性类型', name: 'type', 'min-width': '150' }
]);
// excel表数据处理
const tableData = ref([]);
function useExcelHooks(e: any) {

src/views/_components/right-panel/PanelSql.vue

@@ -208,7 +208,6 @@ const sqlPropsMap = ref<any>({
});
function getSQLList() {
  const params = <any>{
    name: '',
    pageNumber: 1,
    pageSize: 1000
  };

src/views/_components/right-panel/_components/PanelDataAssembly.vue

@@ -29,7 +29,6 @@
            <template #default="{ node, data }">
              <div class="tree-item">
                <span class="label">{{ data.name }}</span>
                <span class="type">
                  {{ data.id }}
                </span>
@@ -69,7 +68,10 @@
      <h5 class="title">属性</h5>
      <ul class="tag-list">
        <li v-for="(item, index) in tagList" :key="index">
          <h5 class="tag-title">{{ item.label }}</h5>
          <h5 class="tag-title">
            <span class="dian" :style="{ background: item.color }"></span>
            <span>{{ item.label }}</span>
          </h5>
          <div class="tag-content">
            <template v-for="(tag, tagIndex) in item.tags" :key="tagIndex">
              <span
@@ -77,9 +79,10 @@
                :class="`${tag?.['type']}-color`"
                @click.stop="handleClickTag(tag)"
              >
                {{ tag.label }}
                {{ tag.name }}
              </span>
            </template>
            <!-- <el-button size="small" @click.stop="">快速创建</el-button> -->
          </div>
        </li>
      </ul>
@@ -98,65 +101,36 @@ import {
} from 'vue';
import JsonEditor from 'json-editor-vue3';
import { v4 as uuidv4 } from 'uuid';
import { useRoute } from 'vue-router';
const { proxy } = getCurrentInstance();
const route = useRoute();
const systemId = route.query.id;
const dataBus = JSON.parse(localStorage.getItem('panelGlobal'))?.[
  `${systemId}`
];
const customAttrs = dataBus?.customAttrs?.data || [];
console.log(customAttrs);
const props = defineProps({
  dataSource: {
    type: Array,
    default: () => []
  }
});
// 源数据
const tagList = ref<any>([
  {
    label: '字符串',
    type: 'string',
    uuid: 1,
    tags: [
      { label: '姓名', name: 'name', type: 'string', uuid: 2 },
      { label: '电话号码', name: 'tel', type: 'string', uuid: 3 },
      { label: '邮箱', name: 'email', type: 'string', uuid: 4 }
    ]
  },
  {
    label: '整数',
    type: 'int',
    uuid: 5,
    tags: [
      { label: '年龄', name: 'age', type: 'int', uuid: 6 },
      { label: '性别', name: 'sex', type: 'int', uuid: 7 },
      { label: '班级', name: 'class', type: 'int', uuid: 8 }
    ]
  },
  {
    label: '布尔类型',
    type: 'boolean',
    uuid: 9,
    tags: [
      { label: '婚姻状况', name: 'marry', type: 'boolean', uuid: 10 },
      { label: '生育状况', name: 'sex', type: 'boolean', uuid: 11 }
    ]
  },
  {
    label: '对象',
    type: 'object',
    uuid: 12,
    tags: [
      { label: '结果', name: 'result', type: 'object', uuid: 13 },
      { label: '学生', name: 'student', type: 'object', uuid: 14 },
      { label: '员工', name: 'staff', type: 'object', uuid: 15 }
    ]
  },
  {
    label: '数组',
    type: 'array',
    uuid: 16,
    tags: [
      { label: '兴趣', name: 'likes', type: 'array', uuid: 17 },
      { label: '作品', name: 'works', type: 'array', uuid: 18 }
    ]
  }
  { label: '对象', color: '#ff956f', type: 'object', tags: [] },
  { label: '数组', color: '#ffb95b', type: 'array', tags: [] },
  { label: '字符串', color: '#31cf9a', type: 'string', tags: [] },
  { label: '整数', color: '#169bfa', type: 'int', tags: [] },
  { label: '布尔类型', color: '#ff956f', type: 'boolean', tags: [] },
  { label: '长整数', color: '#ff5f5f', type: 'long', tags: [] },
  { label: '小数', color: '#21c5db', type: 'decimal', tags: [] },
  { label: '日期', color: '#c084fc', type: 'date', tags: [] },
  { label: '时间', color: '#f471b7', type: 'datetime', tags: [] }
]);
const treeData = ref<any>([...props.dataSource] || []);
const jsonData = ref<any>({});
@@ -164,6 +138,20 @@ const jsonData = ref<any>({});
const currentNode = ref<any>({});
const myTree = ref<any>(null);
// 源数据处理
function formateSourceData(data: any) {
  tagList.value.map((item: any) => {
    data.forEach((tag: any) => {
      if (tag.type === item.type) {
        tag.alias = '';
        item.tags.push(tag);
      }
    });
    return item;
  });
}
formateSourceData(customAttrs);
/**
 * el-tree拖拽start
 */
@@ -212,10 +200,9 @@ function getCurrentNode(node: any) {
// 标签点击，添加至左边树
function handleClickTag(tag: any) {
  const newChild = <any>{
    label: tag.label,
    name: tag.label,
    id: tag.name,
    alias: '',
    id: tag.id,
    name: tag.name,
    alias: tag.alias,
    uuid: uuidv4(),
    type: tag.type,
    children: []
@@ -231,11 +218,13 @@ function handleClickTag(tag: any) {
        currentNode.value.children.push(newChild);
        treeData.value = [...treeData.value];
      } else {
        proxy.$message.error(`${currentNode.value?.label}中已存在改属性！`);
        proxy.$message.error(`${currentNode.value?.name}中已存在该属性！`);
      }
    } else {
      proxy.$message.error(`${currentNode.value?.type}类型不能有子类！`);
    }
  } else if (treeData.value.find((item: any) => item.id === newChild.id)) {
    proxy.$message.error('根节点中中已存在该属性!');
  } else {
    treeData.value.push(newChild);
  }
@@ -391,8 +380,18 @@ onMounted(() => {
      padding: 15px;
      box-sizing: border-box;
      overflow-y: auto;
      li {
        margin-bottom: 5px;
      }
      .tag-title {
        line-height: 32px;
        display: flex;
        align-items: center;
        .dian {
          width: 10px;
          height: 10px;
          margin-right: 10px;
        }
      }
      .tag-content {
        display: flex;
@@ -408,6 +407,7 @@ onMounted(() => {
          border-radius: 4px;
          position: relative;
          padding-left: 26px;
          margin-bottom: 10px;
          cursor: pointer;
          &:after {
            content: '';
@@ -492,6 +492,7 @@ onMounted(() => {
  color: #606266;
  font-weight: 400;
}
:deep(.el-tree-node) {
  line-height: 30px;
  padding: 3px 0;