cloud-web-corejs 1.0.14 → 1.0.16

package/src/views/bd/setting/menu_kind/list.vue

@@ -10,7 +10,8 @@
                 <template #buttonLeft>
                   <vxe-button status="success" class="button-sty" icon="el-icon-download" @click="jsonImport">导入发布
                   </vxe-button>
-                  <vxe-button status="success" class="button-sty" icon="el-icon-upload2" @click="jsonExport" v-if="isDev">导出发布
+                  <vxe-button status="success" class="button-sty" icon="el-icon-upload2" @click="jsonExport"
+                              v-if="isDev">导出发布
                   </vxe-button>
                 </template>
                 <template #buttonRight>
@@ -39,14 +40,18 @@
                   </a>
                 </template>
                 <template v-else>
-                  <a class="a-link" data-tit="新增" @click="insertChildEvent(obj)">
+                  <a class="a-link" @click="insertChildEvent(obj)" v-if="obj.row.addAuth">
                     <el-tooltip :enterable="false" effect="dark" content="新增" placement="top"
                                 popper-class="tooltip-skin"><i class="el-icon-circle-plus-outline"></i></el-tooltip>
                   </a>
-                  <a @click="editRowEvent(obj)" class="a-link" data-tit="行编辑" v-if="obj.row">
+                  <a @click="editRowEvent(obj)" class="a-link" v-if="!obj.row.createDate || obj.row.editAuth">
                     <el-tooltip :enterable="false" effect="dark" content="行编辑" placement="top"
                                 popper-class="tooltip-skin"><i class="el-icon-edit-outline"></i></el-tooltip>
                   </a>
+                  <a @click="openAuthDialog(obj)" class="a-link" v-if="obj.row.authAuth">
+                    <el-tooltip :enterable="false" effect="dark" content="权限" placement="top"
+                                popper-class="tooltip-skin"><i class="el-icon-edit-outline"></i></el-tooltip>
+                  </a>
                   <!-- <a class="a-link" @click="openChangeParentDialog(obj)">
 										<el-tooltip :enterable="false" effect="dark" content="切换上级机构" placement="top" popper-class="tooltip-skin">
 											<i class="el-icon-office-building"></i>
@@ -62,16 +67,22 @@
         </div>
       </el-tab-pane>
     </el-tabs>
+    <authDialog v-if="showAuthDialog" :visiable.sync="showAuthDialog" :currentMenuKind="currentMenuKind"
+                @confirm="confirmAuthDialog"
+                multi="false"/>
   </div>
 </template>
 <script>
 import {tableTreeMixins} from '@base/mixins/tableTree';
 import tableForm from "@base/components/table/tableForm";
 import {getBdEnv} from "@base/api/user";
