cloud-web-corejs 1.0.54-dev.603 → 1.0.54-dev.605

package/package.json

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

package/src/layout/components/extractedCode/queryDialog.vue

@@ -12,24 +12,34 @@
     :before-close="dialogClose"
   >
     <div class="cont">
-      <el-form ref="editCategoryForm" :model="formData" label-width="102px" class="adSearchForm" style="height: auto; width: auto;">
+      <el-form
+        ref="editCategoryForm"
+        :model="formData"
+        label-width="102px"
+        class="adSearchForm"
+        style="height: auto; width: auto"
+      >
         <el-form-item :label="$t1('提取码')">
-          <el-input v-model="formData.extractedCode" clearable class="all-width"/>
+          <el-input v-model="formData.extractedCode" clearable class="all-width" />
         </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" plain class="button-sty" @click="dialogClose">
         <i class="el-icon-close el-icon"></i>
-        {{ $t2('取 消', 'system.button.cancel2') }}
+        {{ $t2("取 消", "system.button.cancel2") }}
       </el-button>
       <el-button type="primary" @click="dialogConfirm" class="button-sty">
         <i class="el-icon-check el-icon"></i>
-        {{ $t1('确定') }}
+        {{ $t1("确定") }}
       </el-button>
     </span>
-    <viewDialog v-if="showViewDialog" :visiable.sync="showViewDialog" @close="dialogClose"
-                :extractedObj="extractedObj"></viewDialog>
+    <viewDialog
+      v-if="showViewDialog"
+      :visiable.sync="showViewDialog"
+      @close="dialogClose"
+      :extractedRow="extractedRow"
+    ></viewDialog>
   </el-dialog>
 </template>
 <script>
@@ -38,59 +48,56 @@ import viewDialog from "./viewDialog.vue";
 export default {
   name: "createDialog",
   components: {
-    viewDialog
+    viewDialog,
   },
   data() {
     return {
       showDialog: true,
       formData: {
-        extractedCode: null
+        extractedCode: null,
       },
       showViewDialog: false,
-      extractedObj: {}
-    }
+      extractedRow: {},
+    };
   },
   methods: {
     dialogConfirm() {
       if (!this.formData.extractedCode) {
         this.$baseAlert(this.$t1("提取码不能为空"));
-        return
+        return;
       }
       this.$http({
         aes: true,
         url: USER_PREFIX + `/form_develop/getExtractedObjData`,
         method: `post`,
         data: {
-          stringOne: this.formData.extractedCode
+          stringOne: this.formData.extractedCode,
         },
         isLoading: true,
-        success: res => {
-          let rows = res.objx || []
+        success: (res) => {
+          let rows = res.objx || [];
           if (rows.length) {
             let row = rows[0];
-            let obj = row.obj
+            let obj = row.obj;
             if (!obj) {
               this.$baseAlert(this.$t1("提取对象为空"));
-              return
+              return;
             }
-            this.extractedObj = row;
+            this.extractedRow = row;
             this.showDialog = false;
             this.showViewDialog = true;
           } else {
             this.$baseAlert(this.$t1("无效提取码"));
           }
-        }
-      })
+        },
+      });
     },
     dialogClose() {
       this.showDialog = false;
-      this.$emit('update:visiable', false)
+      this.$emit("update:visiable", false);
     },
-  }
-}
+  },
+};
 </script>
 
-
-<style scoped>
-
-</style>
+<style scoped></style>

package/src/layout/components/extractedCode/viewDialog.vue

@@ -27,21 +27,33 @@
         @openDesignDialog="openDesingerDialogByChild"
         :extractedObj="extractedObj"
       ></component>
