centaline-data-driven 1.6.34 → 1.6.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.6.34",
+  "version": "1.6.35",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/release-log.md

@@ -1,3 +1,18 @@
+# v1.6.35
+2024-01-08
+
+优化
+
+列表新增和修改页面引用的父页面的表单项将以label的形式展现在表单的最上面，多个用逗号（,） 分隔
+
+onAfterChanged找不到路由后，支持直接执行脚本
+
+表单列表弹层支持修改必填required到行数据上
+
+BUG
+
+文件预览，部分发票PDF，内容显示不全，前端更新pdf.js必须更新SDK版本
+
 # v1.6.34
 2024-12-30
 

package/src/SearchList.vue

@@ -31,7 +31,7 @@
 
     <!-- CCES -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/contractmanage/ContractList/getLayoutOfSearch'"  :searchDataApi="'/contractmanage/ContractList/getList'"></ct-searchlist> -->
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/contractmanage/ContractList/getLayoutOfSearch'"  :searchDataApi="'/contractmanage/ContractList/getList'"></ct-searchlist>
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/sunexpensemanage/sunexpenserecordlist/getLayoutOfSearch'"  :searchDataApi="'/sunexpensemanage/sunexpenserecordlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/ProjectCustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/ProjectCustomerList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/workwxmanage/WorkWXApplicationList/getLayoutOfSearch'"  :searchDataApi="'/workwxmanage/WorkWXApplicationList/getList'"></ct-searchlist> -->
@@ -41,7 +41,7 @@
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/EntranceNoticeInfoList/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/EntranceNoticeInfoList/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/commissionquery/properformanceszjjbreport/getLayoutOfSearch'"  :searchDataApi="'/commissionquery/properformanceszjjbreport/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/employeelist/getLayoutOfSearch'"  :searchDataApi="'/employeelist/getList'"></ct-searchlist> -->
-    <ct-searchlist :apiParam="para" :searchConditionApi="'/estatemanage/estatlist/getLayoutOfSearch'"  :searchDataApi="'/estatemanage/estatlist/getList'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/estatemanage/estatlist/getLayoutOfSearch'"  :searchDataApi="'/estatemanage/estatlist/getList'"></ct-searchlist> -->
     <!-- CCES -->
 
     <!-- <ct-searchlist :apiParam="para"
@@ -159,7 +159,7 @@
         // appRootUrl:'http://10.88.22.13:6060/onecard-api/',
         appRootUrl:'',
         para:{
-          
+          type: "top",
   "deleteRight": 0,
   "editRight": 0,
   "browseRight": 0,

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -11,6 +11,21 @@
           <span style="font-weight:bold">{{model.title}}</span>
         </div>
 
+        <!--relationParentFormFields-->
+        <el-row v-if="relationParentFormFields.length > 0">
+          <template v-for="(col, index) in relationParentFormFields">
+            <el-col :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
+                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara"
+                        :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
+                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
+                        @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
+                        @popupSearchList="popupSearchListHandler" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
+                        @popupLocation="popupLocationHandler"
+                        @tableButtonClick="clickHandler"></component>
+              </el-col>
+          </template>
+        </el-row>
+
         <!--头部元素-->
         <el-row v-if="collapseFieldsRow.length > 0">
           <template v-for="(col, index) in collapseFieldsRow[0]">
@@ -208,6 +223,12 @@
         Boolean,
         default: false,
       },
