Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

2023-01-05 16:06:41 +08:00
parent 2d62200297 29495c0ee3
commit 725c68ad18
5 changed files with 36 additions and 16 deletions
--- a/packages/conv/AppVillageActivity/AppVillageActivity.vue
+++ b/packages/conv/AppVillageActivity/AppVillageActivity.vue
@@ -1,7 +1,7 @@
 <template>
  <ai-list v-if="!isShowDetail">
    <template slot="title">
-      <ai-title title="居民活动" :isShowBottomBorder="false" :isShowArea="currIndex === '0'" :fullname.sync="areaName" v-model="areaId" :instance="instance" @change="onAreaChange"></ai-title>
+      <ai-title :title="menuName" :isShowBottomBorder="false" :isShowArea="currIndex === '0'" :fullname.sync="areaName" v-model="areaId" :instance="instance" @change="onAreaChange"></ai-title>
    </template>
    <template slot="tabs">
      <el-tabs v-model="currIndex">
@@ -11,7 +11,7 @@
      </el-tabs>
    </template>
  </ai-list>
-  <Add v-else-if="componentName === 'Add'" :areaName="areaName" :areaId="areaId" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Add>
+  <Add v-else-if="componentName === 'Add'" :areaName="areaName" :areaId="areaId" :params="params" :instance="instance" :dict="dict" :menuName="menuName" :permissions="permissions" @change="onChange"></Add>
  <Detail v-else-if="componentName === 'Detail'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Detail>
 </template>

@@ -36,7 +36,8 @@
    props: {
      instance: Function,
      dict: Object,
-      permissions: Function
+      permissions: Function,
+      menuName: {default: '居民活动'}
    },

    computed: {
--- a/packages/conv/AppVillageActivity/components/Add.vue
+++ b/packages/conv/AppVillageActivity/components/Add.vue
@@ -1,7 +1,7 @@
 <template>
  <ai-detail>
    <template slot="title">
-      <ai-title :title="params.id ? '编辑居民活动' : '添加居民活动'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      <ai-title :title="params.id ? `编辑${menuName}` : `添加${menuName}`" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
      </ai-title>
    </template>
    <template slot="content">
@@ -75,7 +75,8 @@
      dict: Object,
      params: Object,
      areaId: String,
-      areaName: String
+      areaName: String,
+      menuName: {default: '居民活动'}
    },

    data () {
--- 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, {
--- a/project/oms/apps/develop/AppDeployCustom/add.vue
+++ b/project/oms/apps/develop/AppDeployCustom/add.vue
@@ -110,11 +110,13 @@
                    <el-form-item label="接口是否单服务">
                      <el-checkbox v-model="form.isSingleService"/>
                    </el-form-item>
-                    <ai-title title="底部导航栏"/>
-                    <ai-table :tableData="tabBar.list" :colConfigs="colConfigs" tableSize="mini" :isShowPagination="false" border>
-                      <el-table-column slot="options" label="操作" width="140" align="center">
+                    <ai-title title="底部导航栏">
+                      <el-button type="text" slot="rightBtn" icon="iconfont iconAdd" @click="tabBar.list.push({})">添加</el-button>
+                    </ai-title>
+                    <ai-table :tableData="tabBar.list" :colConfigs="colConfigs" tableSize="mini" :isShowPagination="false" border ref="TabBar">
+                      <el-table-column slot="options" label="操作" width="260" align="center">
                        <template slot-scope="{row,$index}">
-                          <el-row type="flex" justify="center">
+                          <el-row type="flex" class="tabBarOptions">
                            <ai-dialog-btn text="更换" dialogTitle="选择应用">
                              <ai-lib-table :meta="appList" v-model="row.id" @select="v=>handleTabbarChange(row,v)" :isShowPagination="false" v-bind="$props"
                                            :border="false"/>
@@ -131,6 +133,8 @@
                              </el-form-item>
                            </ai-dialog-btn>
                            <el-button type="text" @click="handleTabbarDelete($index)">删除</el-button>
+                            <el-button type="text" @click="handleTabbarPosition($index,-1)" v-if="$index>0">上移</el-button>
+                            <el-button type="text" @click="handleTabbarPosition($index,1)" v-if="$index<tabBar.list.length-1">下移</el-button>
                          </el-row>
                        </template>
                      </el-table-column>
@@ -189,7 +193,7 @@
            </el-form>
          </el-tab-pane>
          <el-tab-pane label="方案应用" lazy>
-            <ai-lib-table :meta="appList" :isShowPagination="false" v-bind="$props" disabled :colConfigs="appListConfigs">
+            <ai-lib-table :meta="appList" customData :isShowPagination="false" v-bind="$props" disabled :colConfigs="appListConfigs">
              <template slot="options" slot-scope="{row}">
                <ai-dialog-btn text="编辑" :customFooter="false" dialogTitle="应用配置" width="500px" @onConfirm="handleAppEdit(row)">
                  <el-form size="small" label-width="80px">
@@ -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;
+    }
+  }
 }
 </style>
--- a/project/pingchang/apps/AppWishfulThinking/components/Detail.vue
+++ b/project/pingchang/apps/AppWishfulThinking/components/Detail.vue
@@ -116,9 +116,9 @@
          <el-form-item label="转交" prop="wxUserName" style="width: 100%;" :rules="[{ required: true, message: '请选择人员' }]">
            <el-input disabled size="small" v-model="forwardForm.wxUserName" clearable placeholder="请选择人员">
              <template slot="append">
-                <ai-wechat-selecter refs="addTags" :props="{id:'wxUserId',label:'name'}" :isMultiple="false" :instance="instance" v-model="forwardForm.user" @change="onChooseUser">
+                <ai-user-selecter refs="addTags" :isMultiple="false" :instance="instance" v-model="forwardForm.user" @change="onChooseUser">
                  <el-button size="small">选择人员</el-button>
-                </ai-wechat-selecter>
+                </ai-user-selecter>
              </template>
            </el-input>
          </el-form-item>