-      <el-drawer :title="$t1('表单设计({formName})',{formName})" :visible.sync="showDesingerDialog" :modal="false"
-                 :destroy-on-close="true"
-                 size="100%" direction="rtl" :before-close="closeFormDesignwinEvent" :append-to-body="false"
-                 class="designer-drawer" :class="[isFullscreen ? 'is-fullscreen' : '']" @close="handleFormDesignClose">
+      <el-drawer
+        :title="$t1('表单设计({formName})', { formName })"
+        :visible.sync="showDesingerDialog"
+        :modal="false"
+        :destroy-on-close="true"
+        size="100%"
+        direction="rtl"
+        :before-close="closeFormDesignwinEvent"
+        :append-to-body="false"
+        class="designer-drawer"
+        :class="[isFullscreen ? 'is-fullscreen' : '']"
+        @close="handleFormDesignClose"
+      >
         <el-tabs v-model="formDesTabs" type="card" class="tab-boxOnly" :stretch="true">
           <el-tab-pane :label="$t1('设计器')" name="first">
-            <designer ref="designer" :formCode.sync="formCode" :readonly="true"
-                      @reflushTemplateList="reflushTemplateList"></designer>
+            <designer
+              ref="designer"
+              :formCode.sync="formCode"
+              :readonly="true"
+              @reflushTemplateList="reflushTemplateList"
+            ></designer>
           </el-tab-pane>
         </el-tabs>
         <el-button class="isFullIcon" v-if="!isFullscreen" @click="handleFullscreen">
           <el-tooltip effect="dark" :content="$t1('全屏')" placement="top">
             <i class="iconfont icon-quanping"></i>
           </el-tooltip>
-
         </el-button>
         <el-button class="isFullIcon" v-else @click="handleFullscreen">
           <el-tooltip effect="dark" :content="$t1('缩小')" placement="top">
@@ -54,17 +66,15 @@
 </template>
 
 <script>
-
-
 import indexUtil from "@base/utils";
 import designer from "@base/views/user/form/vform/designer.vue";
 
 export default {
   name: "wfContentDialog",
   props: {
-    extractedObj: Object,
+    extractedRow: Object,
   },
-  components: {designer},
+  components: { designer },
   data() {
     return {
       param: {},
@@ -76,57 +86,59 @@ export default {
       formCode: null,
       formName: null,
       isFullscreen: false,
-      formDesTabs: 'first',
-      title: null
+      formDesTabs: "first",
+      title: null,
+      extractedObj: null,
     };
   },
   mounted() {
     this.$nextTick(() => {
       this.openWfDialog();
-    })
+    });
   },
   methods: {
     wfClose() {
       this.showWfDialog = false;
-      this.$emit('update:visible', false);
-      this.$emit('close');
+      this.$emit("update:visible", false);
+      this.$emit("close");
     },
     openWfDialog() {
-      let extractedObj = this.extractedObj;
-      let objType = extractedObj.objType;
-      let obj = extractedObj.obj;
+      let obj = this.extractedRow?.obj;
+      if (!obj) return;
+      this.extractedObj = obj;
+      let objType = this.extractedRow.objType;
       let id = obj.id;
       let wfDataId = id;
       let param = {
-        readonly: true
+        readonly: true,
       };
 
       let url;
       if (objType == "FormTemplate") {
-        url = "/bd/setting/form_template/edit.vue"
+        url = "/bd/setting/form_template/edit.vue";
         wfDataId = obj.formCode;
         this.title = this.$t1("查看表单模板");
       } else if (objType == "FormScript") {
         if (obj.scriptType == 1) {
-          url = "/bd/setting/form_script/edit1.vue"
+          url = "/bd/setting/form_script/edit1.vue";
         } else {
-          url = "/bd/setting/form_script/edit.vue"
+          url = "/bd/setting/form_script/edit.vue";
         }
         this.title = this.$t1("查看表单脚本");
       } else if (objType == "TableTemplate") {
-        url = "/bd/setting/table_model/edit.vue"
+        url = "/bd/setting/table_model/edit.vue";
         this.title = this.$t1("查看数据表定义模板");
       }
       this.param = Object.assign(param, {
-        _dataId: wfDataId
+        _dataId: wfDataId,
       });
-      this.wfContent = require('@base/views' + url).default;
+      this.wfContent = require("@base/views" + url).default;
 
       this.showWfContent = true;
     },
 
     handleFormDesignClose() {
-      this.formDesTabs = 'first';
+      this.formDesTabs = "first";
       this.showFormScriptList = false;
     },
     openDesingerDialog(row, callback) {
@@ -137,8 +149,8 @@ export default {
       this.showDesingerDialog = true;
       this.designerSaveCallback = callback ?? null;
     },
-    openDesingerDialogByChild({row, callback}) {
-      this.openDesingerDialog(row, callback)
+    openDesingerDialogByChild({ row, callback }) {
+      this.openDesingerDialog(row, callback);
     },
     reflushTemplateList() {
       // this.searchEvent();
@@ -159,9 +171,8 @@ export default {
         done && done();
       });
     },
-
-  }
-}
+  },
+};
 </script>
 
 <style scoped>
