Merge pull request #1295 from dataease/dev

backend/src/main/java/io/dataease/base/domain/VAuthModel.java

@@ -21,5 +21,7 @@ public class VAuthModel implements Serializable {
 
     private Long level;
 
+    private Long mode;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

backend/src/main/java/io/dataease/base/domain/VAuthModelExample.java

@@ -653,6 +653,66 @@ public class VAuthModelExample {
             addCriterion("`level` not between", value1, value2, "level");
             return (Criteria) this;
         }
+
+        public Criteria andModeIsNull() {
+            addCriterion("`mode` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModeIsNotNull() {
+            addCriterion("`mode` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModeEqualTo(Long value) {
+            addCriterion("`mode` =", value, "mode");
+            return (Criteria) this;
+        }
+
+        public Criteria andModeNotEqualTo(Long value) {
+            addCriterion("`mode` <>", value, "mode");
+            return (Criteria) this;
+        }
+
+        public Criteria andModeGreaterThan(Long value) {
+            addCriterion("`mode` >", value, "mode");
+            return (Criteria) this;
+        }
+
+        public Criteria andModeGreaterThanOrEqualTo(Long value) {
+            addCriterion("`mode` >=", value, "mode");
+            return (Criteria) this;
+        }
+
+        public Criteria andModeLessThan(Long value) {
+            addCriterion("`mode` <", value, "mode");
+            return (Criteria) this;
+        }
+
+        public Criteria andModeLessThanOrEqualTo(Long value) {
+            addCriterion("`mode` <=", value, "mode");
+            return (Criteria) this;
+        }
+
+        public Criteria andModeIn(List<Long> values) {
+            addCriterion("`mode` in", values, "mode");
+            return (Criteria) this;
+        }
+
+        public Criteria andModeNotIn(List<Long> values) {
+            addCriterion("`mode` not in", values, "mode");
+            return (Criteria) this;
+        }
+
+        public Criteria andModeBetween(Long value1, Long value2) {
+            addCriterion("`mode` between", value1, value2, "mode");
+            return (Criteria) this;
+        }
+
+        public Criteria andModeNotBetween(Long value1, Long value2) {
+            addCriterion("`mode` not between", value1, value2, "mode");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

backend/src/main/java/io/dataease/base/mapper/VAuthModelMapper.xml

@@ -10,6 +10,7 @@
     <result column="auth_type" jdbcType="VARCHAR" property="authType" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
     <result column="level" jdbcType="BIGINT" property="level" />
+    <result column="mode" jdbcType="BIGINT" property="mode" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.base.domain.VAuthModelWithBLOBs">
     <result column="name" jdbcType="LONGVARCHAR" property="name" />
@@ -74,7 +75,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, pid, node_type, model_type, model_inner_type, auth_type, create_by, `level`
+    id, pid, node_type, model_type, model_inner_type, auth_type, create_by, `level`, 
+    `mode`
   </sql>
   <sql id="Blob_Column_List">
     `name`, `label`
@@ -118,12 +120,12 @@
   <insert id="insert" parameterType="io.dataease.base.domain.VAuthModelWithBLOBs">
     insert into v_auth_model (id, pid, node_type, 
       model_type, model_inner_type, auth_type, 
-      create_by, `level`, `name`, 
-      `label`)
+      create_by, `level`, `mode`, 
+      `name`, `label`)
     values (#{id,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, #{nodeType,jdbcType=VARCHAR}, 
       #{modelType,jdbcType=VARCHAR}, #{modelInnerType,jdbcType=VARCHAR}, #{authType,jdbcType=VARCHAR}, 
-      #{createBy,jdbcType=VARCHAR}, #{level,jdbcType=BIGINT}, #{name,jdbcType=LONGVARCHAR}, 
-      #{label,jdbcType=LONGVARCHAR})
+      #{createBy,jdbcType=VARCHAR}, #{level,jdbcType=BIGINT}, #{mode,jdbcType=BIGINT}, 
+      #{name,jdbcType=LONGVARCHAR}, #{label,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.base.domain.VAuthModelWithBLOBs">
     insert into v_auth_model
@@ -152,6 +154,9 @@
       <if test="level != null">
         `level`,
       </if>
+      <if test="mode != null">
+        `mode`,
+      </if>
       <if test="name != null">
         `name`,
       </if>
@@ -184,6 +189,9 @@
       <if test="level != null">
         #{level,jdbcType=BIGINT},
       </if>
+      <if test="mode != null">
+        #{mode,jdbcType=BIGINT},
+      </if>
       <if test="name != null">
         #{name,jdbcType=LONGVARCHAR},
       </if>
@@ -225,6 +233,9 @@
       <if test="record.level != null">
         `level` = #{record.level,jdbcType=BIGINT},
       </if>
+      <if test="record.mode != null">
+        `mode` = #{record.mode,jdbcType=BIGINT},
+      </if>
       <if test="record.name != null">
         `name` = #{record.name,jdbcType=LONGVARCHAR},
       </if>
@@ -246,6 +257,7 @@
       auth_type = #{record.authType,jdbcType=VARCHAR},
       create_by = #{record.createBy,jdbcType=VARCHAR},
       `level` = #{record.level,jdbcType=BIGINT},
+      `mode` = #{record.mode,jdbcType=BIGINT},
       `name` = #{record.name,jdbcType=LONGVARCHAR},
       `label` = #{record.label,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -261,7 +273,8 @@
       model_inner_type = #{record.modelInnerType,jdbcType=VARCHAR},
       auth_type = #{record.authType,jdbcType=VARCHAR},
       create_by = #{record.createBy,jdbcType=VARCHAR},
-      `level` = #{record.level,jdbcType=BIGINT}
+      `level` = #{record.level,jdbcType=BIGINT},
+      `mode` = #{record.mode,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>

backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml

@@ -18,6 +18,7 @@
 		v_auth_model.auth_type,
 		v_auth_model.create_by,
 		v_auth_model.level,
+		v_auth_model.mode,
 		authInfo.PRIVILEGES AS `privileges`
 	FROM
 		( SELECT GET_V_AUTH_MODEL_ID_P_USE ( #{request.userId}, #{request.modelType} ) cids ) t,

frontend/src/components/canvas/components/Editor/ViewTrackBar.vue

@@ -31,7 +31,10 @@ export default {
   },
   methods: {
     trackButtonClick() {
-      this.$refs.trackButton.click()
+      const _this = this
+      setTimeout(() => {
+        _this.$refs.trackButton.click()
+      }, 50)
     },
     trackMenuClick(menu) {
       this.$emit('trackClick', menu)

frontend/src/views/chart/components/ChartComponentG2.vue

@@ -10,7 +10,6 @@
 
 <script>
 import { baseLiquid } from '@/views/chart/chart/liquid/liquid'
-// import eventBus from '@/components/canvas/utils/eventBus'
 import { uuid } from 'vue-uuid'
 import ViewTrackBar from '@/components/canvas/components/Editor/ViewTrackBar'
 import { hexColorToRGBA } from '@/views/chart/chart/util'
@@ -183,15 +182,7 @@ export default {
       if (this.antVRenderStatus) {
         this.myChart.render()
       }
-      // } else {
-      //   if (this.myChart) {
-      //     this.antVRenderStatus = false
-      //     this.myChart.destroy()
-      //   }
-      // }
-
       this.setBackGroundBorder()
-      // console.log(JSON.stringify(chart_option))
     },
 
     antVAction(param) {
@@ -205,20 +196,10 @@ export default {
         this.trackClick(this.trackMenu[0])
       } else { // 视图关联多个事件
         this.trackBarStyle.left = param.x + 'px'
-        this.trackBarStyle.top = (param.y - 15) + 'px'
+        this.trackBarStyle.top = (param.y + 10) + 'px'
         this.$refs.viewTrack.trackButtonClick()
       }
     },
-
-    // myEcharts(option) {
-    //   // 指定图表的配置项和数据
-    //   const chart = this.myChart
-    //   this.setBackGroundBorder()
-    //   setTimeout(chart.setOption(option, true), 500)
-    //   window.onresize = function() {
-    //     chart.resize()
-    //   }
-    // },
     setBackGroundBorder() {
       if (this.chart.customStyle) {
         const customStyle = JSON.parse(this.chart.customStyle)

frontend/src/views/dataset/add/AddDB.vue

@@ -100,6 +100,7 @@ export default {
         for (let i = 0; i < this.options.length; i++) {
           if (this.options[i].id === val) {
             this.selectedDatasource = this.options[i]
+            this.mode = '0'
           }
         }
       }
@@ -133,8 +134,6 @@ export default {
       })
     },
     save() {
-      // console.log(this.checkTableList);
-      // console.log(this.scene);
       let ds = {}
       this.options.forEach(ele => {
         if (ele.id === this.dataSource) {
@@ -158,7 +157,6 @@ export default {
         })
       })
       post('/dataset/table/batchAdd', tables).then(response => {
-        // this.$store.dispatch('dataset/setSceneData', new Date().getTime())
         this.$emit('saveSuccess', tables[0])
         this.cancel()
       })
@@ -166,7 +164,6 @@ export default {
 
     cancel() {
       this.dataReset()
-      // this.$router.push('/dataset/home')
       this.$emit('switchComponent', { name: '' })
     },