From a8b9a4fbb2248da28ded7a0278d42f869ee1d87d Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 16 Jun 2021 18:03:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=E4=B8=8D?=
 =?UTF-8?q?=E7=AD=89=E4=BA=8E=20=E4=B8=8D=E5=8C=85=E5=90=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/auth/config/F2CRealm.java     | 14 ++++-
 .../condition-table/DeComplexInput.vue        | 53 ++++++++++++++++
 .../condition-table/DeComplexOperator.vue     | 62 +++++++++++++++++++
 frontend/src/main.js                          |  2 +
 frontend/src/views/system/user/index.vue      |  3 +-
 5 files changed, 129 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/components/business/condition-table/DeComplexInput.vue
 create mode 100644 frontend/src/components/business/condition-table/DeComplexOperator.vue

diff --git a/backend/src/main/java/io/dataease/auth/config/F2CRealm.java b/backend/src/main/java/io/dataease/auth/config/F2CRealm.java
index 29c269f10f..1f0ee7e60d 100644
--- a/backend/src/main/java/io/dataease/auth/config/F2CRealm.java
+++ b/backend/src/main/java/io/dataease/auth/config/F2CRealm.java
@@ -60,10 +60,18 @@ public class F2CRealm extends AuthorizingRealm {
             CacheUtils.get("lic_info", "lic");
         }catch (Exception e) {
             LogUtil.error(e);
+            throw new AuthenticationException("lic error");
         }