+      relationParentFormFields: {
+        Array,
+        default: function () {
+          return [];
+        },
+      },
     },
     data() {
       return {
@@ -1167,7 +1188,16 @@
           var router = self.model.actionRouters.find((v) => {
             return v.id === field.onAfterChanged;
           });
-          self.clickHandler(router);
+          if(router){
+            self.clickHandler(router);
+          }
+          else{
+            if (typeof this.model.scripts !== 'undefined') {
+              this.model.scripts.formData.setExcuteListData(this.model.fields);
+            }
+            this.model.scripts.$fd = field.id;
+            this.$common.excute.call(this.model.scripts, field.onAfterChanged);
+          }
         }
 
         self.$forceUpdate();
@@ -1177,8 +1207,17 @@
         if (field.onAfterChanged) {
           var router = self.model.actionRouters.find((v) => {
             return v.id === field.onAfterChanged;
-          });
-          self.clickHandler(router);
+          });          
+          if(router){
+            self.clickHandler(router);
+          }
+          else{
+            if (typeof this.model.scripts !== 'undefined') {
+              this.model.scripts.formData.setExcuteListData(this.model.fields);
+            }
+            this.model.scripts.$fd = field.id;
+            this.$common.excute.call(this.model.scripts, field.onAfterChanged);
+          }
         }
         self.$forceUpdate();
       },

package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue

@@ -795,8 +795,14 @@ import dynamicElement from '../../mixins/dynamicElement';
         if (field.onAfterChanged && field.type !== 4) {
           var router = self.model.actionRouters.find((v) => {
             return v.id === field.onAfterChanged;
-          });
-          self.clickHandlerfield(router);
+          });          
+          if(router){
+            self.clickHandlerfield(router);
+          }
+          else{
+            this.model.scripts.$fd = field.id;
+            this.$common.excute.call(this.model.scripts, field.onAfterChanged);
+          }
         }
 
         self.$forceUpdate();

package/src/centaline/dynamicViewerFile/src/dynamicViewerPDF.vue

@@ -1,15 +1,8 @@
-
 <template>
   <div v-loading="loading">
-    <iframe 
-      ref="previewPdf"
-      id="previewPdf"
-      :src="'/static/pdf/web/viewer.html?' + fileUrl"
-      :height="displayAreaHeight - 78 + 'px'"
-      :width="displayAreaWidth + 'px'"
-      @load="complete()"
-             @contextmenu="handleMouse" style="border-width: 0px;"
-    >
+    <iframe ref="previewPdf" id="previewPdf" :src="'/static/pdf/web/viewer.html?' + fileUrl"
+      :height="displayAreaHeight - 78 + 'px'" :width="displayAreaWidth + 'px'" @load="complete()"
+      @contextmenu="handleMouse" style="border-width: 0px;">
     </iframe>
   </div>
 </template>