+import authDialog from "./authDialog.vue";
+import userDialog from "@/views/user/user/dialog.vue";
+
 
 export default {
   name: 'menu_kind:list',
-  components: {tableForm},
+  components: {userDialog, tableForm, authDialog},
   mixins: [tableTreeMixins],
   mounted() {
     this.getBdEnv();
@@ -83,11 +94,13 @@ export default {
       value10: '',
       dataId: '',
       formData: {
-        enabled: ''
+        enabled: null
       },
       vxeOption: {},
       activeName: 'second',
-      isDev: true
+      isDev: true,
+      showAuthDialog: false,
+      currentMenuKind: {}
     };
   },
   methods: {
@@ -98,6 +111,11 @@ export default {
       this.formData = {};
       this.$refs['table-m1'].commitProxy('reload');
     },
+    getSearchParam() {
+      return {
+        ...this.formData
+      };
+    },
     initTableList() {
       let that = this;
       let tableOption = {
@@ -109,7 +127,7 @@ export default {
         editSaveUrl: USER_PREFIX + '/menuKind/save',
         editDefaultRow: {enabled: true, orders: 99},
         param: row => {
-          return this.formData;
+          return this.getSearchParam();
         },
         treeNodeParam: row => {
           return {
@@ -220,8 +238,9 @@ export default {
     },
     jsonExport() {
       this.$jsonExport({
-        targetRef: "table-m1",
-        url: USER_PREFIX + "/form_develop/exportMenuKind"
+        url: USER_PREFIX + "/form_develop/exportMenuKind",
+        data: this.getSearchParam(),
+        abcEnabled: false
       })
     },
     getBdEnv() {
@@ -230,6 +249,13 @@ export default {
           this.isDev = res.content == "dev"
         }
       });
+    },
+    openAuthDialog({row, rowIndex}) {
+      this.currentMenuKind = row;
+      this.showAuthDialog = true;
+    },
+    confirmAuthDialog() {
+
     }
   }
 };

package/src/views/bd/setting/table_model/edit.vue

@@ -357,7 +357,8 @@
               :taBm="referenceEntity"
               :multi="true"
     />
-
+    <preformDialog v-if="showPreformDialog" :visiable.sync="showPreformDialog"
+                   @confirm="confirmPreformDialog"></preformDialog>
   </div>
 </template>
 
@@ -368,6 +369,7 @@ import MenuKindDialog from '../../../../views/bd/setting/menu_kind/dialog.vue';
 import zdDialog from '../../../../views/bd/setting/table_model/zdDialog.vue';
 import {getBdEnv} from "../../../../api/user";
 import projectTagView from "../../../../components/projectTag/view.vue";
+import preformDialog from "@/views/bd/setting/form_template/preformDialog.vue";
 
 export default {
   name: 'szTaMbEdit',
@@ -376,6 +378,7 @@ export default {
     currentFormType: Object
   },
   components: {
+    preformDialog,
     projectTagView,
     szTaMbDialog,
     itemSzTaMbDialog,
@@ -417,7 +420,8 @@ export default {
       referenceShowRows: [],
       createdTableColumnStr: null,
       createdTableColumnArray: [],
-      isDev: true
+      isDev: true,
+      showPreformDialog: false
 
     };
   },
@@ -499,42 +503,52 @@ export default {
             this.$baseAlert('明细不能为空！');
             return false;
           }
-          this.$baseConfirm('您确定要保存吗？')
-            .then(() => {
-              const formData = this.szTaMb;
-              formData.szTaZdMbDTOs = szTaZdMbDTOs;
+          this.szTaMb.szTaZdMbDTOs = szTaZdMbDTOs;
+          this.openPreformDialog();
 
-              var url = USER_PREFIX + (this.isEdit ? `/szTaMb/update` : `/szTaMb/save`);
-              this.$http({
-                url: url,
-                method: `post`,
-                data: formData,
-                isLoading: true,
-                success: res => {
-                  this.$message({
-                    message: res.content,
-                    type: 'success',
-                    duration: 500,
-                    onClose: t => {
-                      if (this.isEdit) {
-                        this.$baseReload();
-                      } else {
-                        this.$baseReload({
-                          updateParam: {
-                            _dataId: res.objx
-                          }
-                        });
-                      }
-                    }
-                  });
-                }
-              });
-            })
-            .catch(() => {
-            });
         }
       });
     },
