diff --git a/components/snowy/snowy-crumb/snowy-crumb.vue b/components/snowy/snowy-crumb/snowy-crumb.vue
index d8ed91c17c1d6d07d9b9b774ba111582197c2597..79f2c002f9130c5d339ce0e04268589005876ca0 100644
--- a/components/snowy/snowy-crumb/snowy-crumb.vue
+++ b/components/snowy/snowy-crumb/snowy-crumb.vue
@@ -1,7 +1,7 @@
- {{ item.name + (index === crumbData.length - 1 ? '' : ' | ') }}
+ {{ item[props.map.label] + (index === crumbData.length - 1 ? '' : ' | ') }}
@@ -11,7 +11,14 @@
crumbData: {
type: Array,
default: () => []
- }
+ },
+ map: {
+ type: Object,
+ default: {
+ label: "name"
+ },
+ required: false
+ },
})
const clickCruItem = (item, index) => {
emits('clickCruItem', { item: item, index: index })
diff --git a/components/snowy/snowy-file-picker/utils.js b/components/snowy/snowy-file-picker/utils.js
index 330947ad0c9c97205e60ca0e3b6fab19eaabe0f2..2a18592d81cb29346e63bcb3bd6a391f40007efd 100644
--- a/components/snowy/snowy-file-picker/utils.js
+++ b/components/snowy/snowy-file-picker/utils.js
@@ -42,7 +42,7 @@ export const handleIdData = (idData, idDataType, map = { id: "id", url: "url" })
}
if (ID_DATA_TYPE.urlStr.code === idDataType) {
idData.split(ID_DATA_TYPE.urlStr.separation).forEach(item => {
- const urlId = uni.$xeu.parseUrl(item[map.url])?.searchQuery[map.id]
+ const urlId = uni.$xeu.parseUrl(item)?.searchQuery[map.id]
if (isEmpty(urlId)) {
return
}
@@ -59,7 +59,7 @@ export const handleIdData = (idData, idDataType, map = { id: "id", url: "url" })
idArr.push(item)
}
if (ID_DATA_TYPE.urlArr.code === idDataType) {
- const urlId = uni.$xeu.parseUrl(item[map.url])?.searchQuery[map.id]
+ const urlId = uni.$xeu.parseUrl(item)?.searchQuery[map.id]
if (isEmpty(urlId)) {
return
}
diff --git a/components/snowy/snowy-form-build/snowy-form-build.vue b/components/snowy/snowy-form-build/snowy-form-build.vue
index c20d36f0c37fb02f2e646928444e480907601918..1b4a73243cc941916f415337267d967fa7b430b6 100644
--- a/components/snowy/snowy-form-build/snowy-form-build.vue
+++ b/components/snowy/snowy-form-build/snowy-form-build.vue
@@ -1,16 +1,17 @@
-
+
+ v-model:fieldData="localFormData[fieldConfig?.name]"
+ :useDefault="useDefault">
+
-
+
\ No newline at end of file
diff --git a/components/snowy/snowy-search/snowy-search.vue b/components/snowy/snowy-search/snowy-search.vue
index 172232aa5a12c5e7056312fc70f62a31d6d4b579..e7fae5b7a5584d58ba69b57886d719b3b97f4d72 100644
--- a/components/snowy/snowy-search/snowy-search.vue
+++ b/components/snowy/snowy-search/snowy-search.vue
@@ -57,7 +57,7 @@
display: flex;
align-items: center;
position: relative;
- padding: 20rpx 20rpx 20rpx;
+ padding: 20rpx 5rpx 20rpx;
background-color: #fff;
@if $snowy-style == 'circular' {
border-radius: 5rpx;
diff --git a/components/snowy/snowy-sel-picker/snowy-sel-picker.vue b/components/snowy/snowy-sel-picker/snowy-sel-picker.vue
index d09d5ea4091e67d671779e4be83e3485e8ff5ac6..05fc7d218a8aad2f6652174b4153b3eeebe04406 100644
--- a/components/snowy/snowy-sel-picker/snowy-sel-picker.vue
+++ b/components/snowy/snowy-sel-picker/snowy-sel-picker.vue
@@ -1,20 +1,22 @@
-
-
-
-
- {{ curSelData[map.label] }}
-
-
-
- {{ item[map.label] }}
-
-
- {{ placeholder }}
+
+
+
+
+
+ {{ curSelData[map.label] }}
+
+
+
+ {{ item[map.label] }}
+
+
+ {{ placeholder }}
+
-
+
@@ -44,7 +46,7 @@
-
+
@@ -128,6 +130,12 @@
default: false,
required: false
},
+ // 启用getSelData方法,这里主要是指的是非分页条件下,业务场景:为不分页,但由于筛选条件导致无法从下拉列表中获取数据;分页条件下,直接启用该方法。
+ getSelDataEnabled: {
+ type: Boolean,
+ default: false,
+ required: false
+ },
searchEnabled: {
type: Boolean,
default: false,
@@ -175,8 +183,8 @@
if (uni.$snowy.tool.isEmpty(curSelDataKey.value)) {
return
}
- // 单选分页
- if (!!props.isPage) {
+ // 单选分页(或不分页使用接口方式获取已选择数据,业务场景:为不分页,但由于筛选条件导致无法从下拉列表中获取数据)
+ if (!!props.isPage || props.getSelDataEnabled) {
emits('getSelData', uni.$snowy.tool.isNotEmpty(curSelDataKey.value) && 'array' === props.dataType ? [curSelDataKey.value] : curSelDataKey.value, ({ state, data, msg }) => {
// 回调错误异常处理
if (state === CallbackState.ERROR) {
@@ -204,7 +212,7 @@
})
}
// 单选不分页
- if (!props.isPage) {
+ if (!props.isPage && !props.getSelDataEnabled) {
emits('getOptData', optParam.value, ({ state, data, msg }) => {
// 回调错误异常处理
if (state === CallbackState.ERROR) {
@@ -259,8 +267,8 @@
return
}
// 多选分页
- if (!!props.isPage) {
- emits('getSelData', uni.$snowy.tool.isNotEmpty(curSelDataKey.value) && 'string' === props.dataType ? curSelDataKey.value.split(',') : curSelDataKey.value, ({ state, data, msg }) => {
+ if (!!props.isPage || props.getSelDataEnabled) {
+ emits('getSelData', uni.$snowy.tool.isNotEmpty(curSelDataKey.value) && 'string' === props.dataType ? curSelDataKey.value.split(',') : curSelDataKey.value, ({ state, data, msg }) => {
// 回调错误异常处理
if (state === CallbackState.ERROR) {
return uni.$snowy.modal.alert(msg)
@@ -298,13 +306,12 @@
curSelData.value.push(notFindSelDataItem)
continue;
}
-
curSelData.value.push(findSelDataItem)
}
})
}
// 多选不分页
- if (!props.isPage) {
+ if (!props.isPage && !props.getSelDataEnabled) {
emits('getOptData', optParam.value, ({ state, data, msg }) => {
// 回调错误异常处理
if (state === CallbackState.ERROR) {
@@ -371,7 +378,7 @@
optDataPagingRef.value.reload()
}
// 点击输入框
- const tapInput = () => {
+ const openPop = () => {
popRef.value.open()
popShow.value = true
}
@@ -469,6 +476,8 @@
optDataPagingRef.value.reload()
}
defineExpose({
+ // 打开pop
+ openPop,
// 设置下拉选择参数
setOptParam,
// 设置已选择数据
diff --git a/components/snowy/snowy-tree-picker/snowy-tree-picker.vue b/components/snowy/snowy-tree-picker/snowy-tree-picker.vue
index 662d9f490332e120a166be4e1fa044658609ac80..6c53b5708021d3d31718f942b6c8b098c71abc07 100644
--- a/components/snowy/snowy-tree-picker/snowy-tree-picker.vue
+++ b/components/snowy/snowy-tree-picker/snowy-tree-picker.vue
@@ -1,20 +1,22 @@
-
-
-
-
- {{ curSelData[map.label] }}
-
-
-
- {{ item[map.label] }}
-
-
- {{ placeholder }}
+
+
+
+
+
+ {{ curSelData[map.label] }}
+
+
+
+ {{ item[map.label] }}
+
+
+ {{ placeholder }}
+
-
+
@@ -44,7 +46,7 @@
- clickDataCru(item, index)">
+ clickDataCru(item, index)" :map="{label: [props.map.label]}">
@@ -57,7 +59,7 @@
- {{ item[map.label] }}
+ {{ item[map.label] }}
@@ -235,7 +237,7 @@
immediate: false
})
// 点击输入框
- const tapInput = () => {
+ const openPop = () => {
// 重新初始化数据,防止数据更新
popRef.value.open()
}
@@ -261,7 +263,7 @@
}
}
// 选择数据
- const selData = (item, index) => {
+ const selData = (item, index) => {
if (!props.isMultiple) {
curSelDataKey.value = item[props.map.key]
curSelData.value = item
diff --git a/components/thorui/thorui/tui-timeaxis-item/tui-timeaxis-item.vue b/components/thorui/thorui/tui-timeaxis-item/tui-timeaxis-item.vue
index 154b8f6c9d9091ec439b171173c48bdfe9a40067..ccfe080735b1b7e518f788e42023404b3d12821c 100644
--- a/components/thorui/thorui/tui-timeaxis-item/tui-timeaxis-item.vue
+++ b/components/thorui/thorui/tui-timeaxis-item/tui-timeaxis-item.vue
@@ -43,7 +43,7 @@
display: flex;
align-items: center;
justify-content: center;
- z-index: 99;
+ z-index: 90;
background-color: #fafafa;
font-size: 24rpx;
}
diff --git a/config.js b/config.js
index 03e2601f316bf825dc89f725c9d6b0112ead9220..b2017afe4b25a2bc3e13ff24339d0b4645200df4 100644
--- a/config.js
+++ b/config.js
@@ -48,17 +48,23 @@ export default {
code: "notice",
isShow: true,
},
+ // 菜单
+ {
+ name: "菜单",
+ code: "menu",
+ isShow: true,
+ },
// 日程
{
name: "日程",
code: "schedule",
- isShow: true,
+ isShow: false,
},
// 图表
{
name: "图表",
code: "chart",
- isShow: true,
+ isShow: false,
},
],
// 没有token访问退回页面
diff --git a/main.js b/main.js
index 80331dbf26233e5403a4c911a73b5c9535312fad..e0dfa61dd28c2cf6acef7c8c188775dbe246c43c 100644
--- a/main.js
+++ b/main.js
@@ -4,6 +4,7 @@ import { createSSRApp } from 'vue'
import store from './store'
import XEUtils from '@/plugins/xe-utils'
import snowy from '@/plugins/snowy'
+import propsConfig from '@/components/thorui/thorui/tui-config/index.js'
//解决控制台 touchstart 事件警告
import 'default-passive-events'
export function createApp() {
@@ -14,7 +15,7 @@ export function createApp() {
uni.$snowy = snowy
uni.$xeu = XEUtils
-
+ uni.$tui = propsConfig
return {
app
}
diff --git a/pages.json b/pages.json
index 1f9747ea6e905b91cf7175df3a4046e391f2928d..e90a8b83104d321c32a83e391e44df506c163d8e 100644
--- a/pages.json
+++ b/pages.json
@@ -15,14 +15,6 @@
"navigationStyle": "custom"
//#endif
}
- }, {
- "path": "pages/work/index",
- "style": {
- "navigationBarTitleText": "工作台",
- //#ifdef H5
- "navigationStyle": "custom"
- //#endif
- }
}, {
"path": "pages/msg/index",
"style": {
@@ -207,11 +199,6 @@
"iconPath": "static/images/tabbar/home.png",
"selectedIconPath": "static/images/tabbar/home_.png",
"text": "首页"
- }, {
- "pagePath": "pages/work/index",
- "iconPath": "static/images/tabbar/work.png",
- "selectedIconPath": "static/images/tabbar/work_.png",
- "text": "工作台"
}, {
"pagePath": "pages/msg/index",
"iconPath": "static/images/tabbar/msg.png",
diff --git a/pages/work/index.vue b/pages/home/home-menu.vue
similarity index 50%
rename from pages/work/index.vue
rename to pages/home/home-menu.vue
index 1592fa94f3efd874dbfc4a129ac8285d8deba740..4e6e7e8379e2e3de691861994f5d47812545a397 100644
--- a/pages/work/index.vue
+++ b/pages/home/home-menu.vue
@@ -1,60 +1,35 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ clickText(item,index, userMenu.id)">
+
+
+
+
+
+
+
+ {{item.title}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- clickText(item,index, userMenu.id)">
-
-
-
-
-
-
-
- {{item.title}}
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/pages/home/item.vue b/pages/home/item.vue
index 40dc6236139b4e3073a806cbe734c0fb3840a8de..b2420d85954e9bcc4e3d02c3f918eb50f268e036 100644
--- a/pages/home/item.vue
+++ b/pages/home/item.vue
@@ -5,9 +5,13 @@
-
+
+
+
+
+
@@ -20,9 +24,11 @@