@@ -173,21 +184,26 @@ export default {
 
 ::v-deep .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
   .detail-wrap .d-cont {
-    height: calc(100vh - 158px) !important
+    height: calc(100vh - 158px) !important;
   }
 
   .grid-height {
-    height: calc(100vh - 126px) !important
+    height: calc(100vh - 126px) !important;
   }
 }
 
-::v-deep .designer-drawer.is-fullscreen .tab-boxOnly > .el-tabs__content .el-tab-pane .el-tab-pane {
+::v-deep
+  .designer-drawer.is-fullscreen
+  .tab-boxOnly
+  > .el-tabs__content
+  .el-tab-pane
+  .el-tab-pane {
   .detail-wrap .d-cont {
-    height: calc(100vh - 116px) !important
+    height: calc(100vh - 116px) !important;
   }
 
   .grid-height {
-    height: calc(100vh - 84px) !important
+    height: calc(100vh - 84px) !important;
   }
 }
 </style>

package/src/views/bd/setting/formVersion/compareDialog.vue

@@ -68,6 +68,7 @@
         :readonly="designerReadonly"
         :showFormScript="false"
         :historyFlag="true"
+        :jsonFlag="true"
         :formTemplate="currentFormTemplate"
       ></formDesignerDialog>
     </el-dialog>

package/src/views/bd/setting/formVersion/ftHistoryDialog.vue

@@ -107,6 +107,7 @@
         :readonly="designerReadonly"
         :showFormScript="false"
         :historyFlag="true"
+        :jsonFlag="true"
         :formTemplate="currentFormTemplate"
       ></formDesignerDialog>
     </el-dialog>

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

@@ -97,8 +97,27 @@ modules = {
     this.getData();
   },
   methods: {
+    initData(formData){
+      if(!!formData?.id)this.isEdit = true;
+      this.formScript = formData || {};
+      this.showCodeEditor = true;
+      this.getMenuKindAuth(this.formScript.menuKindCode);
+    },
     getData() {
-      if (this.dataId && !isNaN(this.dataId)) {
+      debugger
+      if(this.extractedObj){
+        this.dataId = this.extractedObj.id;
+        this.initData(this.extractedObj)
+        //获取操作日志数据
+        this.$refs["oplogTable"].initData({
+          param: () => {
+            return {
+              logType: "FormScript",
+              logObjCode: this.formScript.sid,
+            };
+          },
+        });
+      }else if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$commonHttp({
           aes: true,
@@ -110,9 +129,10 @@ modules = {
           isLoading: true,
           modalStrictly: true,
           success: (res) => {
-            this.formScript = res.objx || {};
-            this.showCodeEditor = true;
-            this.getMenuKindAuth(this.formScript.menuKindCode);
+            // this.formScript = res.objx || {};
+            // this.showCodeEditor = true;
+            // this.getMenuKindAuth(this.formScript.menuKindCode);
+            this.initData(res.objx)
             //获取操作日志数据
             this.$refs["oplogTable"].initData({
               param: () => {
@@ -125,12 +145,13 @@ modules = {
           },
         });
       } else if (this.hData) {
-        this.isEdit = true;
-        this.formScript = this.$baseLodash.cloneDeep(this.hData);
         this.dataId = this.hData.id;
-        this.isInited = true;
+        /* this.isEdit = true;
+        this.formScript = this.$baseLodash.cloneDeep(this.hData);
         this.getMenuKindAuth(this.formScript.menuKindCode);
-        this.showCodeEditor = true;
+        this.showCodeEditor = true; */
+        this.initData(this.$baseLodash.cloneDeep(this.hData))
+
         if (this.compareHData && this.$attrs.isCompare) {
           this.oldFormScript = this.$baseLodash.cloneDeep(this.compareHData);
           this.isCompare = true;

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

@@ -91,8 +91,26 @@ modules = {
     this.getData();
   },
   methods: {
+    initData(formData){
+      if(!!formData?.id)this.isEdit = true;
+      this.formScript = formData || {};
+      this.showCodeEditor = true;
+      this.getMenuKindAuth(this.formScript.menuKindCode);
+    },
     getData() {
-      if (this.dataId && !isNaN(this.dataId)) {
+      if(this.extractedObj){
+        this.dataId = this.extractedObj.id;
+        this.initData(this.extractedObj)
+        //获取操作日志数据
+        this.$refs["oplogTable"].initData({
+          param: () => {
+            return {
+              logType: "FormScript",
+              logObjCode: this.formScript.sid,
+            };
+          },
+        });
+      }else if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$commonHttp({
           aes: true,
@@ -104,9 +122,10 @@ modules = {
           isLoading: true,
           modalStrictly: true,
           success: (res) => {
-            this.formScript = res.objx || {};
-            this.showCodeEditor = true;
-            this.getMenuKindAuth(this.formScript.menuKindCode);
+            // this.formScript = res.objx || {};
+            // this.showCodeEditor = true;
+            // this.getMenuKindAuth(this.formScript.menuKindCode);
+            this.initData(res.objx)
             //获取操作日志数据
             this.$refs["oplogTable"].initData({
               param: () => {
@@ -119,12 +138,13 @@ modules = {
           },
         });
       } else if (this.hData) {
-        this.isEdit = true;
-        this.formScript = this.$baseLodash.cloneDeep(this.hData);
         this.dataId = this.hData.id;
-        this.isInited = true;
+        /* this.isEdit = true;
+        this.formScript = this.$baseLodash.cloneDeep(this.hData);
         this.getMenuKindAuth(this.formScript.menuKindCode);
-        this.showCodeEditor = true;
+        this.showCodeEditor = true; */
+        this.initData(this.$baseLodash.cloneDeep(this.hData))
+
         if (this.compareHData && this.$attrs.isCompare) {
           this.oldFormScript = this.$baseLodash.cloneDeep(this.compareHData);
           this.isCompare = true;

package/src/views/bd/setting/form_template/formDesignerDialog.vue

@@ -24,6 +24,7 @@
           :columnFlag="columnFlag"
           :sourceData="sourceData"
           :formTemplate="formTemplate"
+          :jsonFlag="jsonFlag"
         ></designer>
       </el-tab-pane>
       <el-tab-pane :label="$t1('后端脚本')" name="second" v-if="showFormScript">
@@ -78,6 +79,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    jsonFlag: {
+      type: Boolean,
+      default: false,
+    },
     widgetList: Array,
     columnFlag: Boolean,
     sourceData: Object,

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

@@ -101,8 +101,18 @@ modules = {
       });
     },
     getData() {
-      if(this.extractedObj?.objx){
-        this.initData(this.extractedObj.objx)
+      if(this.extractedObj){
+        this.dataId = this.extractedObj.id;
+        this.initData(this.extractedObj)
+        //获取操作日志数据
+        this.$refs['oplogTable'].initData({
+          param: () => {
+            return {
+              logType: "FormTemplate",
+              logObjCode: this.formTemplate.formCode
+            };
+          }
+        });
       }else if (this.dataId) {
         this.$commonHttp({
           aes: true,

package/src/views/bd/setting/form_template/mixins/list.js

@@ -136,7 +136,7 @@ modules = {
       isDev: true,
       menuKindAuth: {},
       showTree: false,
-      designerReadonly: false
+      designerReadonly: false,
     };
   },
   computed: {
@@ -211,7 +211,6 @@ modules = {
       }
     },
     openDesingerDialog(row, callback, readonly = false) {
-      debugger;
       this.formCode = row.formCode;
       this.formName = row.formName;
       this.currentFormTemplate = row;

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

@@ -163,8 +163,26 @@ modules = {
     this.getData();
   },
   methods: {
+    initData(formData){
+      if(!!formData?.id)this.isEdit = true;
+      this.szTaMb = formData;
+      this.getMenuKindAuth(formData.menuKindCode);
+      if(!!formData?.id)this.getCreatedTableColumns();
+    },
     getData(callback) {
-      if (this.dataId && !isNaN(this.dataId)) {
+      if(this.extractedObj){
+        this.dataId = this.extractedObj.id;
+        this.initData(this.extractedObj)
+        //获取操作日志数据
+        this.$refs["oplogTable"].initData({
+          param: () => {
+            return {
+              logType: "SzTaMb",
+              logObjCode: this.szTaMb.taCode,
+            };
+          },
+        });
+      }else if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$http({
           aes: true,
@@ -181,10 +199,11 @@ modules = {
               szTaMb.szTaZdMbDTOs = this.szTaMb.szTaZdMbDTOs;
               szTaMb.attachmentDTOs = this.szTaMb.attachmentDTOs;
               szTaMb.oplogDTOs = this.szTaMb.oplogDTOs;
-              this.szTaMb = szTaMb;
 
-              this.getCreatedTableColumns();
-              this.getMenuKindAuth(this.szTaMb.menuKindCode);
+              // this.szTaMb = szTaMb;
+              // this.getCreatedTableColumns();
+              // this.getMenuKindAuth(this.szTaMb.menuKindCode);
+              this.initData(szTaMb);
             } else {
               callback(res);
             }
@@ -200,11 +219,12 @@ modules = {
           },
         });
       } else if (this.hData){
-        this.isEdit = true;
-        this.szTaMb = this.$baseLodash.cloneDeep(this.hData);
         this.dataId = this.hData.id
+        /* this.isEdit = true;
+        this.szTaMb = this.$baseLodash.cloneDeep(this.hData);
         this.getMenuKindAuth(this.szTaMb.menuKindCode);
-        this.getCreatedTableColumns();
+        this.getCreatedTableColumns(); */
+        this.initData(this.$baseLodash.cloneDeep(this.hData));
         if (this.compareHData && this.$attrs.isCompare) {
           this.oldSzTaMb = this.$baseLodash.cloneDeep(this.compareHData);
           let oldSzTaZdMbDTOs = this.$baseLodash.cloneDeep(this.compareHData.szTaZdMbDTOs) || [];

package/src/views/user/form/vform/designer.vue

@@ -35,7 +35,7 @@ export default {
     widgetList: Array,
     columnFlag: Boolean,
     sourceData: Object,
-    historyFlag: Boolean,
+    jsonFlag: Boolean,
   },
   components: {
     VFormDesigner,
@@ -91,6 +91,9 @@ export default {
     getTemplate() {
       /* this.showDesinger = true;
       return */
+      debugger;
+      let a = 1;
+      let b = 1;
       if (this.columnFlag) {
         this.reportTemplate = this.formTemplate;
         this.showDesinger = true;
@@ -101,7 +104,7 @@ export default {
           });
           this.$refs.designer.setFormJson(formJson);
         });
-      } else if (this.formTemplate) {
+      } else if (this.jsonFlag && this.formTemplate) {
         this.reportTemplate = this.$baseLodash.cloneDeep(this.formTemplate);
         this.showDesinger = true;
         this.$nextTick(() => {