ananzhusen 1 rok temu
rodzic
commit
e1f911c073
2 zmienionych plików z 21 dodań i 2 usunięć
  1. 12 1
      src/views/components/PenDatas.vue
  2. 9 1
      src/views/components/View.vue

+ 12 - 1
src/views/components/PenDatas.vue

@@ -398,6 +398,7 @@
           :columns="dataSetColumns"
           size="small"
           bordered
+          rowSelectionAllowUncheck
           :loading="dataBindDialog.loading"
           :pagination="query"
           @page-change="onChangePagination"
@@ -960,6 +961,9 @@ const onConfirmData = () => {
       MessagePlugin.error('已经存在相同属性数据!');
       return;
     }
+    if(props.pen[addDataDialog.data.key] === undefined && addDataDialog.data.key.indexOf('.') !== -1){
+      props.pen[addDataDialog.data.key] = getter(props.pen, addDataDialog.data.key);
+    }
     props.pen.realTimes.push(addDataDialog.data);
   }
 
@@ -1075,6 +1079,9 @@ const onSelectBindsChange = (value: string[], options: any) => {
   if (options.type === 'check') {
     dataBindDialog.selectedIds = value;
     dataBindDialog.data.bind = toRaw(options.selectedRowData[0]);
+    if(dataBindDialog.data.bind.id){
+      dataBindDialog.data.enableMock = false;
+    }
     dataBindDialog.data.mock = dataBindDialog.data.bind.mock;
     dataBindDialog.data.type = dataBindDialog.data.bind.type;
     doBindInit();
@@ -1086,7 +1093,7 @@ const onSelectBindsChange = (value: string[], options: any) => {
 
 const doBindInit = () => {
   let { id } = dataBindDialog.data;
-  if (props.pen.name === 'echarts' && id.includes('echarts.option.series')) {
+  if (props.pen.name === 'echarts' && id?.includes('echarts.option.series')) {
     const { replaceMode } = props.pen.echarts;
     const { xAxis } = props.pen.echarts.option;
 
@@ -1133,6 +1140,10 @@ const changeValue = (prop: string) => {
   if (prop === 'iframe') {
     getThumbImg();
   }
+  if(prop === 'apiEnable'){
+    meta2d.penNetwork(props.pen);
+    meta2d.connectNetwork();
+  }
 };
 
 const onTrigger = (item: any) => {

+ 9 - 1
src/views/components/View.vue

@@ -410,7 +410,7 @@
                           @click="onSelectNetWork(item)"
                         >
                           <div style="font-size: 14px">{{ item.name }}</div>
-                          <div class="desc">{{ item.url }}</div>
+                          <div class="desc">{{ item.url || item.data.url }}</div>
                           <span class="del" @click.stop="onDelNetWork(item, i)">
                             <delete-icon />
                             <!-- <t-icon name="delete" /> -->
@@ -1554,6 +1554,14 @@ const deleteNetwork = (index: number) => {
 
 const onOkNetwork = async () => {
   if (dataDialog.editNetwork === 1) {
+    if(!dataDialog.network.data.url) {
+      MessagePlugin.error('URL地址不能为空!');
+      return;
+    }
+    if(!dataDialog.network.name) {
+      MessagePlugin.error('名称不能为空!');
+      return;
+    }
     if (dataDialog.save) {
       const ret: any = await axios.post(
         `/api/data/datasource/add`,