cloud-web-corejs 1.0.54-dev.160 → 1.0.54-dev.161

package/package.json

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

package/src/components/VabUpload/view.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div id="uploadImage" :class="{ 'upload-img': dataType || ($attrs.hideInfo == true || $attrs.hideInfo == 'true') }">
+    <div id="uploadImage" :class="classList">
       <div class="upload-list" model="singer" v-for="(attachment, index) in attachments" :key="index"
            style="display: inline-block;vertical-align: middle;float: left;">
         <template v-if="$attrs.hideInfo !== true && $attrs.hideInfo !== 'true'">
@@ -22,7 +22,7 @@
                   <div class="el-upload-list__item-name">
                     <el-tooltip :enterable="false" class="item" effect="dark" :content="getAttachmentName(attachment)"
                                 placement="top">
-                      <p>{{ getAttachmentName(attachment) }}</p>
+                      <p v-if="$attrs.hideName !== true">{{ getAttachmentName(attachment) }}</p>
                     </el-tooltip>
                     <p v-if="$attrs.showSize === true || $attrs.showSize === 'true'">
                       {{ formatFileSize(attachment.fileSize) }}</p>
@@ -115,6 +115,21 @@ import {viewMixins} from './mixins';
 
 export default {
   mixins: [viewMixins],
-  components: {propertiesDialog: () => import('./propertiesDialog.vue'), ElImageViewer: () => import('./image-viewer')}
+  components: {propertiesDialog: () => import('./propertiesDialog.vue'), ElImageViewer: () => import('./image-viewer')},
+  computed:{
+    classList(){
+      // 'upload-img': this.dataType || (this.$attrs.hideInfo == true || this.$attrs.hideInfo == 'true')
+      let arr = [];
+      if(this.dataType || (this.$attrs.hideInfo == true || this.$attrs.hideInfo == 'true')){
+        arr.push('upload-img')
+      }
+      let widgetSize = this.$attrs.widgetSize || 1
+      if(widgetSize){
+        let str1 = "widgetSize-" + widgetSize
+        arr.push(str1)
+      }
+      return arr
+    },
+  }
 };
 </script>

package/src/components/xform/form-designer/form-widget/field-widget/vabUpload-widget.vue

@@ -17,6 +17,12 @@
                 resultType="Array"
                 :edit="!field.options.disabled"
                 @callback="submitFile"
+                :hideInfo="field.options.hideFileInfo"
+                :hideName="field.options.hideFileName"
+                :showSize="!!field.options.showFileSize"
+                :createBy="!!field.options.showFileCreateBy"
+                :createDate="!!field.options.showFileCreateDate"
+                :widgetSize="field.options.fileShowImageSize"
                 v-else></baseUpload>
   </form-item-wrapper>
 </template>

package/src/components/xform/form-designer/setting-panel/property-editor/field-vabUpload/field-vabUpload-editor.vue

@@ -1,5 +1,34 @@
 <template>
