cloud-web-corejs 1.0.276 → 1.0.278

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

@@ -15,6 +15,7 @@
       </el-tab-pane>
       <el-tab-pane :label="$t1('列表')" name="second">
         <div class="tree-box fl">
+          <slot name="treeTop"></slot>
           <div class="tit">
             <b>{{ $t1("表单分类") }}</b>
           </div>
@@ -159,6 +160,7 @@
                 <formVersionButton
                   objType="FormTemplate"
                   :objCode="row.formCode"
+                  :sid="row.sid"
                   @reverCallback="searchEvent"
                 ></formVersionButton>
                 <a

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

@@ -2,24 +2,24 @@ import projectTagView from "@base/components/projectTag/view.vue";
 import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
 import preformDialog from "@base/views/bd/setting/form_template/preformDialog.vue";
 import formOplogTable from "@base/components/formOplog/index.vue";
-import {getBdFlag} from "@base/api/user";
+import { getBdFlag } from "@base/api/user";
 import otherAuthDialog from "../otherAuthDialog.vue";
 
 let modules = {};
 modules = {
-  name: 'bd_form_templateEdit',
+  name: "bd_form_templateEdit",
   props: {
     _dataId: [String, Number],
     currentFormType: Object,
     // readonly: Boolean,
-    otherFlag:Boolean,
+    otherFlag: Boolean,
     extractedObj: {
-      type:Object,
-      default:()=> null
+      type: Object,
+      default: () => null,
     },
-    hData:{
-      type:Object,
-      default:()=> null
+    hData: {
+      type: Object,
+      default: () => null,
     },
     compareHData: Object,
   },
@@ -28,62 +28,63 @@ modules = {
     MenuKindDialog,
     preformDialog,
     formOplogTable,
-    otherAuthDialog
+    otherAuthDialog,
   },
   data() {
     return {
       isEdit: false,
-      tabIndex: 'first',
-      dataId: '',
+      tabIndex: "first",
+      dataId: "",
       formTemplate: {
         enabled: true,
         history: false,
-        serviceId: 'user',
+        serviceId: "user",
         formTypeCode: null,
         menuKindName: null,
         menuKindCode: null,
         serviceName: null,
         formTemplateTagDTOs: [],
-        hasWf: false
+        hasWf: false,
       },
       oldFormTemplate: {
         enabled: true,
         history: false,
-        serviceId: 'user',
+        serviceId: "user",
         formTypeCode: null,
         menuKindName: null,
         menuKindCode: null,
         serviceName: null,
         formTemplateTagDTOs: [],
-        hasWf: false
+        hasWf: false,
       },
       isInited: false,
-      serviceIds: ['user'],
+      serviceIds: ["user"],
       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.extractedObj?.objx?.id){
+    if (this.extractedObj?.objx?.id) {
       this.dataId = this.extractedObj.obj.id;
-    }else if (this._dataId) {
+    } else if (this._dataId) {
       this.dataId = this._dataId;
     } else {
       this.formTemplate.menuKindName = this.currentFormType?.name || null;
-      this.formTemplate.menuKindCode = this.currentFormType?.menuKindCode || null;
+      this.formTemplate.menuKindCode =
+        this.currentFormType?.menuKindCode || null;
       this.formTemplate.serviceName = this.currentFormType?.serviceName || null;
     }
   },
@@ -92,7 +93,7 @@ modules = {
     this.getData();
   },
   methods: {
-    initData(formData){
+    initData(formData) {
       this.isEdit = true;
       this.formTemplate = formData || {};
       this.getMenuKindAuth(this.formTemplate.menuKindCode);
@@ -101,38 +102,38 @@ modules = {
       });
     },
     getData() {
-      if(this.extractedObj){
+      if (this.extractedObj) {
         this.dataId = this.extractedObj.id;
-        this.initData(this.extractedObj)
+        this.initData(this.extractedObj);
         //获取操作日志数据
-        this.$refs['oplogTable'].initData({
+        this.$refs["oplogTable"].initData({
           param: () => {
             return {
               logType: "FormTemplate",
-              logObjCode: this.formTemplate.formCode
+              logObjCode: this.formTemplate.formCode,
             };
-          }
+          },
         });
-      }else if (this.dataId) {
+      } else if (this.dataId) {
         this.$commonHttp({
           aes: true,
           url: USER_PREFIX + `/formTemplate/get`,
           method: `post`,
           data: {
-            id: this.dataId
+            id: this.dataId,
           },
           isLoading: true,
           modalStrictly: true,
-          success: res => {
-            this.initData(res.objx)
+          success: (res) => {
+            this.initData(res.objx);
             //获取操作日志数据
-            this.$refs['oplogTable'].initData({
+            this.$refs["oplogTable"].initData({
               param: () => {
                 return {
                   logType: "FormTemplate",
-                  logObjCode: this.formTemplate.formCode
+                  logObjCode: this.formTemplate.formCode,
                 };
-              }
+              },
             });
             /* this.formTemplate = res.objx || {};
             this.getMenuKindAuth(this.formTemplate.menuKindCode);
@@ -148,12 +149,12 @@ modules = {
                 };
               }
             }); */
-          }
+          },
         });
-      } else if (this.hData){
+      } else if (this.hData) {
         this.isEdit = true;
         this.formTemplate = this.$baseLodash.cloneDeep(this.hData);
-        this.dataId = this.hData.id
+        this.dataId = this.hData.id;
         this.isInited = true;
         this.getMenuKindAuth(this.formTemplate.menuKindCode);
         if (this.compareHData && this.$attrs.isCompare) {
@@ -166,17 +167,19 @@ modules = {
       }
     },
     saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
+      this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
           this.openPreformDialog();
         }
       });
     },
     saveDataHandle(preformData) {
-      var url = USER_PREFIX + (this.isEdit ? `/formTemplate/update` : `/formTemplate/save`);
+      var url =
+        USER_PREFIX +
+        (this.isEdit ? `/formTemplate/update` : `/formTemplate/save`);
       let formData = {
         ...this.formTemplate,
-        logContent: preformData.logContent
+        logContent: preformData.logContent,
       };
       this.$http({
         aes: true,
@@ -184,24 +187,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 || this.formTemplate.id
-                  }
+                    _dataId: res.objx.id || this.formTemplate.id,
+                  },
                 });
               }
-            }
+            },
           });
