Merge branch 'dev' into build

packages/core/AppQyWxConfig/list.vue

@@ -162,6 +162,10 @@
         <el-form-item label="备案跳转链接">
           <el-input v-model="sysInfo.recordURL" placeholder="请输入..." clearable/>
         </el-form-item>
+        <el-form-item label="框架版本">
+          <!--edition ：版本，标准版：standard、上架版：saas-->
+          <el-input v-model="sysInfo.edition" placeholder="请输入..." clearable/>
+        </el-form-item>
       </el-form>
     </ai-dialog>
   </section>

packages/meta/AppResident/AppResidentTags.vue

@@ -49,7 +49,7 @@ export default {
     permissions: Function
   },
   computed: {
-    ...mapState(['user']),
+    ...mapState(['user', 'sys']),
     rules() {
       return {
         labelName: [{required: true, message: "请输入标签"}],
@@ -57,7 +57,12 @@ export default {
     },
     dialogTitle() {
       return `${this.form.id ? "编辑" : "添加"}标签`
-    }
+    },
+    colConfigs: v => [{type: "selection"},
+      {label: "标签信息", prop: "labelName"},
+      {label: "创建时间", prop: "createTime", align: '120px'},
+      {label: "创建人", prop: "createUserName", align: 'center', openType: v.sys.info?.edition == "saas" ? "userName" : null},
+      {slot: "options"}]
   },
   data() {
     return {
@@ -66,13 +71,6 @@ export default {
       tableData: [],
       search: {name: "", ids: ""},
       form: {},
-      colConfigs: [
-        {type: "selection"},
-        {label: "标签信息", prop: "labelName"},
-        {label: "创建时间", prop: "createTime", align: '120px'},
-        {label: "创建人", prop: "createUserName", align: 'center'},
-        {slot: "options"}
-      ]
     }
   },
   methods: {

packages/wxwork/Announce/AppAnnounce/components/Add.vue

@@ -632,7 +632,8 @@ export default {
             examines: this.form.examines.length ? this.form.examines.map(v => {
               return {
                 ...v,
-                examineUserId: v.id
+                examineUserId: v.id,
+                examineUserName: v.name
               }
             }) : []
           }).then(res => {

packages/wxwork/Announce/AppAnnounce/components/Detail.vue

@@ -33,7 +33,7 @@
               <div class="user-wrapper">
                 <div class="user" v-for="(item, index) in info.examines" :key="index">
                   <img src="https://cdn.cunwuyun.cn/dvcp/announce/user.png" />
-                  <span>{{ item.name }}</span>
+                  <span>{{ item.examineUserName }}</span>
                 </div>
               </div>
             </ai-info-item>
@@ -294,11 +294,11 @@
         content: '',
         currIndex: 0,
         colConfigs3: [
-          { prop: 'groupOwnerName', label: '群主', openType: 'userName' },
+          { prop: 'groupOwnerName', label: '群主' },
           { prop: 'groupNames', label: '群名称' }
         ],
         colConfigs1: [
-          { slot: 'user', label: '成员', openType: 'userName' },
+          { slot: 'user', label: '成员' },
           { prop: 'groupCount', label: '预计送达居民群', align: 'center' }
         ],
         colConfigs2: [