centaline-data-driven 1.5.80 → 1.5.81

package/src/centaline/dynamicTree/src/dynamicSearchTree.vue

@@ -1,36 +1,49 @@
 <template>
   <div>
-    <ct-searchtreescreen ref="treescreen" :api="searchConditionApi" :screenPara="screenPara" @search="search"
-      @clickHandler="rolRouterClickHandler"></ct-searchtreescreen>
-    <ct-tree ref="tree" :api="searchDataApi" @loaded="loaded" :style="{height:treeHeight + 'px'}"></ct-tree>
+    <ct-searchtreescreen
+      ref="treescreen"
+      :api="searchConditionApi"
+      :screenPara="screenPara"
+      @search="search"
+      @clickHandler="rolRouterClickHandler"
+    ></ct-searchtreescreen>
+    <ct-tree
+      ref="tree"
+      :api="searchDataApi"
+      @loaded="loaded"
+      :style="{ height: treeHeight + 'px' }"
+    ></ct-tree>
   </div>
 </template>
 
 <script>
-import dynamicElement from '../../mixins/dynamicElement'
-import dynamicTreeScreen from '../../dynamicSearchList/src/dynamicSearchScreen.vue';
-import dynamicTree from './dynamicTree.vue';
+import dynamicElement from "../../mixins/dynamicElement";
+import dynamicTreeScreen from "../../dynamicSearchList/src/dynamicSearchScreen.vue";
+import dynamicTree from "./dynamicTree.vue";
 export default {
-  name: 'ct-searchtree',
+  name: "ct-searchtree",
   mixins: [dynamicElement],
   components: {
-    'ct-tree': dynamicTree,
-    'ct-searchtreescreen': dynamicTreeScreen
+    "ct-tree": dynamicTree,
+    "ct-searchtreescreen": dynamicTreeScreen,
   },
   props: {
     vmodel: Object,
     searchConditionApi: String,
     searchDataApi: String,
     flagsearch: Boolean,
-    searchtreeHeight: Number,
+    searchtreeHeight: {
+      type: Number,
+      default: 800,
+    },
     screenPara: {
       type: Object,
-      default: () => { }
-    }
+      default: () => {},
+    },
   },
   data() {
     return {
-      treeHeight: 0
+      treeHeight: 0,
     };
   },
   methods: {
@@ -43,16 +56,15 @@ export default {
         }
       });
     },
