cloud-web-corejs 1.0.54-dev.600 → 1.0.54-dev.601

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

@@ -2,31 +2,38 @@ import formOplogTable from "@base/components/formOplog/index.vue";
 import preformDialog from "@base/views/bd/setting/form_script/preformDialog.vue";
 import projectTagView from "@base/components/projectTag/view.vue";
 import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
-import {getBdFlag} from "@base/api/user";
+import { getBdFlag } from "@base/api/user";
 import otherAuthDialog from "../otherAuthDialog.vue";
 
 let modules = {};
 modules = {
-  name: 'user_form_scriptEdit',
+  name: "user_form_scriptEdit",
   props: {
     _dataId: [String, Number],
     formCode: String,
     formTemplate: Object,
     currentFormType: Object,
     // readonly: Boolean,
-    otherFlag:Boolean,
+    otherFlag: Boolean,
     scriptType: {
       type: Number,
-      default: 0
+      default: 0,
     },
     hData: Object,
+    compareHData: Object,
+  },
+  components: {
+    formOplogTable,
+    preformDialog,
+    projectTagView,
+    MenuKindDialog,
+    otherAuthDialog,
   },
-  components: {formOplogTable, preformDialog, projectTagView, MenuKindDialog,otherAuthDialog},
   data() {
     return {
       isEdit: false,
-      tabIndex: 'first',
-      dataId: '',
+      tabIndex: "first",
+      dataId: "",
       formScript: {
         scriptType: 0,
         enabled: true,
@@ -35,24 +42,35 @@ modules = {
         menuKindName: null,
         serviceName: null,
         transactions: 1,
-        formScriptTagDTOs: []
+        formScriptTagDTOs: [],
+      },
+      oldFormScript: {
+        scriptType: 0,
+        enabled: true,
+        formCode: null,
+        menuKindCode: null,
+        menuKindName: null,
+        serviceName: null,
+        transactions: 1,
+        formScriptTagDTOs: [],
       },
       showCodeEditor: false,
       showMenuKindDialog: false,
       isDev: true,
       showPreformDialog: false,
       menuKindAuth: {
-        editAuth: 0
+        editAuth: 0,
       },
       sid: null,
-      showOtherAuthDialog:false,
+      showOtherAuthDialog: false,
       readonly: false,
+      isCompare: false,
     };
   },
   created() {
-    if(this.hData){
+    if (this.hData) {
       this.readonly = true;
-    }else{
+    } else {
       this.readonly = this.$attrs.readonly || false;
     }
     if (this._dataId && !isNaN(this._dataId)) {
@@ -66,12 +84,12 @@ modules = {
         this.formScript.serviceName = this.formTemplate.serviceName;
       } else {
         this.formScript.scriptType = this.scriptType;
-        this.formScript.formCode = 'intf';
+        this.formScript.formCode = "intf";
         this.formScript.menuKindName = this.currentFormType?.name || null;
-        this.formScript.menuKindCode = this.currentFormType?.menuKindCode || null;
+        this.formScript.menuKindCode =
+          this.currentFormType?.menuKindCode || null;
         this.formScript.serviceName = this.currentFormType?.serviceName || null;
       }
-
     }
   },
   mounted() {
@@ -87,50 +105,55 @@ modules = {
           url: USER_PREFIX + `/formScript/get`,
           method: `post`,
           data: {
-            id: this.dataId
+            id: this.dataId,
           },
           isLoading: true,
           modalStrictly: true,
-          success: res => {
+          success: (res) => {
             this.formScript = res.objx || {};
             this.showCodeEditor = true;
             this.getMenuKindAuth(this.formScript.menuKindCode);
             //获取操作日志数据
-            this.$refs['oplogTable'].initData({
+            this.$refs["oplogTable"].initData({
               param: () => {
                 return {
                   logType: "FormScript",
-                  logObjCode: this.formScript.sid
+                  logObjCode: this.formScript.sid,
                 };
-              }
+              },
             });
-          }
+          },
         });
-      } else if (this.hData){
+      } else if (this.hData) {
         this.isEdit = true;
         this.formScript = this.$baseLodash.cloneDeep(this.hData);
-        this.dataId = this.hData.id
+        this.dataId = this.hData.id;
         this.isInited = true;
         this.getMenuKindAuth(this.formScript.menuKindCode);
         this.showCodeEditor = true;
+        if (this.compareHData && this.$attrs.isCompare) {
+          this.oldFormScript = this.$baseLodash.cloneDeep(this.compareHData);
+          this.isCompare = true;
+        }
       } else {
         this.getMenuKindAuth(this.formScript.menuKindCode);
         this.showCodeEditor = true;
       }
     },
     saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
+      this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
           this.openPreformDialog();
         }
       });
     },
     saveDataHandle(preformData) {
-      var url = USER_PREFIX + (this.isEdit ? `/formScript/update` : `/formScript/save`);
+      var url =
+        USER_PREFIX + (this.isEdit ? `/formScript/update` : `/formScript/save`);
       let formData = {
         ...this.formScript,
         logContent: preformData.logContent,
-        transactions: preformData.transactions
+        transactions: preformData.transactions,
       };
       this.$http({
         aes: true,
@@ -138,24 +161,24 @@ modules = {
         method: `post`,
         data: formData,
         isLoading: true,
-        success: res => {
+        success: (res) => {
           this.$message({
             message: res.content,
-            type: 'success',
+            type: "success",
             duration: 500,
-            onClose: t => {
+            onClose: (t) => {
               if (this.isEdit) {
                 this.$baseReload();
               } else {
                 this.$baseReload({
                   updateParam: {
-                    _dataId: res.objx
-                  }
+                    _dataId: res.objx,
+                  },
                 });
               }
-            }
+            },
           });
-        }
+        },
       });
     },
     openPreformDialog() {
@@ -167,30 +190,30 @@ modules = {
     confirmInsertMenuKind(rows) {
       if (rows.length > 0) {
         let row = rows[0];
-        this.$set(this.formScript, 'menuKindCode', row.menuKindCode);
-        this.$set(this.formScript, 'menuKindName', row.name);
+        this.$set(this.formScript, "menuKindCode", row.menuKindCode);
+        this.$set(this.formScript, "menuKindName", row.name);
       }
     },
     getBdEnv() {
       getBdFlag({
-        success: res => {
-          this.isDev = res.objx == 1
-        }
+        success: (res) => {
+          this.isDev = res.objx == 1;
+        },
       });
     },
     getMenuKindAuth(menuKindCode) {
-      if(this.otherFlag){
+      if (this.otherFlag) {
         this.getOtherMenuKindAuth();
-      }else if (menuKindCode) {
+      } else if (menuKindCode) {
         this.$http({
           aes: true,
-          url: USER_PREFIX + '/menu_kind_auth/getAuth',
+          url: USER_PREFIX + "/menu_kind_auth/getAuth",
           method: `post`,
-          data: {stringOne: menuKindCode},
+          data: { stringOne: menuKindCode },
           isLoading: true,
-          success: res => {
-            this.menuKindAuth = res.objx || {}
-          }
+          success: (res) => {
+            this.menuKindAuth = res.objx || {};
+          },
         });
       }
     },
@@ -201,7 +224,7 @@ modules = {
           aes: true,
           url: USER_PREFIX + "/form_script_auth/getAuth",
           method: `post`,
-          data: {stringOne: this.formScript.sid},
+          data: { stringOne: this.formScript.sid },
           isLoading: true,
           success: (res) => {
             this.menuKindAuth = res.objx || {};
@@ -209,13 +232,13 @@ modules = {
         });
       }
     },
-    openOtherAuthDialog(){
-      this.sid = this.formScript.sid
-      this.showOtherAuthDialog = true
+    openOtherAuthDialog() {
+      this.sid = this.formScript.sid;
+      this.showOtherAuthDialog = true;
     },
-    confirmOtherAuthDialog(){
-      this.$baseReload()
+    confirmOtherAuthDialog() {
+      this.$baseReload();
     },
-  }
+  },
 };
-export default modules
+export default modules;

package/src/views/bd/setting/form_script/mixins/edit1.js

@@ -2,27 +2,34 @@ import formOplogTable from "@base/components/formOplog/index.vue";
 import preformDialog from "@base/views/bd/setting/form_script/preformDialog.vue";
 import projectTagView from "@base/components/projectTag/view.vue";
 import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
-import {getBdFlag} from "@base/api/user";
+import { getBdFlag } from "@base/api/user";
 import otherAuthDialog from "../otherAuthDialog.vue";
 
 let modules = {};
 modules = {
-  name: 'user_form_scriptEdit',
+  name: "user_form_scriptEdit",
   props: {
     _dataId: [String, Number],
     formCode: String,
     formTemplate: Object,
     currentFormType: Object,
     // readonly: Boolean,
-    otherFlag:Boolean,
+    otherFlag: Boolean,
     hData: Object,
+    compareHData: Object,
+  },
+  components: {
+    formOplogTable,
+    preformDialog,
+    projectTagView,
+    MenuKindDialog,
+    otherAuthDialog,
   },
-  components: {formOplogTable, preformDialog, projectTagView, MenuKindDialog,otherAuthDialog},
   data() {
     return {
       isEdit: false,
-      tabIndex: 'first',
-      dataId: '',
+      tabIndex: "first",
+      dataId: "",
       formScript: {
         scriptType: 1,
         enabled: true,
@@ -31,24 +38,35 @@ modules = {
         menuKindName: null,
         serviceName: null,
         transactions: 1,
-        formScriptTagDTOs: []
+        formScriptTagDTOs: [],
+      },
+      oldFormScript: {
+        scriptType: 1,
+        enabled: true,
+        formCode: null,
+        menuKindCode: null,
+        menuKindName: null,
+        serviceName: null,
+        transactions: 1,
+        formScriptTagDTOs: [],
       },
       showCodeEditor: false,
       showMenuKindDialog: false,
       isDev: true,
       showPreformDialog: false,
       menuKindAuth: {
-        editAuth: 0
+        editAuth: 0,
       },
       sid: null,
-      showOtherAuthDialog:false,
+      showOtherAuthDialog: false,
       readonly: false,
+      isCompare: false,
     };
   },
   created() {
-    if(this.hData){
+    if (this.hData) {
       this.readonly = true;
-    }else{
+    } else {
       this.readonly = this.$attrs.readonly || false;
     }
     if (this._dataId && !isNaN(this._dataId)) {
@@ -60,12 +78,12 @@ modules = {
         this.formScript.menuKindName = this.formTemplate.menuKindName;
         this.formScript.serviceName = this.formTemplate.serviceName;
       } else {
-        this.formScript.formCode = 'intf';
+        this.formScript.formCode = "intf";
         this.formScript.menuKindName = this.currentFormType?.name || null;
-        this.formScript.menuKindCode = this.currentFormType?.menuKindCode || null;
+        this.formScript.menuKindCode =
+          this.currentFormType?.menuKindCode || null;
         this.formScript.serviceName = this.currentFormType?.serviceName || null;
       }
-
     }
   },
   mounted() {
@@ -81,50 +99,55 @@ modules = {
           url: USER_PREFIX + `/formScript/get`,
           method: `post`,
           data: {
-            id: this.dataId
+            id: this.dataId,
           },
           isLoading: true,
           modalStrictly: true,
-          success: res => {
+          success: (res) => {
             this.formScript = res.objx || {};
             this.showCodeEditor = true;
             this.getMenuKindAuth(this.formScript.menuKindCode);
             //获取操作日志数据
-            this.$refs['oplogTable'].initData({
+            this.$refs["oplogTable"].initData({
               param: () => {
                 return {
                   logType: "FormScript",
-                  logObjCode: this.formScript.sid
+                  logObjCode: this.formScript.sid,
                 };
-              }
+              },
             });
-          }
+          },
         });
-      } else if (this.hData){
+      } else if (this.hData) {
         this.isEdit = true;
         this.formScript = this.$baseLodash.cloneDeep(this.hData);
-        this.dataId = this.hData.id
+        this.dataId = this.hData.id;
         this.isInited = true;
         this.getMenuKindAuth(this.formScript.menuKindCode);
         this.showCodeEditor = true;
+        if (this.compareHData && this.$attrs.isCompare) {
+          this.oldFormScript = this.$baseLodash.cloneDeep(this.compareHData);
+          this.isCompare = true;
+        }
       } else {
         this.getMenuKindAuth(this.formScript.menuKindCode);
         this.showCodeEditor = true;
       }
     },
     saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
+      this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
           this.openPreformDialog();
         }
       });
     },
     saveDataHandle(preformData) {
-      var url = USER_PREFIX + (this.isEdit ? `/formScript/update` : `/formScript/save`);
+      var url =
+        USER_PREFIX + (this.isEdit ? `/formScript/update` : `/formScript/save`);
       let formData = {
         ...this.formScript,
         logContent: preformData.logContent,
-        transactions: preformData.transactions
+        transactions: preformData.transactions,
       };
       this.$http({
         aes: true,
@@ -132,24 +155,24 @@ modules = {
         method: `post`,
         data: formData,
         isLoading: true,
-        success: res => {
+        success: (res) => {
           this.$message({
             message: res.content,
-            type: 'success',
+            type: "success",
             duration: 500,
-            onClose: t => {
+            onClose: (t) => {
               if (this.isEdit) {
                 this.$baseReload();
               } else {
                 this.$baseReload({
                   updateParam: {
-                    _dataId: res.objx
-                  }
+                    _dataId: res.objx,
+                  },
                 });
               }
-            }
+            },
           });
-        }
+        },
       });
     },
     openPreformDialog() {
@@ -161,30 +184,30 @@ modules = {
     confirmInsertMenuKind(rows) {
       if (rows.length > 0) {
         let row = rows[0];
-        this.$set(this.formScript, 'menuKindCode', row.menuKindCode);
-        this.$set(this.formScript, 'menuKindName', row.name);
+        this.$set(this.formScript, "menuKindCode", row.menuKindCode);
+        this.$set(this.formScript, "menuKindName", row.name);
       }
     },
     getBdEnv() {
       getBdFlag({
-        success: res => {
-          this.isDev = res.objx == 1
-        }
+        success: (res) => {
+          this.isDev = res.objx == 1;
+        },
       });
     },
     getMenuKindAuth(menuKindCode) {
-      if(this.otherFlag){
+      if (this.otherFlag) {
         this.getOtherMenuKindAuth();
-      }else if (menuKindCode) {
+      } else if (menuKindCode) {
         this.$http({
           aes: true,
-          url: USER_PREFIX + '/menu_kind_auth/getAuth',
+          url: USER_PREFIX + "/menu_kind_auth/getAuth",
           method: `post`,
-          data: {stringOne: menuKindCode},
+          data: { stringOne: menuKindCode },
           isLoading: true,
-          success: res => {
-            this.menuKindAuth = res.objx || {}
-          }
+          success: (res) => {
+            this.menuKindAuth = res.objx || {};
+          },
         });
       }
     },
@@ -195,7 +218,7 @@ modules = {
           aes: true,
           url: USER_PREFIX + "/form_script_auth/getAuth",
           method: `post`,
-          data: {stringOne: this.formScript.sid},
+          data: { stringOne: this.formScript.sid },
           isLoading: true,
           success: (res) => {
             this.menuKindAuth = res.objx || {};
@@ -203,13 +226,13 @@ modules = {
         });
       }
     },
-    openOtherAuthDialog(){
-      this.sid = this.formScript.sid
-      this.showOtherAuthDialog = true
+    openOtherAuthDialog() {
+      this.sid = this.formScript.sid;
+      this.showOtherAuthDialog = true;
     },
-    confirmOtherAuthDialog(){
-      this.$baseReload()
+    confirmOtherAuthDialog() {
+      this.$baseReload();
     },
-  }
+  },
 };
-export default modules
+export default modules;