-        }
+        },
       });
     },
     openPreformDialog() {
@@ -213,40 +216,40 @@ modules = {
     confirmInsertMenuKind(rows) {
       if (rows.length > 0) {
         let row = rows[0];
-        this.$set(this.formTemplate, 'menuKindCode', row.menuKindCode);
-        this.$set(this.formTemplate, 'menuKindName', row.name);
+        this.$set(this.formTemplate, "menuKindCode", row.menuKindCode);
+        this.$set(this.formTemplate, "menuKindName", row.name);
       }
     },
     getBdEnv() {
       getBdFlag({
-        success: res => {
-          this.isDev = res.objx === 1
-        }
+        success: (res) => {
+          this.isDev = res.objx === 1;
+        },
       });
     },
     openDesignDialog() {
-      let readonly = this.readonly || !this.menuKindAuth.editAuth
-      this.$emit('openDesignDialog', {
+      let readonly = this.readonly || !this.menuKindAuth.editAuth;
+      this.$emit("openDesignDialog", {
         row: this.formTemplate,
         readonly,
         callback: () => {
-          this.$baseReload()
-        }
-      })
+          this.$baseReload();
+        },
+      });
     },
     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 || {};
+          },
         });
       }
     },
@@ -257,7 +260,7 @@ modules = {
           aes: true,
           url: USER_PREFIX + "/form_template_auth/getAuth",
           method: `post`,
-          data: {stringOne: this.formTemplate.sid},
+          data: { stringOne: this.formTemplate.sid },
           isLoading: true,
           success: (res) => {
             this.menuKindAuth = res.objx || {};
@@ -265,13 +268,13 @@ modules = {
         });
       }
     },
-    openOtherAuthDialog(){
-      this.sid = this.formTemplate.sid
-      this.showOtherAuthDialog = true
+    openOtherAuthDialog() {
+      this.sid = this.formTemplate.sid;
+      this.showOtherAuthDialog = true;
     },
-    confirmOtherAuthDialog(){
-      this.$baseReload()
+    confirmOtherAuthDialog() {
+      this.$baseReload();
     },
-  }
+  },
 };
-export default modules
+export default modules;

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

@@ -11,6 +11,7 @@
             v-if="!hData && szTaMb.id && !readonly"
             objType="SzTaMb"
             :objCode="szTaMb.taCode"
+            :sid="szTaMb.sid"
             @reverCallback="$baseReload()"
           ></formVersionButton>
           <reverButton
@@ -211,16 +212,14 @@
                           class="search-input"
                           max="200"
                           v-model="szTaMb.sszstEn"
-                          @clear="
-                            szTaMb.sszst = null;
-                            szTaMb.sszstBm = null;
-                            $forceUpdate();
-                          "
+                          @clear="clearSszst"
                           :disabled="szTaMb.taType === 0"
                           v-el-readonly
                           clearable
                         >
