2 Commits 5bb72ba790 ... 4c0340d71c

Autore SHA1 Messaggio Data
  yangfan 4c0340d71c Merge remote-tracking branch 'origin/1.2.2' into 1.2.2 3 mesi fa
  yangfan 482bb93b22 优化关联表全选不响应问题 3 mesi fa

+ 25 - 6
src/components/Generator/generator/config.js

@@ -20,7 +20,7 @@ export const formConf = {
   deleteDataCheckReferenceRelation: 0,
   deleteDataIgnoringReferenceRelationIds: [],
   importTemplatePath: '',
-  importTemplatePathFileList: [],
+  importTemplatePathFileList: []
 }
 const event = {
   isEvent: true,
@@ -708,17 +708,16 @@ export const inputComponents = [
       type: '0',
       span: 24,
       dragDisabled: false,
-      fontStyle:{
+      fontStyle: {
         color: 'rgba(0, 0, 0,1)',
-        size:14,
+        size: 14
       },
-      svgModel:'1',
-
+      svgModel: '1'
     },
     displayNone: false,
     __slot__: {
       default: '我是分割线'
-    },
+    }
   },
   {
     __config__: {
@@ -766,6 +765,26 @@ export const inputComponents = [
     },
     h: 6,
     placeholder: '请输入内容...'
+  },
+  {
+    __config__: {
+      jnpfKey: 'JNPFMap',
+      label: '地图选址',
+      labelWidth: undefined,
+      showLabel: true,
+      tag: 'JNPF-Map',
+      tagIcon: 'icon-ym icon-ym-generator-rich-text',
+      defaultValue: null,
+      required: false,
+      layout: 'colFormItem',
+      span: 24,
+      dragDisabled: false,
+      regList: [],
+      trigger: 'blur',
+      viewDataType: 'STRING'
+    },
+    h: 6,
+    placeholder: '请输入内容...'
   }
 ]
 

File diff suppressed because it is too large
+ 2 - 2
src/utils/request.js


+ 4 - 1
src/views/dataset/edit.vue

@@ -654,7 +654,9 @@ export default {
       joinForm: {},
       showEditJoin: false,
       nowNode: null, //编辑连接时的左边源表
-      rightNode: null, // 编辑连接时的右边目标表
+      rightNode: {
+        fields: []
+      }, // 编辑连接时的右边目标表
       editJoinType: 'add', // 编辑连接时方式 新增/修改
       showFieldsSelect: false,
       mainIndex: 0,
@@ -895,6 +897,7 @@ export default {
       } else if (type == 'right') {
         this.rightNode.fields.forEach((i) => (i.hiddenStatus = flag))
         this.rightNode.fields = [...this.rightNode.fields]
+        this.$set(this.rightNode, 'searched', [...this.rightNode.fields])
       }
     },
     // 获取视图列表