+    saveDataHandle(preformData) {
+      let formData = {
+        ...this.szTaMb,
+        logContent: preformData.logContent
+      };
+      // const formData = this.szTaMb;
+      // formData.szTaZdMbDTOs = szTaZdMbDTOs;
+
+      var url = USER_PREFIX + (this.isEdit ? `/szTaMb/update` : `/szTaMb/save`);
+      this.$http({
+        url: url,
+        method: `post`,
+        data: formData,
+        isLoading: true,
+        success: res => {
+          this.$message({
+            message: res.content,
+            type: 'success',
+            duration: 500,
+            onClose: t => {
+              if (this.isEdit) {
+                this.$baseReload();
+              } else {
+                this.$baseReload({
+                  updateParam: {
+                    _dataId: res.objx
+                  }
+                });
+              }
+            }
+          });
+        }
+      });
+    },
+    openPreformDialog() {
+      this.showPreformDialog = true;
+    },
+    confirmPreformDialog(preformData) {
+      this.saveDataHandle(preformData);
+    },
     initTableProduct() {
       const tableOption = {
         vue: this,

package/src/views/bd/setting/table_model/list.vue

@@ -7,7 +7,7 @@
       </el-tab-pane>
       <el-tab-pane label="列表" name="second">
         <div class="tree-box fl">
-          <div class="tit" @click="clearNodeClick"><b>表单分类</b></div>
+          <div class="tit"><b>表单分类</b></div>
           <div class="tree-btns" style="margin-top: 10px;">
             <!--            <el-button type="primary" plain icon="el-icon-circle-plus-outline" class="btn" @click="addFormType()">新增-->
             <!--            </el-button>-->
@@ -16,6 +16,7 @@
             <!--            </el-button>-->
           </div>
           <el-tree
+            v-if="showTree"
             :props="defaultProps"
             :load="loadNode"
             node-key="id"
@@ -42,7 +43,7 @@
                 <tableForm :formData.sync="formData" @searchEvent="searchEvent" @resetEvent="resetEvent">
                   <template #buttonLeft>
                     <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog"
-                                v-if="isDev">新增
+                                v-if="isDev && currentFormType.addAuth===1">新增
                     </vxe-button>
                     <base-table-export :option="{ title: '数据表定义导出', targetRef: 'table-m1'}"
                                        :parent-target="_self" v-if="isDev"/>
@@ -64,6 +65,13 @@
                     <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
                     </vxe-button>
                   </template>
+                  <template #menuKindName>
+                    <vxe-form-item title="表单分类:" field="tag">
+                      <template v-slot>
+                        <el-input v-model="currentMenuKindName" disabled></el-input>
+                      </template>
+                    </vxe-form-item>
+                  </template>
                   <template #tag>
                     <vxe-form-item title="项目标签:" field="tag">
                       <template v-slot>
@@ -161,7 +169,7 @@ export default {
       },
       showItemView: false,
       showMenuKindDialog: false,
-      currentFormType: null,
+      currentFormType: {},
       addProjectTagOption: {
         url: USER_PREFIX + `/szTaMb/saveTag`,
         tableDatas: () => {
@@ -200,9 +208,19 @@ export default {
       },
       showProjectTagDialog3: false,
       checkTags: [],
-      isDev: true
+      isDev: true,
+      menuKindAuth: {},
+      showTree: false
     };
   },
+  computed: {
+    currentMenuKindId() {
+      return this.currentFormType?.id || null
+    },
+    currentMenuKindName() {
+      return this.currentFormType?.name || null
+    }
+  },
   methods: {
     searchEvent() {
       this.$refs['table-m1'].commitProxy('reload');
@@ -210,7 +228,6 @@ export default {
     resetEvent() {
       this.formData = {};
       this.checkTags = [];
-      this.currentFormType = null;
       this.$refs['table-m1'].commitProxy('reload');
     },
     openEditDialog(row) {
@@ -227,6 +244,18 @@ export default {
         this.$refs.xTabs.openEditTab(row);
       }
     },
+    getSearchParam() {
+      let tagCodes = null;
+      if (this.checkTags.length) {
+        tagCodes = this.checkTags.map(item => item.tagCode);
+      }
+      let currentFormType = this.currentFormType || {}
+      return {
+        ...this.formData,
+        menuKindCode: currentFormType.menuKindCode || null,
+        tagCodes
+      };
+    },
     initTableList() {
       let tableOption = {
         vue: this,
@@ -234,14 +263,7 @@ export default {
         tableName: 'bd_table_model_list-m1',
         path: USER_PREFIX + '/szTaMb/listPage',
         param: () => {
-          let tagCodes = null;
-          if (this.checkTags.length) {
-            tagCodes = this.checkTags.map(item => item.tagCode);
-          }
-          return {
-            ...this.formData,
-            tagCodes
-          };
+          return this.getSearchParam();
         },
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
@@ -345,35 +367,30 @@ export default {
             type: "input",
             common: true,
             disabled: true,
-            defaultValueEnabled: false
+            defaultValueEnabled: false,
+            slot: "menuKindName"
           },
           {title: "实体名称", field: "taEn", type: "input", common: true},
           {title: "数据库表名", field: "taBm", type: "input", common: true},
           {title: "表描述", field: "taCh", type: "input", common: true},
           {title: "项目标签", field: "tag", type: "input", common: true, slot: "tag"},
-        ]
+        ],
+        config: {
+          proxyConfig: {
+            autoLoad: false
+          }
+        },
       };
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
         this.vxeOption = opts;
+        this.showTree = true;
       });
     },
     handleNodeClick(data, node, v) {
-      this.$set(this.formData, 'formTypeCode', data.formTypeCode);
-      this.$set(this.formData, 'formTypeName', data.formTypeName);
-      this.$set(this.formData, 'menuKindName', data.name);
-      this.$set(this.formData, 'menuKindCode', data.menuKindCode);
-      this.currentFormType = data;
+      this.handleNodeData(node)
       this.$forceUpdate();
       this.searchEvent();
     },
-    clearNodeClick() {
-      this.formData.menuKindCode = null;
-      this.formData.menuKindName = null;
-      // this.currentFormType = null;
-      this.$refs.tree.setCurrentKey();
-      this.searchEvent();
-    },
-
     loadNode(node, resolve) {
       let id = node && node.data && node.data.id ? node.data.id || '' : 0;
       let param = {enabled: true};
@@ -390,10 +407,14 @@ export default {
             value.leaf = !value.hasChild;
           });
           if (node.level === 0) {
-            if (res.objx.length > 0 && res.objx[0].hasChild) {
+            if (res.objx.length > 0) {
               this.$nextTick(() => {
-                let nodedata = node.childNodes[0];
-                nodedata.expand();
+                let firstNode = node.childNodes[0];
+                if (res.objx[0].hasChild) {
+                  firstNode.expand();
+                }
+                this.$refs.tree.setCurrentKey(firstNode.data);
+                this.handleNodeClick(firstNode.data, firstNode, this)
               });
             }
           }
@@ -401,6 +422,23 @@ export default {
         }
       });
     },