@@ -22,7 +15,7 @@ export default {
   },
   data() {
     return {
-       loading: true,
+      loading: true,
       numPages: 1,
       fileUrl: "",
     };
@@ -30,32 +23,53 @@ export default {
   mounted() {
     this.init(this.pdfUrl);
   },
-  created() { 
+  created() {
   },
-    methods: {
-      handleMouse(e) {
-        e.preventDefault();
-      },
+  methods: {
+    handleMouse(e) {
+      e.preventDefault();
+    },
     init(pdfUrl) {
       var self = this;
-      self.fileUrl = 'r='+Math.random()+'&file='+encodeURIComponent(pdfUrl);
+      self.fileUrl = 'r=' + Math.random() + '&file=' + encodeURIComponent(pdfUrl);
     },
     complete() {
-       this.loading = false;
+      this.loading = false;
       var doc = document.getElementById("previewPdf").contentWindow.document;
-      doc.getElementById("download").style.display = "none";
-      doc.getElementById("openFile").style.display = "none";
-      doc.getElementById("print").style.display = "none";  
-      doc.getElementById("viewBookmark").style.display = "none";
+      elementHideById("download",doc)
+      elementHideById("openFile",doc)
+      elementHideById("print",doc)
+      elementHideById("viewBookmark",doc)
+
+      elementHideById("editorHighlightButton",doc)
+      elementHideById("editorFreeText",doc)
+      elementHideById("editorInk",doc)
+      elementHideById("editorStamp",doc)
+      elementHideById("editorModeButtons",doc)
+
+      elementHideById("printButton",doc)
+      elementHideById("downloadButton",doc)
+
+      elementHideById("secondaryOpenFile",doc)
+      elementHideById("cursorToolButtons",doc)
+      elementHideById("documentProperties",doc)
+
       doc.oncontextmenu = new Function("event.returnValue=false");
     },
   },
   watch: {
     pdfUrl(newValue, oldValue) {
-       this.loading = true;
+      this.loading = true;
       this.init(newValue);
     },
   },
 };
+
+function elementHideById(elementId, doc) {
+  if (doc.getElementById(elementId) != null) {
+    if (doc.getElementById(elementId).style) {
+      doc.getElementById(elementId).style.display = "none";
+    }
+  }
+}
 </script>
- 

package/src/centaline/loader/src/ctl/FormList.js

@@ -440,6 +440,7 @@ const FormList = function (source, master) {
             width: rtn.pageWidth+'px',
             height: rtn.pageHeight+'px',
             parentModelForm:self.$self.parentModel,
+            relationParentFormFields:rtn.getRelationParentFormFields(),
           },
           on: {
             submit: function (ev) {
@@ -452,6 +453,7 @@ const FormList = function (source, master) {
                   Vue.set(row[findex], 'code1', ev.formData.source.fields[findex].code1);
                   Vue.set(row[findex], 'name1', ev.formData.source.fields[findex].name1);
                   Vue.set(row[findex], 'locked', ev.formData.source.fields[findex].locked);
+                  Vue.set(row[findex], 'required', ev.formData.source.fields[findex].required);
                   switch(ev.formData.source.fields[findex].controlType){
                     case 19:
                     case 20:
@@ -525,6 +527,7 @@ const FormList = function (source, master) {
             width: rtn.pageWidth+'px',
             height: rtn.pageHeight+'px',
             parentModelForm:self.$self.parentModel,
+            relationParentFormFields:rtn.getRelationParentFormFields(),
           },
           on: {
             submit: function (ev) {
@@ -534,6 +537,7 @@ const FormList = function (source, master) {
                 field.code1 = ev.formData.source.fields[findex].code1;
                 field.name1 = ev.formData.source.fields[findex].name1;
                 field.locked = ev.formData.source.fields[findex].locked;
+                field.required = ev.formData.source.fields[findex].required;
                 switch(ev.formData.source.fields[findex].controlType){
                   case 19:
                   case 20:
@@ -785,6 +789,28 @@ const FormList = function (source, master) {
     get frozenColumns() {
       return source.frozenColumns || [];
     },
+    get relationParentFormFields() {
+      return source.relationParentFormFields;
+    },
+    getRelationParentFormFields(){
+      let relfields=[];
+      if(rtn.relationParentFormFields){
+        if(rtn.form && rtn.form.fieldsDic){
+          (rtn.relationParentFormFields.split(',')).forEach(function(f){
+            if(rtn.form.fieldsDic[f]){
+              let newField={...rtn.form.fieldsDic[f]};
+              newField.is='ct-labelText';
+              newField.type=Enum.ControlType.Label;
+              newField.colspan=24;
+              newField.required=false;
+              newField.labelClass='';
+              relfields.push(newField);
+            }
+          });
+        }
+      }
+      return relfields;
+    }
   };
   return rtn;
 };

package/src/main.js

@@ -76,7 +76,7 @@ Vue.use(centaline, {
         estateId: '',
 
         authObject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"588NJK","time":1733886962541,"sign":"7cb413ac60ed50fe406c9b91c8d4a836","systemSource":"CCESU","empNo":"hqxtgl","empId":"2411121446336B97FBEB7FD54905A903"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImFkN2M4NzM1LTRkMTMtNDBhOS1iZmFmLTIyM2NiYTA0MzQyOSJ9.tZvm4pGa9FEPwUzyvfbFmJsSAAQk0dTmq5j4zxG_WNA-geGHdQ4tFXmIA0h9girqpA8vKzyQIXiTMEUtvBfgcA',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijc5ZThjMmI3LTg5NmUtNDc5MS1iZmYxLWM5YWE2NzhlMWZmYiJ9.CRhyx5tOWgVA5l5wmcjIuAyjAlgN9zCAvLoDQ9xjHbW9iLfdz8_fjhbe3QwoS4nQ7tzrzPu97PfVZNw0mQP6cA',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作