diff --git a/packages/conv/AppVillageActivity/AppVillageActivity.vue b/packages/conv/AppVillageActivity/AppVillageActivity.vue
index 8096f9b2..828d5b58 100644
--- a/packages/conv/AppVillageActivity/AppVillageActivity.vue
+++ b/packages/conv/AppVillageActivity/AppVillageActivity.vue
@@ -1,7 +1,7 @@
-
+
@@ -11,7 +11,7 @@
-
+
@@ -36,7 +36,8 @@
props: {
instance: Function,
dict: Object,
- permissions: Function
+ permissions: Function,
+ menuName: {default: '居民活动'}
},
computed: {
diff --git a/packages/conv/AppVillageActivity/components/Add.vue b/packages/conv/AppVillageActivity/components/Add.vue
index 33e58f9e..adb50a52 100644
--- a/packages/conv/AppVillageActivity/components/Add.vue
+++ b/packages/conv/AppVillageActivity/components/Add.vue
@@ -1,7 +1,7 @@
-
+
@@ -75,7 +75,8 @@
dict: Object,
params: Object,
areaId: String,
- areaName: String
+ areaName: String,
+ menuName: {default: '居民活动'}
},
data () {
diff --git a/project/oms/apps/develop/AppDeployCustom/AiLibTable.vue b/project/oms/apps/develop/AppDeployCustom/AiLibTable.vue
index 3c77004b..60a6ffe8 100644
--- a/project/oms/apps/develop/AppDeployCustom/AiLibTable.vue
+++ b/project/oms/apps/develop/AppDeployCustom/AiLibTable.vue
@@ -54,7 +54,8 @@ export default {
multiple: Boolean,
disabled: Boolean,
meta: {default: () => []},
- choose: {default: null}
+ choose: {default: null},
+ customData: Boolean
},
data() {
return {
@@ -83,8 +84,8 @@ export default {
},
methods: {
getTableData() {
- const {page, search, action, meta, searchKey, dict} = this
- if (meta.length > 0) {
+ const {page, search, action, meta, searchKey, dict, customData} = this
+ if (meta.length > 0 || customData) {
const reg = new RegExp(search[searchKey])
this.handleTableData(meta.filter(e => reg.test(e.label) || reg.test(e.name) || reg.test(dict.getLabel('appsCategory', e.category))))
} else this.instance?.post(action, null, {
diff --git a/project/oms/apps/develop/AppDeployCustom/add.vue b/project/oms/apps/develop/AppDeployCustom/add.vue
index 51ced626..4f119621 100644
--- a/project/oms/apps/develop/AppDeployCustom/add.vue
+++ b/project/oms/apps/develop/AppDeployCustom/add.vue
@@ -110,11 +110,13 @@
-
-
-
+
+ 添加
+
+
+
-
+
handleTabbarChange(row,v)" :isShowPagination="false" v-bind="$props"
:border="false"/>
@@ -131,6 +133,8 @@
删除
+ 上移
+ 下移
@@ -189,7 +193,7 @@
-
+
@@ -246,7 +250,7 @@ export default {
// customPath: {required: true, message: "请输入"},
},
colConfigs: [
- {prop: 'text', label: "名称"},
+ {prop: 'text', label: "名称", width: 120},
{prop: 'pagePath', label: "应用路径"},
{prop: 'iconPath', label: "默认图标"},
{prop: 'selectedIconPath', label: "选中图标"},
@@ -350,6 +354,11 @@ export default {
handleAppEdit(row) {
const i = this.form.appList.findIndex(e => e.id == row.id)
this.form.appList.splice(i, 1, row)
+ },
+ handleTabbarPosition(i, offset) {
+ const row = this.tabBar.list[i]
+ this.tabBar.list.splice(i, 1, this.tabBar.list[i + offset])
+ this.tabBar.list.splice(i + offset, 1, row)
}
},
created() {
@@ -365,5 +374,13 @@ export default {
.mar-l16 {
margin-left: 16px;
}
+
+ :deep(.tabBarOptions) {
+ flex-wrap: wrap;
+
+ .el-button--text + .el-button--text {
+ margin-left: 0;
+ }
+ }
}
diff --git a/project/pingchang/apps/AppWishfulThinking/components/Detail.vue b/project/pingchang/apps/AppWishfulThinking/components/Detail.vue
index 5b11db90..d907b71b 100644
--- a/project/pingchang/apps/AppWishfulThinking/components/Detail.vue
+++ b/project/pingchang/apps/AppWishfulThinking/components/Detail.vue
@@ -116,9 +116,9 @@
-
+
选择人员
-
+