-        String token = (String) auth.getCredentials();
-        // 解密获得username，用于和数据库进行对比
-        TokenInfo tokenInfo = JWTUtils.tokenInfoByToken(token);
+        TokenInfo tokenInfo = null;
+        String token = null;
+        try {
+            token = (String) auth.getCredentials();
+            // 解密获得username，用于和数据库进行对比
+            tokenInfo = JWTUtils.tokenInfoByToken(token);
+        }catch (Exception e) {
+            throw new AuthenticationException(e);
+        }
+
         Long userId = tokenInfo.getUserId();
         String username = tokenInfo.getUsername();
         if (username == null) {
diff --git a/frontend/src/components/business/condition-table/DeComplexInput.vue b/frontend/src/components/business/condition-table/DeComplexInput.vue
new file mode 100644
index 0000000000..9ff39ac3bf
--- /dev/null
+++ b/frontend/src/components/business/condition-table/DeComplexInput.vue
@@ -0,0 +1,53 @@
+<template>
+  <de-complex-operator v-model="operator" :label="label" :operators="operators" :size="configSize">
+    <el-input v-model="value" :placeholder="$t('fu.search_bar.please_input')" :size="configSize" v-bind="$attrs" />
+  </de-complex-operator>
+</template>
+
+<script>
+import { ComplexCondition } from 'fit2cloud-ui/src/components/search-bar/model'
+// import mixins from 'fit2cloud-ui/src/components/search-bar/complex-components/mixins'
+import DeComplexOperator from './DeComplexOperator.vue'
+import Cookies from 'js-cookie'
+export default {
+  name: 'DeComplexInput',
+  components: { DeComplexOperator },
+  //   mixins: [mixins],
+  props: {
+    field: String,
+    label: String,
+    defaultOperator: {
+      type: String,
+      default: 'like'
+    }
+  },
+  data() {
+    return {
+      operator: this.defaultOperator,
+      value: '',
+      operators: [{
+        label: 'fu.search_bar.like',
+        value: 'like'
+      }, {
+        label: 'fu.search_bar.eq',
+        value: 'eq'
+      }]
+    }
+  },
+  computed: {
+    configSize() {
+      return Cookies.get('size') || 'medium'
+    }
+  },
+  methods: {
+    getCondition() {
+      if (!this.value) return
+      const { field, label, operator, operatorLabel, value } = this
+      return new ComplexCondition({ field, label, operator, operatorLabel, value })
+    },
+    init() {
+      this.value = ''
+    }
+  }
+}
+</script>
diff --git a/frontend/src/components/business/condition-table/DeComplexOperator.vue b/frontend/src/components/business/condition-table/DeComplexOperator.vue
new file mode 100644
index 0000000000..1feec41b1d
--- /dev/null
+++ b/frontend/src/components/business/condition-table/DeComplexOperator.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="fu-operator-component">
+    <div :class="['fu-operator-component__label', 'fu-operator-component__label--' + configSize]">
+      {{ label }}
+    </div>
+    <div class="fu-operator-component__operator">
+      <el-select
+        v-model="value"
+        class="search-operator"
+        :placeholder="$t('fu.search_bar.please_select')"
+        :size="configSize"
+        @change="change"
+        @input="change"
+      >
+        <el-option v-for="o in operators" :key="o.value" :label="$t(o.label)" :value="o.value" />
+      </el-select>
+    </div>
+    <div class="fu-operator-component__value">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import Cookies from 'js-cookie'
+export default {
+  name: 'DeComplexOperator',
+  model: {
+    prop: 'operator',
+    event: 'change'
+  },
+  props: {
+    label: String,
+    operator: String,
+    operators: Array
+  },
+  data() {
+    return {
+      value: this.operator
+    }
+  },
+  computed: {
+    configSize() {
+      return Cookies.get('size') || 'medium'
+    }
+  },
+  watch: {
+    operator: function(v) {
+      this.value = v
+    }
+  },
+  methods: {
+    change(value) {
+      this.$emit('change', value)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/main.js b/frontend/src/main.js
index ada2849a15..2dc827327e 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -20,6 +20,7 @@ import widgets from '@/components/widget'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import './utils/dialog'
+import DeComplexInput from '@/components/business/condition-table/DeComplexInput'
 
 import '@/components/canvas/custom-component' // 注册自定义组件
 Vue.config.productionTip = false
@@ -69,6 +70,7 @@ Vue.use(filter)
 Vue.use(directives)
 Vue.use(message)
 Vue.component('Treeselect', Treeselect)
+Vue.component('DeComplexInput', DeComplexInput)
 Vue.config.productionTip = false
 
 Vue.prototype.hasDataPermission = function(pTarget, pSource) {
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 2cfa1a189c..fe93048dd3 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -162,7 +162,6 @@
 <script>
 import LayoutContent from '@/components/business/LayoutContent'
 import ComplexTable from '@/components/business/complex-table'
-
 // import { checkPermission } from '@/utils/permission'
 import { formatCondition, formatQuickCondition, addOrder, formatOrders } from '@/utils/index'
 import { PHONE_REGEX } from '@/utils/validate'
@@ -199,7 +198,7 @@ export default {
         useComplexSearch: true,
         quickPlaceholder: '按姓名搜索',
         components: [
-          { field: 'nick_name', label: '姓名', component: 'FuComplexInput' },
+          { field: 'nick_name', label: '姓名', component: 'DeComplexInput' },
           {
             field: 'u.enabled',
             label: '状态',

From 2d35f27ee3216ac1e4cef9db63b12c713ab88d1b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 16 Jun 2021 18:05:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E9=BB=98=E8=AE=A4=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=98=E6=8C=87=E5=90=91=E6=BA=90=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/panel/PanelGroupService.java   | 6 +++++-
 frontend/src/views/panel/list/PanelList.vue                 | 4 +---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index 845ec708b1..6fd619b435 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -141,7 +141,11 @@ public class PanelGroupService {
 
 
     public PanelGroupWithBLOBs findOne(String panelId) {
-        return panelGroupMapper.selectByPrimaryKey(panelId);
+        PanelGroupWithBLOBs panelGroupWithBLOBs = panelGroupMapper.selectByPrimaryKey(panelId);
+        if(panelGroupWithBLOBs!=null&& StringUtils.isNotEmpty(panelGroupWithBLOBs.getSource())){
+            return  panelGroupMapper.selectByPrimaryKey(panelGroupWithBLOBs.getSource());
+        }
+        return panelGroupWithBLOBs;
     }
 
 
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index cc2a2ac2f4..fa8e991f71 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -575,9 +575,7 @@ export default {
       this.activeTree = data.panelType
       if (data.nodeType === 'panel') {
         // 加载视图数据
-        // 如果是默认仪表盘 需要查询原仪表板的详细数据
-        const queryPanelId = data.panelType === 'system' ? data.source : data.id
-        findOne(queryPanelId).then(response => {
+        findOne(data.id).then(response => {
           const componentDatas = JSON.parse(response.data.panelData)
           componentDatas.forEach(item => {
             item.filters = (item.filters || [])