Merge remote-tracking branch 'origin/1.2.2' into 1.2.2

# Conflicts:
#	src/utils/request.js

src/utils/request.js

@@ -99,7 +99,6 @@ service.interceptors.response.use(
           window.open(document.location.origin + '/#/login', '_self')
           //清理缓存
           window.localStorage.clear()
-
           let pathUrl = window.location.href
           localStorage.setItem('USER_WORK_PATH', pathUrl)
         }

src/views/basic/dynamicModel/list/index.vue

@@ -2262,7 +2262,7 @@ export default {
     rowPermissionShow(row, val, type) {
       // 判断行权限
       let authFlag = false;
-      if (this.config.rowPermissionStatus === 0) {
+      if (this.config.rowPermissionStatus === 1) {
         let userInfoObj = JSON.parse(localStorage.getItem("lowcodeUserInfo"));
         // 如果为私有信息
         const isPrivateInfo = row[this.columnDict[this.rowPermissionJson.permissionCubeColumnId]] === this.rowPermissionJson.privatePermission;
@@ -2279,11 +2279,15 @@ export default {
       }
       // 判断系统按钮sql展示条件
       let condFlag = false;
-      let btnId = this.systemBtnFlag[type];
-      if (btnId) {
-        let rowKey = row[this.columnDict[this.idKey]];
-        let btns = this.getPreconditionObj[rowKey] || [];
-        condFlag = !!btns.find(i => i.id === btnId);
+      let btn = this.systemBtnFlag[type];
+      if (btn) {
+        if (!btn.condition) {
+          condFlag = true;
+        } else {
+          let rowKey = row[this.columnDict[this.idKey]];
+          let btns = this.getPreconditionObj[rowKey] || [];
+          condFlag = !!btns.find(i => i.id === btn.id);
+        }
       } else {
         condFlag = true;
       }
@@ -3202,10 +3206,8 @@ export default {
       let systemBtnIds = [], systemBtnFlag = {}, toCheckTypes = ["edit", "remove", "detail"];
       this.systemBtns.forEach(btn => {
         if (toCheckTypes.includes(btn.permKey)) {
-          if (btn.buttonId) {
-            systemBtnIds.push(btn.buttonId);
-            systemBtnFlag[btn.permKey] = btn.buttonId;
-          }
+          systemBtnFlag[btn.permKey] = { id: btn.buttonId, condition: btn.buttonCondition };
+          if (btn.buttonId) systemBtnIds.push(btn.buttonId);
         }
       });
       this.systemBtnFlag = systemBtnFlag;