cloud-web-corejs 1.0.54-dev.156 → 1.0.54-dev.158

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.156",
+  "version": "1.0.54-dev.158",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/dialog/searchFormDialog.vue

@@ -192,12 +192,12 @@ export default {
           if (formConfig.searchDialogUniqueField) {
             this.fieldKey = formConfig.searchDialogUniqueField;
           }
-          this.$nextTick(() => {
+          /*this.$nextTick(() => {
             let widgetList = this.formJson.widgetList;
             setTimeout(()=>{
               this.$grid = this.$refs.vFormRef.getWidgetRef(widgetList[0].options.name).getGridTable();
             },200)
-          })
+          })*/
           this.initShowFormField();
           this.showRender = true;
 
@@ -205,6 +205,13 @@ export default {
         }
       });
     },
+    getGrid(){
+      if(!this.$grid){
+        let widgetList = this.formJson.widgetList;
+        this.$grid = this.$refs.vFormRef.getWidgetRef(widgetList[0].options.name).getGridTable();
+      }
+      return this.$grid;
+    },
     initShowFormField() {
       let showFormField = this.formJson.formConfig.searchDialogNameField || null;
       if (!showFormField) {
@@ -323,7 +330,7 @@ export default {
         let selectMulti = this.selectMulti;
         let row = this.checkRows[index];
         var rowid = row[fieldKey];
-        let $grid1 = this.$grid;
+        let $grid1 = this.getGrid();
 
         let rows = $grid1.getTableData().fullData;
         let row2 = this.findTreeRowById(rows, rowid);
@@ -375,14 +382,14 @@ export default {
     },
     clearChecked() {
       if (this.currentLayoutType !== "H5") {
-        let $grid1 = this.$grid;
+        let $grid1 = this.getGrid();
         $grid1.clearCheckboxRow();
       }
       this.checkRows = [];
     },
     checkWithSubmit(obj) {
       if (!this.selectMulti) {
-        let $grid1 = this.$grid;
+        let $grid1 = this.getGrid();
         var rows = $grid1.getCheckboxRecords(true);
         if (rows && rows.length) {
           this.dialogSubmit();

package/src/components/xform/mixins/scriptHttp.js

@@ -1,5 +1,7 @@
 import {initWf} from '../../../components/wf/wfUtil'
 import {getReportGlobalMap} from "../../../components/xform/utils/util";
+import {decrypt} from "@base/utils/aes";
+
 
 let modules = {};
 modules = {
@@ -9,18 +11,31 @@ modules = {
         ...opts
       });
     },*/
-    handleDecryptData(data){
-      if(data){
+    handleDecryptData(data) {
+      if (data) {
         if (Array.isArray(data)) {
-          data.forEach(item=>{
+          data.forEach(item => {
             this.handleDecryptData(item)
           })
-        } else if (Object.prototype.toString.call(item) === "[object Object]") {
-          this.handleDecryptData(data)
-        } else {
+        } else if (Object.prototype.toString.call(data) === "[object Object]") {
+          Object.keys(data).forEach(key => {
+
+            let value = data[key];
+            if(value!== null && value!==undefined){
+              if(Object.prototype.toString.call(data[key]) === "[object String]"){
+                let str = "ATEN*-";
+                if (value.startsWith(str)) {
+                  data[key] = decrypt(value.slice(str.length));
+                }
+              }else{
+                this.handleDecryptData(data[key])
+              }
+            }
+          })
+        } else if(Object.prototype.toString.call(data) === "[object String]"){
           let str = "ATEN*-";
-          if(data.startWith(str)){
-            data = data.slice(str.length)
+          if (data.startsWith(str)) {
+            data = decrypt(data.slice(str.length));
           }
         }
       }
@@ -30,7 +45,7 @@ modules = {
       let data = opts.data;
       let scriptCode = opts.scriptCode;
       let formCode = opts.formCode;
-      let isLoading =  opts.isLoading ?? false;
+      let isLoading = opts.isLoading ?? false;
       let success = opts.success;
       let fail = opts.fail;
       let error = opts.error;
@@ -43,9 +58,9 @@ modules = {
       delete opts.error
 
       let that = this;
-      let getFormTemplate = (callback)=>{
+      let getFormTemplate = (callback) => {
         let reportTemplate = that.getFormRef ? that.getFormRef().reportTemplate : that.reportTemplate;
-        if(formCode && formCode !== reportTemplate.formCode){
+        if (formCode && formCode !== reportTemplate.formCode) {
           that.$http({
             aes: true,
             url: USER_PREFIX + `/formTemplate/getByFormCode`,
@@ -61,14 +76,14 @@ modules = {
               callback(formTemplate)
             }
           });
-        }else{
+        } else {
           callback(reportTemplate)
         }
 
       }
       let toDo = () => {
         return new Promise((resolve, reject) => {
-          getFormTemplate(reportTemplate=>{
+          getFormTemplate(reportTemplate => {
             let reqData;
             reqData = data;
             /*if (opts.url) {
@@ -98,9 +113,9 @@ modules = {
                 ...reqData
               },
               success: res => {
-                /*if(res.objx){
+                if(res.objx){
                     res.objx = this.handleDecryptData(res.objx);
-                }*/
+                }
                 if (opts.successMsg) {
                   this.$message({
                     message: res.content,
@@ -127,11 +142,11 @@ modules = {
                 }
                 resolve(res);
               },
-              fail: res=>{
+              fail: res => {
                 fail && fail(res);
                 resolve(res);
               },
-              error: e=>{
+              error: e => {
                 error && error(e);
                 reject(e);
               }

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

@@ -398,9 +398,9 @@
                     :disabled="!!row.systems || !!row.relationZd"
                   />
                 </template>
-                <template #t1="{ row, rowIndex }">
+                <template #atened="{ row, rowIndex }">
                   <el-checkbox
-                    v-model="row.t1"
+                    v-model="row.atened"
                     :disabled="!!row.systems || !!row.relationZd"
                   />
                 </template>

package/src/views/bd/setting/table_model/mixins/edit.js

@@ -4,8 +4,8 @@ import projectTagView from "@base/components/projectTag/view.vue";
 import szTaMbDialog from "@base/views/bd/setting/table_model/dialog.vue";
 import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
 import zdDialog from "@base/views/bd/setting/table_model/zdDialog.vue";
-import { getBdFlag } from "@base/api/user";
-import { getJsxBtn } from "@base/views/bd/setting/utils/index";
+import {getBdFlag} from "@base/api/user";
+import {getJsxBtn} from "@base/views/bd/setting/utils/index";
 
 let modules = {};
 modules = {
@@ -231,7 +231,7 @@ modules = {
           maxHeight: "600px",
         },
         columns: [
-          { type: "checkbox", fixed: "left", width: 48, resizable: false },
+          {type: "checkbox", fixed: "left", width: 48, resizable: false},
           {
             title: this.$t1("实体字段名称"),
             field: "zdEn",
@@ -268,7 +268,7 @@ modules = {
             field: "isFieldCreated",
             width: 200,
             slots: {
-              default: ({ row, rowIndex, $table }) => {
+              default: ({row, rowIndex, $table}) => {
                 let taZdMc = row.taZdMc;
                 let createdTableColumnArray = this.createdTableColumnArray;
                 return taZdMc && createdTableColumnArray.includes(taZdMc)
@@ -390,14 +390,14 @@ modules = {
               }*/
             },
           },
-          /* {
+          {
             title: this.$t1('数据库字段加密'),
-            field: 't1',
+            field: 'atened',
             width: 180,
             slots: {
-              default: "t1"
+              default: "atened"
             }
-          }, */
+          },
           {
             title: this.$t1("编码类型"),
             field: "codeType",
@@ -439,7 +439,7 @@ modules = {
             title: "",
             sortable: false,
             slots: {
-              default: ({ row, rowIndex, $table }) => {
+              default: ({row, rowIndex, $table}) => {
                 let taZdMc = row.taZdMc;
                 let createdTableColumnArray =
                   this.createdTableColumnArray || [];
@@ -501,6 +501,7 @@ modules = {
         fromTable: false,
         toTaBmZd: null,
         treeFlag: null,
+        atened: false
       };
       this.szTaMb.szTaZdMbDTOs.splice(0, 0, item);
     },
@@ -873,7 +874,7 @@ modules = {
           aes: true,
           url: USER_PREFIX + "/menu_kind_auth/getAuth",
           method: `post`,
-          data: { stringOne: menuKindCode },
+          data: {stringOne: menuKindCode},
           isLoading: true,
           success: (res) => {
             this.menuKindAuth = res.objx || {};
@@ -904,7 +905,7 @@ modules = {
         success: (res) => {
           let items = res.objx || [];
           if (!items.length) {
-            this.$baseAlert(this.$t1("数据表[{dbTable}]不存在", { dbTable }));
+            this.$baseAlert(this.$t1("数据表[{dbTable}]不存在", {dbTable}));
             return;
           }
           let szTaZdMbDTOs = items