centaline-data-driven 1.3.85 → 1.3.87

package/package.json

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

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

@@ -434,14 +434,14 @@
                 submitData = field.getActionPara(submitData).para;
                 self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
               }
+              else if (field.isOpenUrlInBrowse) {// 浏览器打开
+                window.open(submitData[field.submitFormField], "_blank");
+              }
               else if (field.isBrowserNewTab) {// 浏览器打开
                 submitData = field.getActionPara(submitData).para;
                 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.isSeeVoice) {//看视频              
                 self.$common.browseVideo(field,submitData)
               }
@@ -678,6 +678,7 @@
         var self = this;
         var submitData = {};
         var verified = true;
+        var flagSearchlist = false;
         var tempFormData = self.model.getFormObj();
 
         var check = true;
@@ -726,14 +727,18 @@
           self.$message.warning(checkMsg);
           return;
         }
-        
+        if(router.id.indexOf('_')===0){
+          // flagSearchlist=true;
+        }
+
         submitData = router.getActionPara(submitData).para;
         var dialogOption = {
           title: router.pageTitle,
           pane: self.$common.getParentPane(self),
           content: [{
-            component: 'ct-popupSearchList',
+            component: flagSearchlist?'ct-searchlist':'ct-popupSearchList',
             attrs: {
+              searchConditionApi: router.actionForSearchLayout,
               searchFormApi: router.actionForSearchLayout,
               searchDataApi: router.actionForSearch,
               apiParam: submitData,

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

@@ -670,22 +670,19 @@
       },
       rowColorChange() {
         var index = this.model.selectIndex;
-        if (
-          typeof this.$refs["rows." + index] !== "undefined" &&
-          this.currentRow !== this.$refs["rows." + index][0]
-        ) {
+        if (typeof this.$refs["rows." + index] !== "undefined" && this.currentRow !== this.$refs["rows." + index][0]) {
           if (this.currentRow !== null) {
             for (var i = 0; i < this.currentRow.children.length; i++) {
+              this.currentRow.children[i].style.backgroundColor='';
               this.currentRow.children[i].classList.remove("select");
             }
           }
           if (this.$refs["rows." + index][0]) {
-            for (
-              var j = 0;
-              j < this.$refs["rows." + index][0].children.length;
-              j++
-            ) {
+            for ( var j = 0;j < this.$refs["rows." + index][0].children.length; j++) {
               this.$refs["rows." + index][0].children[j].classList.add("select");
+              if(this.model.selectedRowBackColor){
+                this.$refs["rows." + index][0].children[j].style.setProperty('background-color',this.model.selectedRowBackColor,'important');
+              }
             }
           }
           this.currentRow = this.$refs["rows." + index][0] || null;
@@ -838,14 +835,14 @@
               submitData = field.getActionPara(submitData).para;
               self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
             }
+            else if (field.isOpenUrlInBrowse) {// 浏览器打开
+              window.open(submitData[field.submitFormField], "_blank");
+            }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);
               window.open(action + query, "_blank");
             }
-            else if (field.isOpenUrlInBrowse) {// 浏览器打开
-              window.open(submitData[field.submitFormField], "_blank");
-            }
             else if (field.isSeeVoice) {//看视频
               self.$common.browseVideo(field, submitData);
             }
@@ -867,7 +864,7 @@
                 self.$common.viewerfile(field, MediaAlbum, 0, 0);
               }
             }
-            else if (field.isUrlInLayer) {//URL页面（弹层）
+            else if (field.isUrlInLayer) {//URL页面（弹层iframe）
               var dialogOption = {
                 title: field.pageTitle,
                 pane: self.$common.getParentPane(self),
@@ -1208,14 +1205,14 @@
                 .getDataDrivenOpts()
                 .handler.openTabSearch(field, submitData);
             }
+            else if (field.isOpenUrlInBrowse) {// 浏览器打开
+              window.open(submitData[field.submitFormField], "_blank");
+            }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
               let query = self.$common.objectToQueryStr(submitData);
               window.open(action + query, "_blank");
             }
-            else if (field.isOpenUrlInBrowse) {// 浏览器打开
-              window.open(submitData[field.submitFormField], "_blank");
-            }
             else if (field.isSeeVoice) {//看视频
               self.$common.browseVideo(field, submitData);
             }

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

@@ -21,7 +21,15 @@
       </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" :flagNew="true" @click="quickSelect"></ctQuickInputSos>
+      <ctQuickInputSos v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" :flagNew="true" @click="quickSelect"></ctQuickInputSos>      
+      
+      <div v-if="model.moreActionRouter && !model.lock">
+        <img v-if="model.moreActionRouter.imgUrl" class="ct-tablecurrencyImg ct-tablecurrencyItem" 
+          :src="model.moreActionRouter.imgUrl" :title="model.moreActionRouter.label"  @click="popupSearchListHandle"/>
+        <el-button v-else  size="mini" type="primary" class="h26" @click="popupSearchListHandle">
+          {{model.moreActionRouter.label}}
+        </el-button>
+      </div>
     </div>
     <transition name="el-fade-in" class="ct-flex-div-span">
      <span v-show="!valid" class="errorMessage" :class="{ 'errorMessageMarginLeft': model.inputType === 'textarea' }">
@@ -101,6 +109,13 @@
         }
         this.search();
       },
+      popupSearchListHandle: function () {
+        var self = this;
+        self.showDrop=false;
+        self.$emit('popupSearchList', false, self.model, self.model.moreActionRouter, (optionArr) => {
+          self.selectOptionArr(optionArr);
+        });
+      },
     },
   }
 </script>