-  <div></div>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">文件信息设置</el-divider>
+    </el-form-item>
+    <el-form-item :label="i18nt('隐藏所有文件信息')">
+      <el-switch v-model="optionModel.hideFileInfo"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('隐藏文件名')">
+      <el-switch v-model="optionModel.hideFileName"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('显示文件大小')">
+      <el-switch v-model="optionModel.showFileSize"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('显示创建人')">
+      <el-switch v-model="optionModel.showFileCreateBy"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('显示创建时间')">
+      <el-switch v-model="optionModel.showFileCreateDate"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('缩略图大小')">
+      <el-select v-model="optionModel.fileShowImageSize">
+        <el-option :value="1" label="1"></el-option>
+        <el-option :value="2" label="2"></el-option>
+        <el-option :value="3" label="3"></el-option>
+        <el-option :value="4" label="4"></el-option>
+        <el-option :value="5" label="5"></el-option>
+      </el-select>
+    </el-form-item>
+
+  </div>
 </template>
 
 <script>

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -2500,7 +2500,13 @@ export const advancedFields = [
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
-      showRules: []
+      showRules: [],
+
+      hiddenFileInfo: false,
+      hiddenFileName: false,
+      showFileSize: false,
+      showFileCreateBy: false,
+      showFileCreateDate: false,
     }
   },
   {
@@ -2810,8 +2816,8 @@ export const advancedFields = [
       onBeforeImport: '',
       enabledImportPreHandle: false,
 
-      importSaveDisabled:false,
-      onConfirmImport:'',
+      importSaveDisabled: false,
+      onConfirmImport: '',
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2987,7 +2993,7 @@ export const advancedFields = [
       onCreated: "if(this.dataId)this.loadDataDefaultHandle();",
       onMounted: "",
       onClick: "",
-      vabUpload: 1,
+      // vabUpload: 1,
       formScriptEnabled: true,
       formScriptCode: "getList",
       formScriptParam: null,

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

@@ -327,6 +327,7 @@
                     @clear="$forceUpdate()"
                     v-el-readonly
                     v-if="row.zdType == 'Reference'"
+                    :disabled="!row.zdEn"
                   >
                     <i
                       slot="suffix"
@@ -352,7 +353,8 @@
                       :rules="[{ required: true, trigger: ['blur', 'change'] }]"
                       :style="!!row.relationZd ? 'padding-left:20px' : ''"
                     >
-                      <el-input v-model="row.zdEn" clearable />
+                      <el-input v-model="row.zdEn" @keydown.native="inputZdEn(row)"
+                                @input="(val)=>{changeZdEn(val,row)}" />
                     </el-form-item>
                   </template>
                 </template>

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

@@ -81,6 +81,9 @@ modules = {
       toTaBmZdField: null,
       showEntityDialog3: false,
       showEntityFieldDialog3: false,
+
+      inputValue: null,     // 当前值
+      preValue: null        // 上一次的值（变更前的值）
     };
   },
   created() {
@@ -317,6 +320,11 @@ modules = {
               default: "referenceZd",
             },
           },
+          {
+            title: this.$t1("来源关联字段"),
+            field: "relationZd",
+            width: 250,
+          },
           {
             title: this.$t1("关联表对应服务名"),
             field: "refServiceName",
@@ -516,10 +524,11 @@ modules = {
     },
     deleteItem(row, rowIndex) {
       let referenceZd = row.referenceZd;
+      let referenceZd2 = row.referenceZd +"."+row.zdEn;
       this.szTaMb.szTaZdMbDTOs.splice(rowIndex, 1);
       if (referenceZd) {
         this.szTaMb.szTaZdMbDTOs = this.szTaMb.szTaZdMbDTOs.filter((item) => {
-          return referenceZd !== item.relationZd;
+          return referenceZd !== item.relationZd && referenceZd2 !== item.relationZd;
         });
       }
     },
@@ -591,6 +600,7 @@ modules = {
     },
     openReferenceZdDialog(row, rowIndex, $table) {
       let referenceZd = row.referenceZd;
+      let referenceZd2 = row.referenceZd + "." + row.zdEn;
       let referenceEntity = null;
       let referenceKey = null;
       let referenceShowFields = [];
@@ -601,9 +611,16 @@ modules = {
         referenceKey = referenceZd.substr(index + 1);
         referenceShowFields = this.szTaMb.szTaZdMbDTOs
           .filter((item) => {
-            return referenceZd == item.relationZd;
+            // return referenceZd == item.relationZd;
+            let flag = false;
+            if (item.relationZd === referenceZd || item.relationZd === referenceZd2) {
+              flag = true
+            }
+            return flag;
+            // return referenceZd == item.relationZd ;
           })
           .map((item) => {
+            // return item.referenceZd.split(".")[1]
             return item.referenceZd.substr(index + 1);
           });
       }
@@ -625,6 +642,7 @@ modules = {
     confirmReferenceZdDialog() {
       let row = this.szTaMb.szTaZdMbDTOs[this.currentIndex];
       let oldReferenceZd = row.referenceZd;
+      let oldReferenceZd2 = row.referenceZd + "." + row.zdEn;
 
       let referenceEntity = this.referenceEntity;
       let refServiceName = this.refServiceName;
@@ -640,7 +658,7 @@ modules = {
         let delIndex = [];
         if (referenceEntity != oldReferenceEntity) {
           this.szTaMb.szTaZdMbDTOs.forEach((item, index) => {
-            if (item.relationZd && oldReferenceZd == item.relationZd) {
+            if (item.relationZd && (oldReferenceZd == item.relationZd || oldReferenceZd2 == item.relationZd)) {
               delIndex.push(index);
             }
           });
@@ -652,7 +670,7 @@ modules = {
           })
         }*/ else {
           this.szTaMb.szTaZdMbDTOs.forEach((item, index) => {
-            if (oldReferenceZd == item.relationZd) {
+            if (oldReferenceZd == item.relationZd || oldReferenceZd2 == item.relationZd) {
               if (!keys.includes(item.referenceZd)) {
                 delIndex.push(index);
               } else {
@@ -675,7 +693,7 @@ modules = {
         return !keys.includes(item)
       })*/
       let oldKeys = this.szTaMb.szTaZdMbDTOs
-        .filter((item) => referenceZd == item.relationZd)
+        .filter((item) => (referenceZd == item.relationZd || (referenceZd + "." + item.zdEn) == item.relationZd))
         .map((item) => item.referenceZd);
       let addReferenceShowFields = referenceShowFields.filter((item, index) => {
         return !oldKeys.includes(referenceEntity + "." + item);
@@ -683,7 +701,7 @@ modules = {
 
       let addIndex = -1;
       let lastIndex = this.szTaMb.szTaZdMbDTOs.findLastIndex((item) => {
-        return referenceZd == item.relationZd;
+        return referenceZd == item.relationZd || (referenceZd + "." + item.zdEn) == item.relationZd;
       });
       addIndex = lastIndex >= 0 ? lastIndex + 1 : this.currentIndex + 1;
 
@@ -701,7 +719,7 @@ modules = {
           zdCh: item.zdCh,
           zdType: "Text",
           referenceZd: referenceEntity + "." + item.taZdMc,
-          relationZd: referenceZd,
+          relationZd: referenceZd + "." + row.zdEn,
           refServiceName,
           zdTypeValues: null,
           required: false,
@@ -726,9 +744,9 @@ modules = {
       let orders = row.orders || 0;
       if (referenceZd) {
         this.szTaMb.szTaZdMbDTOs
-          .filter((item) => referenceZd === item.relationZd)
+          .filter((item) => referenceZd === item.relationZd || (referenceZd + "." + item.zdEn === item.relationZd))
           .forEach((item, index) => {
-            if (referenceZd === item.relationZd) {
+            if (referenceZd === item.relationZd || (referenceZd + "." + item.zdEn === item.relationZd)) {
               item.orders = orders + index + 1;
             }
           });
@@ -1052,6 +1070,29 @@ modules = {
         this.toTaBmZdField = row.taZdMc;
       }
     },
+    inputZdEn(row) {
+
+      this.preValue = row.zdEn; // 更新旧值
+      this.fkey = true
+    },
+    changeZdEn(val, row) {
+      if(!this.fkey)return
+      let oldVal = this.preValue;
+      let newVal = val
+      if (row.zdType === 'Reference') {
+        let referenceZd = row.referenceZd;
+        if (referenceZd) {
+          let referenceZd2 = row.referenceZd + "." + oldVal
+          let relationZd = row.referenceZd + "." + newVal
+          this.szTaMb.szTaZdMbDTOs.forEach((item, index) => {
+            if (referenceZd == item.relationZd || referenceZd2 == item.relationZd) {
+              item.relationZd = relationZd;
+            }
+          });
+        }
+      }
+      this.fkey = false
+    }
   },
 };
 export default modules;