cloud-web-corejs 1.0.54-dev.113 → 1.0.54-dev.115

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

@@ -8,7 +8,7 @@
         </div>
         <div class="fr">
           <el-button type="success" class="button-sty" @click="openDesignDialog"
-                     icon="iconfont icon-liuchengguanli-shejiqi_liucheng" v-if="!!dataId && !readonly">{{ $t1('表单设计') }}
+                     icon="iconfont icon-liuchengguanli-shejiqi_liucheng" v-if="!!dataId">{{ $t1('表单设计') }}
           </el-button>
           <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
             {{ $t1('重置') }}
@@ -111,6 +111,14 @@
                   <projectTagView v-model="formTemplate.formTemplateTagDTOs"></projectTagView>
                 </td>
               </tr>
+              <tr>
+                <th>
+                  {{ $t1('唯一标识') }}
+                </th>
+                <td colspan="7">
+                  {{ formTemplate.sid }}
+                </td>
+              </tr>
               <tr>
                 <th>{{ $t1('创建人') }}</th>
                 <td>{{ formTemplate.createBy }}</td>

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

@@ -162,7 +162,7 @@ modules = {
     getMenuKindAuth(menuKindCode) {
       if (menuKindCode) {
         this.$http({
-          aes: true,
+          // aes: true,
           url: USER_PREFIX + '/menu_kind_auth/getAuth',
           method: `post`,
           data: {stringOne: menuKindCode},

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

@@ -11,12 +11,12 @@
             {{ $t1('重置') }}
           </el-button>
           <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData"
-                     v-if="isDev && !szTaMb.systems && menuKindAuth.editAuth===1">
+                     v-if="isDev && !szTaMb.systems && menuKindAuth.editAuth===1 && !readonly">
             {{ $t1('保存') }}
           </el-button>
 
           <el-button type="success" class="button-sty" icon="el-icon-check"
-                     @click="createModifyTable()" v-if="!szTaMb.systems && szTaMb.id && menuKindAuth.editAuth===1">
+                     @click="createModifyTable()" v-if="!szTaMb.systems && szTaMb.id && menuKindAuth.editAuth===1 && !readonly">
             {{ $t1('创建/更新数据表') }}
           </el-button>
         </div>
@@ -149,6 +149,15 @@
                   {{ szTaMb.serviceName }}
                 </td>
               </tr>
+
+              <tr>
+                <th>
+                  {{ $t1('唯一标识') }}
+                </th>
+                <td colspan="7">
+                  {{ szTaMb.sid }}
+                </td>
+              </tr>
               <tr>
                 <th>{{ $t1('创建人') }}</th>
                 <td>{{ szTaMb.createBy }}</td>
@@ -322,6 +331,7 @@
                     v-model="referenceEntity"
                     @clear="
                           referenceKey = null;
+                          refServiceName = null;
                           referenceShowFields = [];
                           $forceUpdate();
                         "

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

@@ -13,7 +13,8 @@ modules = {
   name: 'szTaMbEdit',
   props: {
     _dataId: [String, Number],
-    currentFormType: Object
+    currentFormType: Object,
+    readonly: Boolean
   },
   components: {
     formOplogTable,
@@ -51,6 +52,7 @@ modules = {
       referenceEntity: null,
       referenceKey: null,
       referenceShowFields: null,
+      refServiceName: null,
       currentIndex: 0,
       showReferenceZdDialog: false,
 
@@ -120,7 +122,7 @@ modules = {
 
           }
         });
-      }else{
+      } else {
         this.getMenuKindAuth(this.szTaMb.menuKindCode);
       }
     },
@@ -283,6 +285,9 @@ modules = {
               default: 'referenceZd'
             }
           },
+          {
+            title: this.$t1('关联表对应服务名'), field: 'refServiceName', width: 200
+          },
           {
             title: this.$t1('字段类型对应的默认值'),
             field: 'zdTypeValues',
@@ -535,6 +540,7 @@ modules = {
       this.referenceEntity = referenceEntity;
       this.referenceKey = referenceKey;
       this.referenceShowFields = referenceShowFields;
+      this.refServiceName = row.refServiceName ?? null;
 
       this.referenceShowRows = referenceShowFields.map(item => {
         return {
@@ -550,6 +556,8 @@ modules = {
       let oldReferenceZd = row.referenceZd;
 
       let referenceEntity = this.referenceEntity;
+      let refServiceName = this.refServiceName;
+      debugger
       let referenceZd = referenceEntity + "." + this.referenceKey;
       let referenceShowFields = this.referenceShowFields;
       let keys = referenceShowFields.map(item => {
@@ -573,8 +581,13 @@ modules = {
           })
         }*/ else {
           this.szTaMb.szTaZdMbDTOs.forEach((item, index) => {
-            if (oldReferenceZd == item.relationZd && !keys.includes(item.referenceZd)) {
-              delIndex.push(index)
+            if (oldReferenceZd == item.relationZd) {
+              if (!keys.includes(item.referenceZd)) {
+                delIndex.push(index)
+              } else {
+                item.refServiceName = refServiceName;
+              }
+
             }
           })
         }
@@ -617,6 +630,7 @@ modules = {
           zdType: "Text",
           referenceZd: referenceEntity + "." + item.taZdMc,
           relationZd: referenceZd,
+          refServiceName,
           zdTypeValues: null,
           required: false,
           enabled: true,
@@ -628,6 +642,7 @@ modules = {
         this.szTaMb.szTaZdMbDTOs.splice(rIndex, 0, newItem);
       });
       row.referenceZd = referenceZd
+      row.refServiceName = refServiceName
       this.handleReferenceOrders(row);
       this.showReferenceZdDialog = false;
     },
@@ -653,6 +668,7 @@ modules = {
           this.referenceShowFields = [];
         }
         this.referenceEntity = row.taBm;
+        this.refServiceName = row.serviceName;
       }
     },
     confirmEntityFieldDialog1(rows) {

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

@@ -12,6 +12,7 @@
         @form-json-updated="handleFJU"
         @reflushTemplateList="reflushTemplateList"
         v-if="showDesinger"
+        :readonly="readonly"
       />
     </div><!--
     <el-tabs v-model="activeName" class="tab-boxCard tabCard-sty1" v-if="showDesinger">
@@ -32,7 +33,10 @@ import {formFieldMapping} from "../../../../views/user/form/vform/formFieldMappi
 
 export default {
   name: 'vform-designer:edit',
-  props: ['formCode'],
+  props: {
+    formCode: String,
+    readonly: Boolean
+  },
   components: {
     VFormDesigner
   },

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

@@ -44,7 +44,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="homeConfig.toDoSpan || 12" style="padding-left:6px;">
+      <el-col :span="homeConfig.toDoSpan || 16" style="padding-left:6px;">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
             <span style="float:left">
@@ -67,8 +67,10 @@
                       @custom="$vxeTableUtil.customHandle"></vxe-grid>
           </div>
         </el-card>
-      </el-col>
-      <el-col :span="4" style="padding-left:6px;" v-show="homeConfig.showFastTrack!==false">
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24" v-show="homeConfig.showFastTrack!==false">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
                   <span style="float:left">
@@ -731,14 +733,14 @@ body #app .index-home {
   }
 
   .fast-box {
-    height: 329px;
+        margin: 6px 4px 4px;
     overflow: hidden;
 
     .item {
-      width: 100%;
+      width: 118px;
       text-align: center;
       float: left;
-
+      margin-right: 14px;
       p {
         color: #2a6494;
         border: solid 1px #e2e2e2;
@@ -746,8 +748,8 @@ body #app .index-home {
         width: calc(100% - 4px);
         border-radius: 6px;
         position: relative;
-        height: 33px;
-        line-height: 32px;
+        height: 54px;
+        line-height: 54px;
         text-align: left;
         padding-left: 14px;
         font-size: 12px;
@@ -765,12 +767,13 @@ body #app .index-home {
         &:before {
           content: '';
           width: 4px;
-          height: 14px;
+          height: 24px;
           display: inline-block;
           background: #225279b8;
           position: absolute;
           left: -1px;
-          top: 9px;
+          top: 50%;
+          margin-top:-12px;
         }
 
         &:hover {
@@ -974,6 +977,7 @@ body #app .index-home {
         color: $baseColor
       }
     }
-  }
+  }
+  ::v-deep .el-card.is-always-shadow{box-shadow: 0 2px 2px 0 rgb(0 0 0 / 6%);}
 }
 </style>