centaline-data-driven 1.2.85 → 1.2.88

package/package.json

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

package/src/Detail.vue

@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1"} ,
+        apiParam: {actionType: 1,chanceID: "3"} ,
       }
     },
     mounted() {

package/src/SearchList.vue

@@ -4,14 +4,14 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <ct-searchlist :searchConditionApi="'/SystemParameterList/getLayoutOfSearch'" 
-    :searchDataApi="'/SystemParameterList/getListOfSearchModel'" :apiParam="para"></ct-searchlist>
+    <!-- <ct-searchlist :searchConditionApi="'/SystemParameterList/getLayoutOfSearch'" 
+    :searchDataApi="'/SystemParameterList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
                    :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
                     :searchStatsApi="'/exampleList/getListStats'"
-                   ></ct-searchlist> -->
+                   ></ct-searchlist>
 
     <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
     <!-- <ct-searchlist :searchConditionApi="'/PropertyStatusList/getLayoutOfSearch'" :searchDataApi="'/PropertyStatusList/getListOfSearchModel'"  :apiParam="para"></ct-searchlist> -->
@@ -26,10 +26,6 @@
     data() {
       return {
         para:{
-code: "001.001",
-name: "物业用途",
-paramKey: "PropertyUsageID",
-paramName: "物业用途"
         },
         // para: {searchFields: {fields: []}, pageAttribute: {pageIndex: 1}, flagSearch: true}
         // para: {publishID: "1503900718229229568"}

package/src/centaline/css/common.css

@@ -803,5 +803,14 @@ html {
 .el-input-group{
   line-height: 26px;
 }
+.shortcutFollow .ct-form{
+  margin:0px !important;
+}
+.shortcutFollow .ct-form .el-card__body{
+  padding:0px !important;
+}
+.shortcutFollow .ct-form .el-card__body .el-col{
+  padding:0px 5px 0 0 !important;
+}
 
 

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -258,6 +258,9 @@
               let query = self.$common.objectToQueryStr(submitData);
               window.open(field.action + query, "_blank");
             }
+            else if (field.isOpenUrlInBrowse) {// 浏览器打开
+              window.open(submitData[field.submitFormField], "_blank");
+            }
             else{
               field.doAction(submitData, (data) => {
                 self.model.doAction(data,field);

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -399,6 +399,9 @@
               let query = self.$common.objectToQueryStr(submitData);
               window.open(field.action + query, "_blank");
             }
+            else if (field.isOpenUrlInBrowse) {// 浏览器打开
+              window.open(submitData[field.submitFormField], "_blank");
+            }
             else{
               field.doAction(submitData, (data) => {
                 self.model.doAction(data,field);

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -584,6 +584,9 @@
               let query = self.$common.objectToQueryStr(submitData);
               window.open(field.action + query, "_blank");
             }
+            else if (field.isOpenUrlInBrowse) {// 浏览器打开
+              window.open(submitData[field.submitFormField], "_blank");
+            }
             else{
               field.doAction(submitData, (data) => {
                 self.model.doAction(data,field);

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -67,7 +67,10 @@
               </component>
             </div>
             <span :slot="showIndex>0?'reference':''" class="more" style="margin-left: 10px;"></span>
-          </el-popover>
+          </el-popover> 
+        </div>
+        <div ref="shortcutFollow" v-if="model.shortcutFollowForm!==undefined && model.shortcutFollowForm!==null" class="shortcutFollow" style="margin-top: 16px;">
+          <ct-form :source="model.shortcutFollowForm" @submit="saveShortcutFollow"></ct-form>
         </div>
         <div class="tablist-info base-box">
           <div class="details-tabs-box">
@@ -90,11 +93,13 @@
 <script>
   import dynamicElement from '../../mixins/dynamicElement';
   import dynamicContact from '../../dynamicContact/src/dynamicContact.vue';
+  import dynamicForm from '../../dynamicForm/src/dynamicForm.vue';
   export default {
     name: 'ct-PropertySimpleDetailRET',
     mixins: [dynamicElement],
     components: {
       'ct-contact': dynamicContact,
+      'ct-form': dynamicForm,
     },
     props: {
       vmodel: Object,
@@ -393,6 +398,9 @@
               let query = self.$common.objectToQueryStr(submitData);
               window.open(field.action + query, "_blank");
             }
+            else if (field.isOpenUrlInBrowse) {// 浏览器打开
+              window.open(submitData[field.submitFormField], "_blank");
+            }
             else{
               field.doAction(submitData, (data) => {
                 self.model.doAction(data,field);
@@ -445,6 +453,18 @@
       clickPrevHandler() {
         this.$emit('clickPrevHandler');
       },
+      saveShortcutFollow(){
+        var self=this;
+        self.model.tags1.forEach((v,i) => {
+          if(v.appID=='Follow'){
+            self.model.activeIndex1=i.toString();
+            self.listKey=self.listKey+1;
+            self.model.searchConditionApiTags1=v.searchConditionApiUrl||'';
+            self.model.searchDataApiTags1=v.searchDataApiUrl||'';
+            self.model.paramDataTags1 = v.paramData || '';
+          }
+        });
+      },
     }
   }
 </script>

package/src/centaline/dynamicDtd/src/dynamicDtd.vue

@@ -49,9 +49,7 @@
         pickerOptions: this.getPickerOptions()
       };
     },
-
-    mounted() {
-     
+    mounted() {     
       var self = this;
       this.$nextTick(function () {
         if (self.vmodel) {
@@ -70,10 +68,8 @@
     },
     watch: {
       'model.value': function () {
-
       },
       'model.value1': function () {
-
       },
     },
     methods: {

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

@@ -308,7 +308,7 @@
                       }
                       field.disabled = false;
                       self.model.pageDisabled= false;
-                    });
+                    },self.model.scripts);
                   }
                   //无值，触发submit事件
                   else {
@@ -399,6 +399,9 @@
                 let query = self.$common.objectToQueryStr(submitData);
                 window.open(field.action + query, "_blank");
               }
+              else if (field.isOpenUrlInBrowse) {// 浏览器打开
+                window.open(submitData[field.submitFormField], "_blank");
+              }
               else if (field.isExport) {
                 submitData = field.getActionPara(submitData).para;
                 self.model.export(field, submitData);
@@ -475,7 +478,13 @@
         self.model.requiredHandle(field);
         //self.model.validMrf(field);
 
-        if(field.onAfterChanged){
+        if(field.routerKeyForEnterKey){
+          var router =self.model.actionRouters.find((v) => {
+            return v.id === field.routerKeyForEnterKey;
+          });
+          self.clickHandler(router);
+        }
+        else if(field.onAfterChanged){
           var router =self.model.actionRouters.find((v) => {
             return v.id === field.onAfterChanged;
           });

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

@@ -52,7 +52,9 @@
                 <span v-else-if="scope.row.isSet" class="el-tag  el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,false)">
                   取消
                 </span>
-                <span v-for="(v,i) in model.buttons" v-if="!scope.row.isSet && v.show" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="buttonClick(scope.row, v)">
+                <span v-for="(v,i) in model.buttons" 
+                  v-if="!scope.row.isSet && v.show && ( !v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1 )" 
+                  class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="buttonClick(scope.row, v)">
                   {{v.label}}
                 </span>
               </template>

package/src/centaline/dynamicLayout/src/dynamicLayout.vue

@@ -97,10 +97,15 @@
       getValue(data, val) {
         return val.split('.').reduce((data, currentVal) => {
           var rtn = data[currentVal];
-          if (rtn.toString().indexOf('"') != -1) {
-            rtn = rtn.replace(/"/g, "'");
-            rtn = rtn.replace(/>/g, ">");
-            rtn = rtn.replace(/</g, "&lt;");
+          if (typeof rtn !== 'undefined') {
+            if (rtn.toString().indexOf('"') != -1) {
+              rtn = rtn.replace(/"/g, "'");
+              rtn = rtn.replace(/>/g, "&gt;");
+              rtn = rtn.replace(/</g, "&lt;");
+            }
+          }
+          else {
+            rtn = "";
           }
           return rtn
         }, data)

package/src/centaline/dynamicRichText/src/dynamicRichText.vue

@@ -247,9 +247,11 @@
         this.config.toolbars = [['help']];
         return;
       }
-      this.config.maximumWords = this.model && this.model.max ? parseFloat(this.model.max) : 5000;
-      this.config.serverUrl = this.model.action;
-      this.config.imageUrl = this.model.action;
+      else if (!this.model.lock) {
+        this.config.maximumWords = this.model && this.model.max ? parseFloat(this.model.max) : 5000;
+        this.config.serverUrl = this.model.action;
+        this.config.imageUrl = this.model.action;
+      }
     },
     computed: {
 

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -750,6 +750,9 @@
               let query = self.$common.objectToQueryStr(submitData);
               window.open(action + query, "_blank");
             }
+            else if (field.isOpenUrlInBrowse) {// 浏览器打开
+              window.open(submitData[field.submitFormField], "_blank");
+            }
             else {
               //self.operationLoading = true;
 
@@ -928,6 +931,9 @@
               let query = self.$common.objectToQueryStr(submitData);
               window.open(action + query, "_blank");
             }
+            else if (field.isOpenUrlInBrowse) {// 浏览器打开
+              window.open(submitData[field.submitFormField], "_blank");
+            }
             else {
               //self.operationLoading = true;
 

package/src/centaline/dynamicSearchList/src/dynamicTableStats.vue

@@ -44,7 +44,7 @@
               <br />
             </div>
           </div>
-          <span slot="reference" class="icon-more">⋮</span>
+          <span slot="reference" class="icon-more"></span>
 
         </el-popover>
       </template>

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -21,7 +21,7 @@
       </el-input>
 
       <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
-      <ctQuickInputSos v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" @click="model.value=$event"></ctQuickInputSos>
+      <ctQuickInputSos v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" @click="quickSelect"></ctQuickInputSos>
     </div>
     <transition name="el-fade-in" class="ct-flex-div-span">
       <span v-show="!valid" class="errorMessage ">
@@ -80,7 +80,16 @@
         }
       },
       search() {
-        if(this.model.autoSearch) this.$emit('click');
+        if(this.model.autoSearch) {
+          this.$emit('click');
+        }
+        else if(this.model.routerKeyForEnterKey){
+          this.changeHandler(this.model.value);
+        }
+      },
+      quickSelect(v) {
+        this.model.value=v;
+        this.search();
       },
     },
   }</script>

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

@@ -284,6 +284,9 @@ const Base = function (source) {
     get onAfterChanged() {
       return source.onAfterChanged;
     },
+    get routerKeyForEnterKey() {
+      return source.routerKeyForEnterKey;
+    },
   };
 
   return rtn;

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

@@ -379,11 +379,11 @@ const ContactList = function (source,para ,callBack) {
               var deleteRow = response.content.split(',');
               if (deleteRow) {
                 deleteRow.forEach((r) => {
-                  let strat=0;
+                  let strat=-1;
                   let count=0;
                   rtn._listData.forEach((v,i) => {
                     if(v[rtn.rowHiddenKey]===r){
-                      if(strat===0)strat=i;
+                      if(strat===-1)strat=i;
                       count=count+1;
                     }
                   });

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

@@ -32,7 +32,7 @@ const Detail = function (source,para ,callBack) {
         _commissionList:null,
         get title() {
           return data.title;
-      },
+        },
         get fields1() {
             return data.fields1;
         },
@@ -370,6 +370,9 @@ const Detail = function (source,para ,callBack) {
           }
           return rtn._commissionList;
         },
+        get shortcutFollowForm() {          
+          return data.shortcutFollowForm;
+        },
         doAction(response,field) {
           if (response.responseData) {
             response = response.responseData;

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

@@ -64,9 +64,8 @@ const Dtd = function (source, dateType) {
       },
       reset() {
         this.formatValue = this.defaultFormat;
-        //this.setFormatValue(this.defaultFormat);
-        source.code1 = this.formatValue[0];
-        source.code2 = this.formatValue[1];
+        rtn.value = this.formatValue[0];
+        rtn.value1 = this.formatValue[1];
       },
       getFormObj() {
         var rtnFormObj = {};

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

@@ -98,6 +98,9 @@ const Router = function (source) {
     get isSearchPageWithList() {
       return source.pageStyle === Enum.PageStyle.SearchPageWithList;
     },
+    get isOpenUrlInBrowse() {
+      return source.actionType === Enum.ActionType.OpenUrlInBrowse;
+    },
     //打开页面（1Form,2SearchList（弹在tab）,3Tab,4执行客户端脚本,5SearchList(弹出)）
     get navToNewPage() {
       return source.navToNewPage;

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

@@ -48,6 +48,11 @@ const SearchScreen = function (source, callBack, screenPara) {
         this._sourceFieldsArr = [];
 
         for (let key in source.content.fields) {
+          if((source.content.fields[key].controlType===Enum.ControlType.DateRange 
+            || source.content.fields[key].controlType===Enum.ControlType.DateTimeRange)
+            && source.content.fields[key].code2==undefined){
+            source.content.fields[key].code2='';
+          }
           let field = source.content.fields[key];
           this._sourceFieldsArr.push(field);
         }

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

@@ -609,7 +609,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                       rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
                     }
                   });
-                  if (rtn.cellLayout != "") {
+                  if (rtn.cellLayout) {
                     rtn.$vue.$set(rtn.listData, rtn.selectIndex, rtn.dataDictionary[searchValue1]);
                   }
                 }

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -377,6 +377,21 @@ const Enum = {
     ///  执行 拨打电话 的动作
     /// </summary>
     CallTel: 19,
+
+    /// <summary>
+    ///  弹出浮层 播放录音
+    /// </summary>
+    ListenVoice: 20,
+
+    /// <summary>
+    ///   弹出浮层 播放视频
+    /// </summary>
+    SeeVoice: 21,
+
+    /// <summary>
+    ///  在浏览器中打开一个 relationField 执行的URL
+    /// </summary>
+    OpenUrlInBrowse: 22,
   },
 
   /// <summary>
@@ -482,6 +497,9 @@ const Enum = {
     Dropdown : 3
   },
 
+  /// <summary>
+  /// 页面打开类型
+  /// </summary>
   PageStyle:
   {
     /// <summary>

package/src/centaline/mixins/dynamicElement.js

@@ -103,7 +103,6 @@ export default {
           if ("undefined" !== typeof this.selfValidExcute) {
             if (!this.selfValidExcute("change")) {
               self.valid = false;
-              //return false;
             }
           }
         }

package/src/main.js

@@ -39,7 +39,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '5c3b43fb-5051-40e0-b9dc-577f37767af0',
+        oldToken: 'd7a1705d-d8f4-4fee-9778-f9f6e402eacd',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: ' {"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"undefined"}',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijk4NGM0ZjJlLTRhNTgtNDM4YS1iNjkxLWQyMTI4ZjdlYjNlMyJ9.nxO4kEXzIM2RJTXuX_AOoctKFvBiTZUEwHTu1YSFMn8JBjM9p-RK31ZB8ckJvlwgjiDGdbuGt1QOZRRP9KS3qQ',