@@ -94,7 +94,7 @@ const util = {
dataHandle(item, val) {
// 改变字体颜色
if (val) {
- item.nameNodes = util.serachNmme(val, item.name);
+ item.nameNodes = util.searchNmme(val, item.name);
} else {
item.nameNodes = `
Date: Mon, 24 Oct 2022 17:31:36 +0800
Subject: [PATCH 11/53] =?UTF-8?q?perf(=E5=B9=B3=E5=8F=B0=E5=AF=B9=E6=8E=A5?=
=?UTF-8?q?):=20=E4=BC=98=E5=8C=96=E9=A3=9E=E4=B9=A6=E5=9B=BD=E9=99=85?=
=?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/io/dataease/plugins/server/XLarksuiteServer.java | 2 +-
frontend/src/views/login/index.vue | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java b/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java
index 52223daff3..64d9506cfb 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XLarksuiteServer.java
@@ -101,7 +101,7 @@ public class XLarksuiteServer {
String email = StringUtils.isNotBlank(larkUserInfo.getEmail()) ? larkUserInfo.getEmail() : (username + "@larksuite.work");
sysUserService.validateExistUser(username, larkUserInfo.getName(), email);
sysUserService.saveLarksuiteCUser(larkUserInfo, email);
- sysUserEntity = authUserService.getUserByLarkId(username);
+ sysUserEntity = authUserService.getUserByLarksuiteId(username);
}
TokenInfo tokenInfo = TokenInfo.builder().userId(sysUserEntity.getUserId()).username(sysUserEntity.getUsername()).build();
String realPwd = sysUserEntity.getPassword();
diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue
index 56e1e88565..e5881db818 100644
--- a/frontend/src/views/login/index.vue
+++ b/frontend/src/views/login/index.vue
@@ -379,6 +379,11 @@ export default {
this.switchCodeIndex(6)
}
this.clearLarkMsg()
+
+ if (Cookies.get('LarksuiteError')) {
+ this.$error(Cookies.get('LarksuiteError'))
+ }
+ this.clearLarksuiteMsg()
},
methods: {
From 716328444e8b08217de92edaa3188387930990f6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 24 Oct 2022 17:33:31 +0800
Subject: [PATCH 12/53] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20Tab?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=86=85=E7=9A=84=E8=BF=87=E6=BB=A4=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6=E4=BD=9C=E7=94=A8=E5=9F=9F=E4=BB=85=E9=99=90=E4=BA=8E?=
=?UTF-8?q?=E5=BD=93=E5=89=8DTab=E9=A1=B5=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/Editor/ComponentWrapper.vue | 6 +++++
.../canvas/components/Editor/DeEditor.vue | 14 +++++++----
.../canvas/components/Editor/Preview.vue | 5 +++-
.../canvas/custom-component/UserView.vue | 4 ++++
.../src/components/dataease/DeOutWidget.vue | 5 ++++
.../src/components/widget/DeWidget/DeDate.vue | 5 ++++
.../widget/DeWidget/DeInputSearch.vue | 5 ++++
.../widget/DeWidget/DeNumberRange.vue | 5 ++++
.../components/widget/DeWidget/DeSelect.vue | 5 ++++
.../widget/DeWidget/DeSelectGrid.vue | 5 ++++
.../widget/DeWidget/DeSelectTree.vue | 5 ++++
frontend/src/store/index.js | 23 +++++++++++--------
12 files changed, 71 insertions(+), 16 deletions(-)
diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 030ca7e218..cf18c101c3 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -41,12 +41,14 @@
:in-screen="inScreen"
:edit-mode="'preview'"
:h="config.style.height"
+ :canvas-id="canvasId"
/>
0 ? newX : 1
newY = newY > 0 ? newY : 1
- console.log("moveTabCollisionActive="+this.moveTabCollisionActive)
if (this.moveTabCollisionActive) {
return
}
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 8cbdc8b2ba..235c43e11b 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -43,6 +43,7 @@
:key="index"
ref="viewWrapperChild"
:config="item"
+ :canvas-id="canvasId"
:source-config="componentData[index]"
:search-count="searchCount"
:in-screen="inScreen"
@@ -440,7 +441,9 @@ export default {
} else {
this.scaleHeight = canvasHeight * 100 / this.canvasStyleData.height// 获取高度比
}
- this.$store.commit('setPreviewCanvasScale', { scaleWidth: (this.scaleWidth / 100), scaleHeight: (this.scaleHeight / 100) })
+ if(this.canvasId === 'canvas-main'){
+ this.$store.commit('setPreviewCanvasScale', { scaleWidth: (this.scaleWidth / 100), scaleHeight: (this.scaleHeight / 100) })
+ }
this.handleScaleChange()
},
resetID(data) {
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index a47f7cf719..9a0bd6ae43 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -216,6 +216,10 @@ export default {
name: 'UserView',
components: { UserViewDialog, DeRichTextView, LabelNormalText, PluginCom, ChartComponentS2, EditBarView, ChartComponent, TableNormal, LabelNormal, DrillPath, ChartComponentG2 },
props: {
+ canvasId: {
+ type: String,
+ required: true
+ },
element: {
type: Object,
default: null
diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue
index 46aa53326e..4d567a5a60 100644
--- a/frontend/src/components/dataease/DeOutWidget.vue
+++ b/frontend/src/components/dataease/DeOutWidget.vue
@@ -39,6 +39,7 @@
:is="element.component"
v-if="element.type==='custom'"
:id="'component' + element.id"
+ :canvas-id="canvasId"
ref="deOutWidget"
class="component-custom"
:out-style="element.style"
@@ -64,6 +65,10 @@ export default {
name: 'DeOutWidget',
mixins: [inputStyleMixin],
props: {
+ canvasId: {
+ type: String,
+ required: true
+ },
element: {
type: Object,
default: () => {}
diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue
index f054608404..f28e8f5807 100644
--- a/frontend/src/components/widget/DeWidget/DeDate.vue
+++ b/frontend/src/components/widget/DeWidget/DeDate.vue
@@ -35,6 +35,10 @@ import customInput from '@/components/widget/DeWidget/customInput'
export default {
mixins: [customInput],
props: {
+ canvasId: {
+ type: String,
+ required: true
+ },
element: {
type: Object,
default: null
@@ -221,6 +225,7 @@ export default {
},
getCondition() {
const param = {
+ canvasId: this.canvasId,
component: this.element,
value: this.formatFilterValue(),
operator: this.operator
diff --git a/frontend/src/components/widget/DeWidget/DeInputSearch.vue b/frontend/src/components/widget/DeWidget/DeInputSearch.vue
index c09179631f..e54b9e554e 100644
--- a/frontend/src/components/widget/DeWidget/DeInputSearch.vue
+++ b/frontend/src/components/widget/DeWidget/DeInputSearch.vue
@@ -27,6 +27,10 @@ import bus from '@/utils/bus'
export default {
props: {
+ canvasId: {
+ type: String,
+ required: true
+ },
element: {
type: Object,
default: null
@@ -104,6 +108,7 @@ export default {
},
getCondition() {
const param = {
+ canvasId: this.canvasId,
component: this.element,
value: !this.value ? [] : Array.isArray(this.value) ? this.value : [this.value],
operator: this.operator
diff --git a/frontend/src/components/widget/DeWidget/DeNumberRange.vue b/frontend/src/components/widget/DeWidget/DeNumberRange.vue
index cbaca4a51d..d3340508dd 100644
--- a/frontend/src/components/widget/DeWidget/DeNumberRange.vue
+++ b/frontend/src/components/widget/DeWidget/DeNumberRange.vue
@@ -47,6 +47,10 @@ import bus from '@/utils/bus'
export default {
props: {
+ canvasId: {
+ type: String,
+ required: true
+ },
element: {
type: Object,
default: null
@@ -230,6 +234,7 @@ export default {
},
getCondition() {
const param = {
+ canvasId: this.canvasId,
component: this.element,
value: [this.form.min, this.form.max],
operator: this.operator
diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue
index e63f7bcb96..ea96a77484 100644
--- a/frontend/src/components/widget/DeWidget/DeSelect.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelect.vue
@@ -52,6 +52,10 @@ export default {
components: { ElVisualSelect },
mixins: [customInput],
props: {
+ canvasId: {
+ type: String,
+ required: true
+ },
element: {
type: Object,
default: () => {}
@@ -311,6 +315,7 @@ export default {
},
getCondition() {
const param = {
+ canvasId: this.canvasId,
component: this.element,
value: this.formatFilterValue(),
operator: this.operator
diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
index d4f4c57ec4..75e7758c6f 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
@@ -73,6 +73,10 @@ import { attrsMap, styleAttrs, textSelectGridWidget } from '@/components/widget/
export default {
props: {
+ canvasId: {
+ type: String,
+ required: true
+ },
element: {
type: Object,
default: null
@@ -312,6 +316,7 @@ export default {
},
getCondition() {
const param = {
+ canvasId: this.canvasId,
component: this.element,
value: this.formatFilterValue(),
operator: this.operator
diff --git a/frontend/src/components/widget/DeWidget/DeSelectTree.vue b/frontend/src/components/widget/DeWidget/DeSelectTree.vue
index 96232638f2..77950175d1 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectTree.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectTree.vue
@@ -36,6 +36,10 @@ export default {
components: { ElTreeSelect },
mixins: [customInput],
props: {
+ canvasId: {
+ type: String,
+ required: true
+ },
element: {
type: Object,
default: () => {}
@@ -298,6 +302,7 @@ export default {
const val = this.formatFilterValue()
const param = {
+ canvasId: this.canvasId,
component: this.element,
value: val,
operator: this.operator,
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index d16d0ea15f..5b220ff0d7 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -164,7 +164,7 @@ const data = {
...snapshot.mutations,
...lock.mutations,
- setTabActiveTabNameMap(state, tabActiveInfo){
+ setTabActiveTabNameMap(state, tabActiveInfo) {
state.tabActiveTabNameMap[tabActiveInfo.tabId] = tabActiveInfo.activeTabName
},
@@ -288,6 +288,13 @@ const data = {
const vValid = valueValid(condition)
// 1.根据componentId过滤
const filterComponentId = condition.componentId
+ const canvasId = data.canvasId
+
+ //过滤时 主画布的过滤组件可以过滤所有的视图
+ const canvasViewIds = state.componentData.filter(item => item.type === 'view' && (canvasId === 'canvas-main' || item.canvasId === canvasId)).map((itemView) => {
+ return itemView.propValue.viewId
+ })
+ const canvasViewIdMatch = (viewId) => canvasViewIds && canvasViewIds.length > 0 && canvasViewIds.includes(viewId)
// 2.循环每个Component 得到 三种情况 a增加b删除c无操作
const viewIdMatch = (viewIds, viewId) => !viewIds || viewIds.length === 0 || viewIds.includes(viewId)
@@ -317,7 +324,7 @@ const data = {
}
if (!element.type || element.type !== 'view') continue
const currentFilters = element.filters || []
- const vidMatch = viewIdMatch(condition.viewIds, element.propValue.viewId)
+ const vidMatch = viewIdMatch(condition.viewIds, element.propValue.viewId) && canvasViewIdMatch(element.propValue.viewId)
let j = currentFilters.length
while (j--) {
const filter = currentFilters[j]
@@ -484,12 +491,8 @@ const data = {
}
}
},
-
- deleteComponent(state, index) {
- if (index === undefined) {
- index = state.curComponentIndex
- }
- state.componentData.splice(index, 1)
+ deleteComponent(state) {
+ this.commit('deleteComponentWithId',state.curComponent.id)
},
setLinkageInfo(state, targetLinkageInfo) {
state.linkageSettingStatus = true
@@ -752,13 +755,13 @@ const data = {
setTabMoveOutComponentId(state, componentId) {
state.tabMoveOutComponentId = componentId
},
- clearTabMoveInfo(state){
+ clearTabMoveInfo(state) {
state.tabMoveInActiveId = null
state.tabCollisionActiveId = null
state.tabMoveOutActiveId = null
state.tabMoveOutComponentId = null
},
- setMousePointShadowMap(state,mousePoint){
+ setMousePointShadowMap(state, mousePoint) {
state.mousePointShadowMap.mouseX = mousePoint.mouseX
state.mousePointShadowMap.mouseY = mousePoint.mouseY
state.mousePointShadowMap.width = mousePoint.width
From 6348dc69333b6b4ed1c1b01fdac62c8b582821ec Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 24 Oct 2022 18:05:23 +0800
Subject: [PATCH 13/53] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
=?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=A7=86=E5=9B=BE=E9=BB=98=E8=AE=A4=E5=8A=A0?=
=?UTF-8?q?=E5=88=B0=E4=B8=BB=E7=94=BB=E5=B8=83=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/views/panel/edit/index.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index f14c8c6664..143359d895 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -1297,6 +1297,8 @@ export default {
component.x = 1
component.y = 1
}
+ component['canvasId'] = 'canvas-main'
+ component['canvasPid'] = '0'
component.id = newComponentId
// 统一设置背景信息
component.commonBackground = deepCopy(COMMON_BACKGROUND)
From bf92ddaa4edbfe8bf8edb3c83d2822d1d134639d Mon Sep 17 00:00:00 2001
From: taojinlong
Date: Tue, 25 Oct 2022 13:44:53 +0800
Subject: [PATCH 14/53] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=20Kylin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/src/main/resources/db/migration/V42__1.16.sql | 2 ++
1 file changed, 2 insertions(+)
diff --git a/backend/src/main/resources/db/migration/V42__1.16.sql b/backend/src/main/resources/db/migration/V42__1.16.sql
index 7644233454..4b3ab2f784 100644
--- a/backend/src/main/resources/db/migration/V42__1.16.sql
+++ b/backend/src/main/resources/db/migration/V42__1.16.sql
@@ -31,3 +31,5 @@ WHERE (`msg_type_id` = 6);
ALTER TABLE `sys_user_assist`
ADD COLUMN `larksuite_id` VARCHAR(255) NULL DEFAULT NULL AFTER `lark_id`;
+
+ALTER TABLE `dataset_table_field` CHANGE COLUMN `type` `type` VARCHAR(255) NOT NULL COMMENT '原始字段类型' ;
From afa581c1d286b3e6d93eb7a2f4481c71ddfe9aa4 Mon Sep 17 00:00:00 2001
From: taojinlong
Date: Tue, 25 Oct 2022 14:28:43 +0800
Subject: [PATCH 15/53] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=20Kylin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/src/main/resources/db/migration/V42__1.16.sql | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/backend/src/main/resources/db/migration/V42__1.16.sql b/backend/src/main/resources/db/migration/V42__1.16.sql
index 4b3ab2f784..db7fbd29ef 100644
--- a/backend/src/main/resources/db/migration/V42__1.16.sql
+++ b/backend/src/main/resources/db/migration/V42__1.16.sql
@@ -33,3 +33,8 @@ ALTER TABLE `sys_user_assist`
ADD COLUMN `larksuite_id` VARCHAR(255) NULL DEFAULT NULL AFTER `lark_id`;
ALTER TABLE `dataset_table_field` CHANGE COLUMN `type` `type` VARCHAR(255) NOT NULL COMMENT '原始字段类型' ;
+
+INSERT INTO `my_plugin` (`name`, `store`, `free`, `cost`, `category`, `descript`, `version`, `creator`, `load_mybatis`,
+ `install_time`, `module_name`, `ds_type`)
+VALUES ('Apache Kylin 数据源插件', 'default', '0', '0', 'datasource', 'Apache Kylin 数据源插件', '1.0-SNAPSHOT', 'DATAEASE', '0',
+ '1650765903630', 'kylin-backend', 'kylin');
\ No newline at end of file
From 0f3c4b558028224f83e814bcfdbeeb7b55034b3a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw
Date: Tue, 25 Oct 2022 16:03:24 +0800
Subject: [PATCH 16/53] =?UTF-8?q?perf(=E8=A7=86=E5=9B=BE-=E5=9C=B0?=
=?UTF-8?q?=E5=9B=BE):=20=E5=88=86=E7=A6=BB=E6=B8=90=E5=8F=98=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/GradientColorSelector/base.js | 71 +++++++++++++-
.../GradientColorSelector/index.vue | 97 +++++++++++++------
frontend/src/lang/en.js | 3 +
frontend/src/lang/tw.js | 3 +
frontend/src/lang/zh.js | 3 +
5 files changed, 149 insertions(+), 28 deletions(-)
diff --git a/frontend/src/components/GradientColorSelector/base.js b/frontend/src/components/GradientColorSelector/base.js
index 557047a9a5..bf88a65f75 100644
--- a/frontend/src/components/GradientColorSelector/base.js
+++ b/frontend/src/components/GradientColorSelector/base.js
@@ -86,7 +86,7 @@ export const colorCases = [
export const gradientColorCases = [
{
name: '渐变色1',
- value: 'gradient1',
+ value: 'gradient1_continuous_gradient',
colors: [
['rgba(144,202,249,0.5)', 'rgba(1,87,155,0.9)'],
['rgba(127,222,234,1)', 'rgba(0,77,65,1)'],
@@ -101,3 +101,72 @@ export const gradientColorCases = [
export const isGradientValue = value => {
return value && gradientColorCases.some(item => item.value === value)
}
+
+export const getColorType = value => {
+ if (value.endsWith('_split_gradient')) {
+ return 'split_gradient'
+ }
+ const cloneColorCases = JSON.parse(JSON.stringify(colorCases))
+ if (cloneColorCases.some(item => item.value === value)) {
+ return 'simple'
+ }
+ return 'gradient'
+}
+
+export const getMapColorCases = () => {
+ const cloneColorCases = JSON.parse(JSON.stringify(colorCases))
+ return cloneColorCases.map(colorItem => {
+ const curColors = colorItem.colors
+ const len = curColors.length
+ const start = curColors[0]
+ const end = curColors[len - 1]
+ const itemResult = {
+ name: colorItem.name,
+ value: colorItem.value + '_split_gradient',
+ baseColors: [start, end],
+ colors: stepsColor(start, end, 9, 1)
+ }
+ return itemResult
+ })
+}
+
+export function stepsColor(start, end, steps, gamma) {
+ var i; var j; var ms; var me; var output = []; var so = []
+ gamma = gamma || 1
+ var normalize = function(channel) {
+ return Math.pow(channel / 255, gamma)
+ }
+ start = parseColor(start).map(normalize)
+ end = parseColor(end).map(normalize)
+ for (i = 0; i < steps; i++) {
+ ms = (steps - 1) === 0 ? 0 : (i / (steps - 1))
+ me = 1 - ms
+ for (j = 0; j < 3; j++) {
+ so[j] = pad(
+ Math.round(
+ Math.pow(start[j] * me + end[j] * ms, 1 / gamma) * 255
+ ).toString(16)
+ )
+ }
+ output.push('#' + so.join(''))
+ }
+ function parseColor(hexStr) {
+ return hexStr.length === 4
+ ? hexStr
+ .substr(1)
+ .split('')
+ .map(function(s) {
+ return 0x11 * parseInt(s, 16)
+ })
+ : [hexStr.substr(1, 2), hexStr.substr(3, 2), hexStr.substr(5, 2)].map(
+ function(s) {
+ return parseInt(s, 16)
+ }
+ )
+ }
+ function pad(s) {
+ return s.length === 1 ? '0' + s : s
+ }
+ return output
+}
+
diff --git a/frontend/src/components/GradientColorSelector/index.vue b/frontend/src/components/GradientColorSelector/index.vue
index 48da711b0d..6acae31b81 100644
--- a/frontend/src/components/GradientColorSelector/index.vue
+++ b/frontend/src/components/GradientColorSelector/index.vue
@@ -20,7 +20,7 @@
@@ -38,7 +38,7 @@
-
+
+
+
+
+
+
diff --git a/frontend/src/views/panel/appTemplate/component/TemplateItem.vue b/frontend/src/views/panel/appTemplate/component/TemplateItem.vue
index b86fbee65c..fe456be986 100644
--- a/frontend/src/views/panel/appTemplate/component/TemplateItem.vue
+++ b/frontend/src/views/panel/appTemplate/component/TemplateItem.vue
@@ -12,7 +12,7 @@
alt=""
>
- ${item.name}
`;
@@ -130,9 +130,9 @@ const util = {
setHistory(val) {
let searchHistory = uni.getStorageSync('search:history');
if (!searchHistory) searchHistory = [];
- let serachData = {};
+ let searchData = {};
if (typeof(val) === 'string') {
- serachData = {
+ searchData = {
adcode: [],
address: [],
city: [],
@@ -143,18 +143,18 @@ const util = {
typecode: []
};
} else {
- serachData = val
+ searchData = val
}
// 判断数组是否存在，如果存在，那么将放到最前面
for (var i = 0; i < searchHistory.length; i++) {
- if (searchHistory[i].name === serachData.name) {
+ if (searchHistory[i].name === searchData.name) {
searchHistory.splice(i, 1);
break;
}
}
- searchHistory.unshift(util.dataHandle(serachData));
+ searchHistory.unshift(util.dataHandle(searchData));
uni.setStorage({
key: 'search:history',
data: searchHistory,
diff --git a/mobile/src/components/uni-link/uni-link.vue b/mobile/src/components/uni-link/uni-link.vue
index 27c5468e1a..05f3618284 100644
--- a/mobile/src/components/uni-link/uni-link.vue
+++ b/mobile/src/components/uni-link/uni-link.vue
@@ -25,7 +25,7 @@
* @tutorial https://ext.dcloud.net.cn/plugin?id=1182
* @property {String} href 点击后打开的外部网页url
* @property {String} text 显示的文字
- * @property {String} downlaod H5平台下载文件名
+ * @property {String} download H5平台下载文件名
* @property {Boolean} showUnderLine 是否显示下划线
* @property {String} copyTips 在小程序端复制链接时显示的提示语
* @property {String} color 链接文字颜色
diff --git a/mobile/src/pages/tabBar/home/detail.nvue b/mobile/src/pages/tabBar/home/detail.nvue
index 3c27d40dfc..82183a8d87 100644
--- a/mobile/src/pages/tabBar/home/detail.nvue
+++ b/mobile/src/pages/tabBar/home/detail.nvue
@@ -116,7 +116,7 @@
index: 1
})
this.loadStarStatus()
- this.caclViewHeight()
+ this.calcViewHeight()
},
@@ -194,7 +194,7 @@
})
},
- caclViewHeight() {
+ calcViewHeight() {
let systemInfo = uni.getSystemInfoSync()
const h5Height = systemInfo.windowHeight - systemInfo.statusBarHeight
if(systemInfo.navigationBarHeight) {
diff --git a/mobile/src/pages/tabBar/home/index.nvue b/mobile/src/pages/tabBar/home/index.nvue
index a1cd90c05e..e58af9b0a4 100644
--- a/mobile/src/pages/tabBar/home/index.nvue
+++ b/mobile/src/pages/tabBar/home/index.nvue
@@ -113,9 +113,9 @@
}
requestHome({type: index, lastTime: activeTab.lastTime}).then(res => {
- var datas = res.data.listObject
- if(datas.length > 0) {
- datas.forEach(item => {
+ var data = res.data.listObject
+ if(data.length > 0) {
+ data.forEach(item => {
item.article_type = 1
item.image_url = '../../../static/yibiaobans.png'
if(item.nickName) {
@@ -124,11 +124,11 @@
if(item.time)
item.rightText = formatHistoryDate(item.time)
})
- activeTab.lastTime = datas[datas.length - 1].time
+ activeTab.lastTime = data[data.length - 1].time
if(replace) {
- activeTab.data = datas
+ activeTab.data = data
}else {
- activeTab.data = activeTab.data.concat(datas)
+ activeTab.data = activeTab.data.concat(data)
}
}
From 93776973d8475fbdfd5febb4f08ca2a64b82adac Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 8cbdc8b2ba..1cf1a3f83f 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -67,16 +67,14 @@ import { uuid } from 'vue-uuid'
import { deepCopy, imgUrlTrans } from '@/components/canvas/utils/utils'
import eventBus from '@/components/canvas/utils/eventBus'
import elementResizeDetectorMaker from 'element-resize-detector'
-import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog'
import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar'
-import UserViewMobileDialog from '@/components/canvas/custom-component/UserViewMobileDialog'
import bus from '@/utils/bus'
import { buildFilterMap, buildViewKeyMap, formatCondition, valueValid, viewIdMatch } from '@/utils/conditionUtil'
import { hasDataPermission } from '@/utils/permission'
const erd = elementResizeDetectorMaker()
export default {
- components: { UserViewMobileDialog, ComponentWrapper, UserViewDialog, CanvasOptBar },
+ components: { ComponentWrapper, CanvasOptBar },
model: {
prop: 'show',
event: 'change'
@@ -141,10 +139,10 @@ export default {
},
data() {
return {
- previewDomId: 'preview-'+this.canvasId,
- previewRefId: 'preview-ref-'+this.canvasId,
- previewTempDomId: 'preview-temp-'+this.canvasId,
- previewTempRefId: 'preview-temp-ref-'+this.canvasId,
+ previewDomId: 'preview-' + this.canvasId,
+ previewRefId: 'preview-ref-' + this.canvasId,
+ previewTempDomId: 'preview-temp-' + this.canvasId,
+ previewTempRefId: 'preview-temp-ref-' + this.canvasId,
isShowPreview: false,
panelId: '',
needToChangeHeight: [
diff --git a/frontend/src/components/canvas/components/Editor/PreviewMobile.vue b/frontend/src/components/canvas/components/Editor/PreviewMobile.vue
index 866a97716e..5a5eac8c9d 100644
--- a/frontend/src/components/canvas/components/Editor/PreviewMobile.vue
+++ b/frontend/src/components/canvas/components/Editor/PreviewMobile.vue
@@ -46,11 +46,10 @@ import { uuid } from 'vue-uuid'
import { deepCopy, imgUrlTrans } from '@/components/canvas/utils/utils'
import eventBus from '@/components/canvas/utils/eventBus'
import elementResizeDetectorMaker from 'element-resize-detector'
-import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog'
import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar'
export default {
- components: { ComponentWrapper, UserViewDialog, CanvasOptBar },
+ components: { ComponentWrapper, CanvasOptBar },
model: {
prop: 'show',
event: 'change'
diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue
index ab657a25fa..7e3b2e874e 100644
--- a/frontend/src/components/canvas/components/TextAttr.vue
+++ b/frontend/src/components/canvas/components/TextAttr.vue
@@ -319,7 +319,10 @@
style="width: 20px;float: left;margin-top: 2px;margin-left: 10px;"
>
-
@@ -601,7 +604,7 @@ export default {
showVertical() {
return !['textSelectGridWidget', 'numberSelectGridWidget'].includes(this.curComponent.serviceName)
},
- curCanvasScaleSelf(){
+ curCanvasScaleSelf() {
return this.curCanvasScaleMap[this.canvasId]
},
...mapState([
diff --git a/frontend/src/components/canvas/utils/utils.js b/frontend/src/components/canvas/utils/utils.js
index 319232a686..d3ab9c2e14 100644
--- a/frontend/src/components/canvas/utils/utils.js
+++ b/frontend/src/components/canvas/utils/utils.js
@@ -136,7 +136,6 @@ export function panelDataPrepare(componentData, componentStyle, callback) {
// 增加所属画布ID（canvasId）当前所在画布的父ID（canvasPid） 主画布ID为main-canvas, PID = 0 表示当前所属canvas为最顶层
item.canvasId = (item.canvasId || 'canvas-main')
item.canvasPid = (item.canvasPid || '0')
-
})
// 初始化密度为最高密度
componentStyle.aidedDesign.matrixBase = 4
@@ -149,7 +148,7 @@ export function panelDataPrepare(componentData, componentStyle, callback) {
export function resetID(data) {
if (data) {
data.forEach(item => {
- item.type !== 'custom' && item.type !== 'de-tabs'&& (item.id = uuid.v1())
+ item.type !== 'custom' && item.type !== 'de-tabs' && (item.id = uuid.v1())
})
}
return data
@@ -229,6 +228,6 @@ export function imgUrlTrans(url) {
}
}
-export function getNowCanvasComponentData(canvasId){
- return store.state.componentData.filter(item => item.canvasId===canvasId)
+export function getNowCanvasComponentData(canvasId) {
+ return store.state.componentData.filter(item => item.canvasId === canvasId)
}
diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue
index 46aa53326e..d813136234 100644
--- a/frontend/src/components/dataease/DeOutWidget.vue
+++ b/frontend/src/components/dataease/DeOutWidget.vue
@@ -58,7 +58,6 @@
diff --git a/frontend/src/views/panel/appTemplate/component/AppTemplateApply.vue b/frontend/src/views/panel/appTemplate/component/AppTemplateApply.vue
new file mode 100644
index 0000000000..2ab5d248a5
--- /dev/null
+++ b/frontend/src/views/panel/appTemplate/component/AppTemplateApply.vue
@@ -0,0 +1,54 @@
+
+
+
-
+
-
- {{ $t("commons.update") }}
+
+ {{ $t('commons.update') }}
-
- {{ $t("commons.uninstall") }}
+
+ {{ $t('commons.uninstall') }}
+
+
-
diff --git a/frontend/src/views/panel/appTemplateMarket/component/AppMarketPreview.vue b/frontend/src/views/panel/appTemplateMarket/component/AppMarketPreview.vue
new file mode 100644
index 0000000000..1a69620825
--- /dev/null
+++ b/frontend/src/views/panel/appTemplateMarket/component/AppMarketPreview.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+ {{ model.name }}
+
+
+
+ {{ $t('panel.preview') }}
+
+ {{ $t('panel.apply') }}
+
+
+
+
-
- {{ $t('commons.no_result') }} -
- - {{ $t('commons.no_result') }} -