-    updateCurrentRow(field, ev){},
+    updateCurrentRow(field, ev) {},
     search() {
       this.setTreeHeight();
       this.$refs.tree.search(this.$refs.treescreen.model);
     },
     loaded(data) {
       try {
-        this.$emit('loaded', data);
-      } catch (e) {
-      }
+        this.$emit("loaded", data);
+      } catch (e) {}
     },
     rolRouterClickHandler(field) {
       this.routerClickHandler(field, {}, "");
@@ -69,52 +81,71 @@ export default {
             if (field.pageStyle) {
               submitData.pageStyle = field.pageStyle;
             }
-            self.$emit('doClosePopoverHandle');
-            self.$common.getDataDrivenOpts().handler.openTab(action, submitData, field.pageTitle, self.model, field.dialogWidth);
-          }
-          else if (field.isSearchPageInTab) {// 外部框架tab页打开
+            self.$emit("doClosePopoverHandle");
+            self.$common
+              .getDataDrivenOpts()
+              .handler.openTab(
+                action,
+                submitData,
+                field.pageTitle,
+                self.model,
+                field.dialogWidth
+              );
+          } else if (field.isSearchPageInTab) {
+            // 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
-            self.$emit('doClosePopoverHandle');
-            self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
-          }
-          else if (field.isBrowserNewTab) {// 浏览器打开
+            self.$emit("doClosePopoverHandle");
+            self.$common
+              .getDataDrivenOpts()
+              .handler.openTabSearch(field, submitData);
+          } else if (field.isBrowserNewTab) {
+            // 浏览器打开
             submitData = field.getActionPara(submitData).para;
             let query = self.$common.objectToQueryStr(submitData);
             window.open(action + query, "_blank");
-          }
-          else if (field.isOpenUrlInBrowse) {// 浏览器打开
+          } else if (field.isOpenUrlInBrowse) {
+            // 浏览器打开
             window.open(submitData[field.submitFormField], "_blank");
-          }
-          else if (field.isSeeVoice) {//看视频
+          } else if (field.isSeeVoice) {
+            //看视频
             self.$common.browseVideo(field, submitData);
-          }
-          else if (field.isBrowseAttachment) {//浏览附件
-            var mediaviewpagetype=(field.isFormPageInTab||field.isSearchPageInTab)?2:0; 
+          } else if (field.isBrowseAttachment) {
+            //浏览附件
+            var mediaviewpagetype =
+              field.isFormPageInTab || field.isSearchPageInTab ? 2 : 0;
             var MediaAlbum = [
               { albumName: self.model.title || "媒体", medias: [] },
             ];
             if (field.action) {
               var callback = function (data) {
-               if(typeof data =='object'&&data.mediaAlbums)
-                {
-                MediaAlbum = data.mediaAlbums;
-                }
-                else
-                {
+                if (typeof data == "object" && data.mediaAlbums) {
+                  MediaAlbum = data.mediaAlbums;
+                } else {
                   MediaAlbum[0].medias = data;
                 }
-                self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
-              }
+                self.$common.viewerfile(
+                  field.pageTitle,
+                  MediaAlbum,
+                  0,
+                  0,
+                  mediaviewpagetype
+                );
+              };
               self.model.getAction(field.action, submitData, callback);
-            }
-            else {
+            } else {
               submitData.mediaData.forEach((v) => {
                 MediaAlbum[0].medias.push(v);
               });
-              self.$common.viewerfile(field.pageTitle, MediaAlbum, 0, 0,mediaviewpagetype);
+              self.$common.viewerfile(
+                field.pageTitle,
+                MediaAlbum,
+                0,
+                0,
+                mediaviewpagetype
+              );
             }
-          }
-          else if (field.isUrlInLayer) {//URL页面（弹层）
+          } else if (field.isUrlInLayer) {
+            //URL页面（弹层）
             var dialogOption = {
               title: field.pageTitle,
               pane: self.$common.getParentPane(self),
@@ -145,7 +176,10 @@ export default {
                     delete() {
                       var res = {};
                       res.notification = 4;
-                      res.content = self.model.listData[self.model.selectIndex][self.model.primaryKey];
+                      res.content =
+                        self.model.listData[self.model.selectIndex][
+                          self.model.primaryKey
+                        ];
                       self.model.doAction(res);
                       self.$common.closeDialog(dialogOption.dialog);
                     },
@@ -161,60 +195,63 @@ export default {
               ],
             };
             self.$common.openDialog(dialogOption);
-          }
-          else if (field.isExport || field.flagAsync) {
+          } else if (field.isExport || field.flagAsync) {
             if (field.flagAsync) {
               field.doAction(submitData, (res) => {
                 if (res.content && res.content.action) {
                   var dialogOption = {
                     title: field.pageTitle || field.label,
-                    content: [{
-                      component: 'ct-progress',
-                      attrs: {
-                        progressAction: res.content.action,
-                        progressKey: res.content.key,
-                        progressType: field.isExport ? 'export' : 'import',
-                        width: '350px',
-                        height: '165px'
-                      },
-                      on: {
-                        finished() {
-                          self.$common.closeDialog(dialogOption.dialog);
-                          self.getPage(1);
+                    content: [
+                      {
+                        component: "ct-progress",
+                        attrs: {
+                          progressAction: res.content.action,
+                          progressKey: res.content.key,
+                          progressType: field.isExport ? "export" : "import",
+                          width: "350px",
+                          height: "165px",
                         },
-                        error(data) {
-                          self.$common.closeDialog(dialogOption.dialog);
-                          self.$message({
-                            message: data.rtnMsg,
-                            type: 'warning',
-                            showClose:true,
-                          });
-                        }
-                      }
-                    }]
+                        on: {
+                          finished() {
+                            self.$common.closeDialog(dialogOption.dialog);
+                            self.getPage(1);
+                          },
+                          error(data) {
+                            self.$common.closeDialog(dialogOption.dialog);
+                            self.$message({
+                              message: data.rtnMsg,
+                              type: "warning",
+                              showClose: true,
+                            });
+                          },
+                        },
+                      },
+                    ],
                   };
                   self.$common.openDialog(dialogOption);
                 }
               });
-            }
-            else {
-              if (field.action.indexOf("http://") === 0 || field.action.indexOf("https://") === 0) {
+            } else {
+              if (
+                field.action.indexOf("http://") === 0 ||
+                field.action.indexOf("https://") === 0
+              ) {
                 window.open(field.action, "_blank");
-              }
-              else {
+              } else {
                 field.doAction(submitData, (data) => {
                   if (data.content) {
-                    if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
+                    if (
+                      data.content.indexOf("http://") === 0 ||
+                      data.content.indexOf("https://") === 0
+                    ) {
                       window.open(data.content, "_blank");
-                    }
-                    else {
+                    } else {
                     }
                   }
                 });
               }
             }
-          }
-          else {
+          } else {
             //self.operationLoading = true;
 
             //Form
@@ -239,8 +276,14 @@ export default {
                           //更新列
                           self.model.selectIndex = 0;
                           if (self.currentRow !== null) {
-                            for (var i = 0; i < self.currentRow.children.length; i++) {
-                              self.currentRow.children[i].classList.remove("select");
+                            for (
+                              var i = 0;
+                              i < self.currentRow.children.length;
+                              i++
+                            ) {
+                              self.currentRow.children[i].classList.remove(
+                                "select"
+                              );
                             }
                           }
                           if (typeof self.$refs.tableParent !== "undefined") {
@@ -251,11 +294,13 @@ export default {
                           }
                           self.$forceUpdate();
                           self.$nextTick(() => {
-                            if (self.$refs.tableParent.scrollHeight <= self.$refs.tableParent.offsetHeight) {
+                            if (
+                              self.$refs.tableParent.scrollHeight <=
+                              self.$refs.tableParent.offsetHeight
+                            ) {
                               self.tableLoading = true;
                               self.model.nextPage(next);
-                            }
-                            else {
+                            } else {
                               self.tableLoading = false;
                               self.rowColorChange();
                               self.resetScroll();
@@ -264,11 +309,18 @@ export default {
                             }
                             self.setfixedSize();
                           });
-                          self.loaderObj.SearchTable(self.api, self.load, self.model.searchModel, true);
+                          self.loaderObj.SearchTable(
+                            self.api,
+                            self.load,
+                            self.model.searchModel,
+                            true
+                          );
                           self.$common.closeDialog(dialogOption.dialog);
-                        }
-                        else {
-                          if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
+                        } else {
+                          if (
+                            !field.flagFreshCurrentRow &&
+                            !field.flagAddRowAfterAction
+                          ) {
                             self.model.doAction(ev);
                           }
                           self.$forceUpdate();
@@ -339,12 +391,14 @@ export default {
                 ],
               };
               self.$common.openDialog(dialogOption);
-            }
-            else {
+            } else {
               self.operationLoading = true;
               field.doAction(submitData, (data) => {
                 self.operationLoading = false;
-                if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
+                if (
+                  !field.flagFreshCurrentRow &&
+                  !field.flagAddRowAfterAction
+                ) {
                   self.model.doAction({ responseData: data });
                   self.$emit("refreshRowHandle");
                 }
@@ -361,7 +415,8 @@ export default {
           // self.$common.excuteFunStr.call(self.model.scripts, field.action,parm);
           // var fun = self.model.scripts.formData[action];
           // fun(submitData,field);
-          let title = field.pageTitle == undefined ? field.label : field.pageTitle;
+          let title =
+            field.pageTitle == undefined ? field.label : field.pageTitle;
           submitData.actionType = field.actionType;
           var fun = self.$common.getDataDrivenOpts().handler[action];
           fun(submitData, title, self.$parent);
@@ -369,32 +424,36 @@ export default {
       };
 
       if (field.alert) {
-        self.$common.confirm(field.alertMsg, field.alertCaption, {
-          confirmButtonText: field.alertOKButtonText,
-          cancelButtonText: field.alertCancelButtonText,
-          //type: 'warning'
-          center: field.alertCenter,
-        })
+        self.$common
+          .confirm(field.alertMsg, field.alertCaption, {
+            confirmButtonText: field.alertOKButtonText,
+            cancelButtonText: field.alertCancelButtonText,
+            //type: 'warning'
+            center: field.alertCenter,
+          })
           .then(() => {
             clickAcion();
           })
-          .catch(() => { });
-      }
-      else {
+          .catch(() => {});
+      } else {
         clickAcion();
       }
     },
   },
   mounted() {
     if (this.flagsearch) {
-      this.$watch('$refs.treescreen.model.searchData', function (newVal, oldVal) {
-        // 做点什么
-        if (oldVal != undefined) {
-          this.search();
+      this.$watch(
+        "$refs.treescreen.model.searchData",
+        function (newVal, oldVal) {
+          // 做点什么
+          if (oldVal != undefined) {
+            this.search();
+          }
+        },
+        {
+          deep: true,
         }
-      }, {
-        deep: true,
-      });
+      );
     }
   },
   watch: {
@@ -403,10 +462,10 @@ export default {
     //}
     searchtreeHeight: function (val) {
       this.setTreeHeight();
-    }
+    },
   },
   created() {
     this.model = this.vmodel;
-  }
-}
+  },
+};
 </script>

package/src/centaline/dynamicTree/src/dynamicTree.vue

@@ -17,13 +17,9 @@
 
 <script>
 import dynamicElement from '../../mixins/dynamicElement'
-import dynamicTreeScreen from '../../dynamicSearchList/src/dynamicSearchScreen.vue';
 export default {
   name: 'ct-tree',
   mixins: [dynamicElement],
-  components: {
-    'ct-searchtreescreen': dynamicTreeScreen
-  },
   props: {
     vmodel: Object,
     api: String

package/src/centaline/dynamicTreeList/index.js

@@ -0,0 +1,11 @@
+import dynamicTreeList from './src/dynamicTreeList'
+
+dynamicTreeList.install = function (Vue) {
+  Vue.component(dynamicTreeList.name, dynamicTreeList);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicSearchTree);
+}
+
+export default dynamicTreeList;

package/src/centaline/{dynamicTree → dynamicTreeList}/src/dynamicTreeList.vue

@@ -29,14 +29,11 @@
 
 <script>
 import dynamicElement from '../../mixins/dynamicElement'
-import dynamicSearchTree from './dynamicSearchTree.vue';
-import dynamicSearchList from '../../dynamicSearchList/src/dynamicSearchList.vue';
 import dynamicForm from '../../dynamicForm/src/dynamicForm';
 export default {
   name: 'ct-treelist',
   mixins: [dynamicElement],
   components: {
-    'ct-searchtree': dynamicSearchTree,
     'ct-form': dynamicForm,
   },
   props: {

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

@@ -219,7 +219,7 @@ const Base = function (source) {
           this.defaultValue.forEach((v1) => {
             this.value.push(v1);
           });
-          this.text = rtn.defaultText === '' ? [] : JSON.parse(rtn.defaultText);
+          this.text = rtn.defaultText === ''|| rtn.defaultText === undefined? [] : JSON.parse(rtn.defaultText);
         }
         else if(this.type===Enum.ControlType.MultiSelectWithSearch){
           this.value.splice(0);
@@ -231,7 +231,7 @@ const Base = function (source) {
           this.defaultValue.forEach((v1) => {
             this.value.push(v1);
           });
-          this.text = rtn.defaultText === '' ? [] : JSON.parse(rtn.defaultText);
+          this.text = rtn.defaultText === '' || rtn.defaultText === undefined? [] : JSON.parse(rtn.defaultText);
         }
         else{
           this.value = this.defaultValue;

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

@@ -81,6 +81,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                 get name() {
                   return v.displayName;
                 },
+                get paramName() {
+                  return v.paramName||'';
+                },
                 get sort() {
                   return v.flagSort;
                 },
@@ -986,8 +989,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       },
       setButtonsDisabledByRowClick() {
         if(rtn.isMulti) return;
-        if(rtn._buttons.length===0) return;
-
+        if(!rtn._buttons||rtn._buttons.length===0) return;
         var selectData = rtn.getSelectRowData({
           isMulti: 0
         });

package/src/main.js

@@ -15,14 +15,14 @@ Vue.use(ElementUI, { size: 'mini'});
 Vue.config.productionTip = false;
 Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
-  // baseUrl: "http://10.88.22.13:6060/onecard-api/",
+  baseUrl: "http://10.88.22.46:6060/onecard-api/",
   // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
   // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.63:22026/service-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:8080/",
   // baseUrl: "https://ccesutest.centaline.com.cn/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
-  baseUrl: "http://10.88.22.42:8080/",
+  // baseUrl: "http://10.88.22.42:8080/",
   // baseUrl: "http://10.1.245.111:38028/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
@@ -54,15 +54,15 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '47aaa932-374c-4ce6-bb49-425193332f8e',
+        oldToken: '1f487e18-c090-4d24-b9a7-630de58cfccc',
         // token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        // authObject: '{token:"1080-1726764353270714368"}',
+        authObject: '{token:"1080-1729370391807397888"}',
 
         // originalRequestURL: 'http://10.88.22.67:8080',
         // EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',
         estateId: '',
 
-        authObject: '{"currentEstate":{"estateId":"20210729104021C49F04B55C50F6AF58","estateName":"0%E6%B1%A4%E8%87%A3%E4%B8%80%E5%93%810%E5%A4%A9%E6%B4%A5"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"a47c1cb528904d361a71a2612e9fe8f7","token":"","random":"LMOpUe","time":1700555306773,"sign":"b5fed3c92e2ad6ef33fdf4951eab2ae7"}',
+        // authObject: '{"currentEstate":{"estateId":"20210729104021C49F04B55C50F6AF58","estateName":"0%E6%B1%A4%E8%87%A3%E4%B8%80%E5%93%810%E5%A4%A9%E6%B4%A5"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"a47c1cb528904d361a71a2612e9fe8f7","token":"","random":"LMOpUe","time":1700555306773,"sign":"b5fed3c92e2ad6ef33fdf4951eab2ae7"}',
         AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjZmOGE3YmY5LWJmNTktNDQ5Mi1iYjViLTAwYzg5NzA4YjhkMSJ9.SdsZk29roc03uNTjl8UkURX0uJHog7FH2YdX9xdecUULznkQ0NrMKkuLhTTXXA4XAp47zcmbGUPphoCcCr_AOw',
       };
     },