+                          <!-- element 的 suffix 插槽不受 disabled 影响，图标要自己按禁用条件收起来 -->
                           <i
+                            v-if="szTaMb.taType !== 0"
                             slot="suffix"
                             class="el-input__icon el-icon-search"
                             @click="showSzTaMbDialog = true"
@@ -292,15 +291,13 @@
                           class="search-input"
                           max="200"
                           v-model="szTaMb.menuKindName"
-                          @clear="
-                            szTaMb.menuKindCode = '';
-                            $forceUpdate();
-                          "
+                          @clear="clearMenuKind"
                           v-el-readonly
                           clearable
                           :disabled="otherFlag"
                         >
                           <i
+                            v-if="!otherFlag"
                             slot="suffix"
                             class="el-input__icon el-icon-search"
                             @click="showMenuKindDialog = true"
@@ -395,7 +392,7 @@
               class="button-sty"
               icon="el-icon-upload2"
               @click="excelExport"
-              >导出</el-button
+              >{{ $t1("导出") }}</el-button
             >
           </template>
           <template #default>
@@ -468,11 +465,12 @@
                       >
                         <span slot="suffix" class="el-input__suffix-inner">
                           <i
-                            v-if="row.referenceZd"
+                            v-if="row.referenceZd && !!row.zdEn"
                             class="el-input__icon el-icon-circle-close"
                             @click.stop="confirmClearReferenceZd(row)"
                           ></i>
                           <i
+                            v-if="!!row.zdEn"
                             class="el-input__icon el-icon-search"
                             @click="openReferenceZdDialog(row, rowIndex, $table)"
                           ></i>
@@ -509,7 +507,7 @@
                       >
                         <el-input
                           v-model="row.zdEn"
-                          @keydown.native="inputZdEn(row)"
+                          @focus="cacheZdEn(row)"
                           @input="
                             (val) => {
                               changeZdEn(val, row);
@@ -673,11 +671,11 @@
                         class="search-input"
                         v-model="row.toTaBmZd"
                         clearable
-                        @clear="$forceUpdate()"
                         v-el-readonly
                         :disabled="!!row.systems || !!row.relationZd"
                       >
                         <i
+                          v-if="!row.systems && !row.relationZd"
                           slot="suffix"
                           class="el-input__icon el-icon-search"
                           @click="openToTaBmZdDialog(row, rowIndex, $table)"
@@ -747,12 +745,6 @@
       @confirm="confirmInsertSzTaMb"
       :multi="false"
     />
-    <szTaMbDialog
-      v-if="showItemSzTaMbDialog"
-      :visiable.sync="showItemSzTaMbDialog"
-      @confirm="confirmInsertItemSzTaMb"
-      multi="false"
-    />
     <MenuKindDialog
       v-if="showMenuKindDialog"
       :visiable.sync="showMenuKindDialog"
@@ -787,12 +779,7 @@
                       class="search-input"
                       max="200"
                       v-model="referenceEntity"
-                      @clear="
-                        referenceKey = null;
-                        refServiceName = null;
-                        referenceShowFields = [];
-                        $forceUpdate();
-                      "
+                      @clear="clearReferenceEntity"
                       v-el-readonly
                       clearable
                     >
@@ -888,6 +875,7 @@
       :visiable.sync="showEntityFieldDialog1"
       @confirm="confirmEntityFieldDialog1"
       :taBm="referenceEntity"
+      :rows="referenceKeyRows"
       :multi="false"
     />
     <zdDialog
@@ -895,6 +883,7 @@
       :visiable.sync="showEntityFieldDialog2"
       @confirm="confirmEntityFieldDialog2"
       :taBm="referenceEntity"
+      :rows="referenceShowRows"
       :multi="true"
     />
     <preformDialog
@@ -981,10 +970,7 @@
                       class="search-input"
                       max="200"
                       v-model="toTaBmZdEntity"
-                      @clear="
-                        toTaBmZdEntity = null;
-                        toTaBmZdField = null;
-                      "
+                      @clear="toTaBmZdField = null"
                       v-el-readonly
                       clearable
                     >
@@ -1055,6 +1041,7 @@
       :visiable.sync="showEntityFieldDialog3"
       @confirm="confirmEntityFieldDialog3"
       :taBm="toTaBmZdEntity"
+      :rows="toTaBmZdFieldRows"
       :multi="false"
     />
     <!--end-->

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

@@ -148,6 +148,7 @@
                 <formVersionButton
                   objType="SzTaMb"
                   :objCode="row.taCode"
+                  :sid="row.sid"
                   @reverCallback="searchEvent"
                 ></formVersionButton>
                 <a