+    handleNodeData(node) {
+      this.currentFormType = node ? node.data : null;
+      this.currentNode = node;
+      this.getMenuKindAuth();
+    },
+    getMenuKindAuth() {
+      this.$http({
+        url: USER_PREFIX + `/menu_kind_auth/getAuth`,
+        method: `post`,
+        data: {
+          id: this.currentMenuKindId,
+        },
+        success: (res) => {
+          this.menuKindAuth = res.objx || {};
+        },
+      });
+    },
 
     addFormType() {
       this.editFormTypeId = null;
@@ -451,8 +489,9 @@ export default {
     },
     jsonExport() {
       this.$jsonExport({
-        targetRef: "table-m1",
-        url: USER_PREFIX + "/form_develop/exportSzTaMb"
+        url: USER_PREFIX + "/form_develop/exportSzTaMb",
+        data: this.getSearchParam(),
+        abcEnabled: true
       })
     },
     getBdEnv() {

package/src/views/user/home/index.vue

@@ -24,7 +24,7 @@ export default {
     };
   },
   created() {
-    this.initHome();
+    this.init();
   },
   methods: {
     init() {
@@ -33,7 +33,9 @@ export default {
         method: 'post',
         success: res => {
           let userInfo = res.objx;
-          this.getIsDistributor(userInfo);
+          if(userInfo.flag!==8){
+            this.initHome();
+          }
         }
       });
     },

package/src/views/user/login/indexMixin.js

@@ -2,9 +2,12 @@ import {encode} from "js-base64";
 import settingConfig from "@/settings";
 
 function getUrlParams(url) {
-  let urlStr = url.split('?')[1];
-  const urlSearchParams = new URLSearchParams(urlStr);
-  const result = Object.fromEntries(urlSearchParams.entries());
+  let result = {};
+  if (url) {
+    let urlStr = url.split('?')[1];
+    const urlSearchParams = new URLSearchParams(urlStr);
+    result = Object.fromEntries(urlSearchParams.entries());
+  }
   return result;
 }
 
@@ -49,7 +52,8 @@ export default {
         username: null,
         smsCode: null
       },
-      activeName: "first"
+      activeName: "first",
+      searchParam: {}
     };
   },
   watch: {
@@ -65,22 +69,7 @@ export default {
     }
   },
   created() {
-
-    //小熊SSO返回判断--目前因为小熊单点返回ticket有问题要特殊处理
-    let ssoParams = {};
-    if (location.search) {
-      ssoParams = getUrlParams(location.search);
-    }
-    // 获取URL参数
-    const urlParams = this.$route.query;
-    if (ssoParams.ticket || "bear_portalsso" == urlParams.access || urlParams.ticket) {
-      //小熊单点登录
-      this.bearSsoLogin();
-    } else {
-      //正常登陆
-      this.login();
-    }
-
+    this.init();
   },
   mounted() {
     // if (this.loginForm.username === '') {
@@ -94,6 +83,26 @@ export default {
     window.removeEventListener('keydown', this.keyDown, false);
   },
   methods: {
+    init() {
+      let searchParam = getUrlParams(location.search);
+      this.searchParam = searchParam;
+      //小熊SSO返回判断--目前因为小熊单点返回ticket有问题要特殊处理
+      let ssoParams = {};
+      if (location.search) {
+        ssoParams = searchParam;
+      }
+      // 获取URL参数
+      const urlParams = this.$route.query;
+      if (ssoParams.ticket || "bear_portalsso" == urlParams.access || urlParams.ticket) {
+        //小熊单点登录
+        this.bearSsoLogin();
+      } else if (searchParam.gatewayToken) {
+        this.handleGatewayTokenLogin();
+      } else {
+        //正常登陆
+        this.login();
+      }
+    },
     keyDown(e) {
       //如果是回车则执行登录方法
       if (e.keyCode == 13 && e.target.nodeName != 'INPUT') {
@@ -353,9 +362,12 @@ export default {
         path = '/';
       }
       this.getWebPrefix((webPrefix) => {
-        let prefix = webPrefix ? ('/' + webPrefix) : null;
+        let prefix = webPrefix ? ('/' + webPrefix) : '';
+        let ssotoken = this.searchParam.gatewayToken;
         if (prefix && prefix !== window.WEB_PREFIX) {
           location.href = prefix + '/index.html' + path
+        } else if (!!ssotoken) {
+          location.href = prefix + '/index.html' + path
         } else {
           this.$router.push({
             path: path
@@ -393,6 +405,18 @@ export default {
           callback && callback(webPrefix)
         }
       });
+    },
+    handleGatewayTokenLogin() {
+      let ssotoken = this.searchParam.gatewayToken
+      this.$store
+        .dispatch('user/login2', {ssotoken})
+        .then(res => {
+          if (res.type == "success") {
+            this.$nextTick(() => {
+              this.handleRedirectUrl()
+            });
+          }
+        });
     }
   }
 }