centaline-data-driven 1.2.12 → 1.2.15

package/package.json

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

package/src/centaline/css/common.css

@@ -765,4 +765,7 @@ html {
 /* 重置弹层引用列表样式居上高度 */
 .ct-dialog_content .ct-searchtable{
   margin-top: 0px!important;
+}
+.ct-table-content .checkbox-td .el-checkbox{
+  min-width: initial;
 }

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -1028,7 +1028,6 @@
               margin-right: 10px;
             }
             .user-name {
-              margin-top: 5px;
               display: flex;
             }
             .text {

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

@@ -544,17 +544,17 @@
         var router = this.model.actionRouters.find((v) => {
           return v.id === field.id;
         });
-        if(router==undefined){
-            router = this.model.actionRoutersMoreList.find((v) => {
+        if(router==undefined && this.model.actionRoutersMoreList){
+          router = this.model.actionRoutersMoreList.find((v) => {
             return v.id === field.id;
           });
         }
-        if(router==undefined){
+        if(router==undefined && this.model.otherTradeActionRouter){
           if(field.id===this.model.otherTradeActionRouter.id){
             router = this.model.otherTradeActionRouter
           }
         }
-        if(router==undefined){
+        if(router==undefined && this.model.operationRouters){
             router = this.model.operationRouters.find((v) => {
               return v.id === field.id;
             });
@@ -1114,7 +1114,6 @@
               margin-right: 10px;
             }
             .user-name {
-              margin-top: 5px;
               display: flex;
             }
             .text {

package/src/centaline/dynamicL/src/dynamicL.vue

@@ -17,7 +17,12 @@
             {{model.label}}
           </div>
         </div>
-        <label class="ct-lable">
+        <span v-if="model.flagJson">
+          <span class="el-tag el-tag--info el-tag--mini" v-for="item in model.labelValue" :key="item" style="box-sizing: border-box;border-color: transparent;margin: 2px 0 2px 6px;">
+            <span class="el-select__tags-text">{{item}}</span>
+          </span>
+        </span>
+        <label v-else class="ct-lable">
           {{model.labelValue}}
         </label>
         <span slot="suffix" v-if="model.unitName" class="ct-unitnameLable">{{model.unitName}}</span>

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

@@ -28,7 +28,7 @@
           <thead ref="tableHead">
             <tr class="ct-tr" ref="headTr" v-for="(columns,columnsIndex) in model.columnsArr">
               <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs" class="ct-td left-fixation-th checkbox-td" :class="[model.tdClass]">
-                <label class="el-checkbox"><span class="el-checkbox__input" :class="headAllCheckClass">
+                <label class="el-checkbox"><span class="el-checkbox__input" :class="model.selectAllType">
                   <span class="el-checkbox__inner"></span>
                   <!-- <input type="checkbox" aria-hidden="false" class="el-checkbox__original" value=""> -->
                   <input type="checkbox" @click="selectAll($event)" v-model="model.selectAll" class="el-checkbox__original checkbox-td-1" aria-hidden="false" />
@@ -164,23 +164,7 @@
       }
     },
     computed: {
-       headAllCheckClass() {
 
-         if(this.selectAllType==1)
-         {
-           return '';
-         }
-         else if(this.selectAllType==2)
-         {
-           return 'is-indeterminate';
-         }
-         else if(this.selectAllType==3)
-         {
-           return 'is-checked';
-         }
-        return '';
-       },
-      
     },
     data() {
       return {

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

@@ -24,15 +24,19 @@
           {{validMessage}}
         </span>
       </transition>
-      <ct-quick-input v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" @input="model.value=$event"></ct-quick-input>
+      <ctQuickInputSos v-if="!model.lock && model.paramName" class="ct-flex-div-span" :pn="model.paramName" :action="api" @click="model.value=$event"></ctQuickInputSos>
     </div>
   </div>
 </template>
 <script>
   import dynamicElement from '../../mixins/dynamicElement';
+  import ctQuickInputSos from '../../quickInputSos/src/quickInput'
   export default {
     name: 'ct-text',
     mixins: [dynamicElement],
+     components: {
+      'ctQuickInputSos': ctQuickInputSos,
+    },
     props: {
       vmodel: Object
     },

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

@@ -8,7 +8,7 @@
 
         <template v-if="pageType=='form'">
           <div style="height: calc(100vh - 120px);">
-            <div style="border:1px solid red" :style="{'width':(width?width+'px':'auto'),'height':(height?height+'px':'auto')}">
+            <div class="ct-form" :style="{'width':(width?width+'px':'auto'),'height':(height?height+'px':'auto')}">
               <ct-form :api="formApi" :api-param="apiParam" :width="width" :height="height"></ct-form>
             </div>
           </div>
@@ -99,4 +99,10 @@
     #app-Tree .el-main .ct-table-content {
       padding: 0;
     }
+
+#app-Tree .el-main ct-form{border: 1px solid #cfcece; 
+    -webkit-box-shadow: #cfcece 0px 7px 9px 0px!important;
+    border-radius: 6px !important; 
+    margin-top: 14px;}
+    
 </style>

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

@@ -270,15 +270,17 @@ const Detail = function (source,para ,callBack) {
                       rtn._operationList=response.content;
                       if(rtn._operationList && rtn._operationList.length>0){
                         rtn._operationList.forEach((v,i) => {
-                          if (v.modelRouter) {                
-                            var router = Router(v.modelRouter);
-                            router.is = "ct-btn";
-                            router.attrs = { size: "mini" }
-                            if(router.rightField){
-                              router.show=v[router.rightField];
-                            } 
-                            rtn._operationList[i].router=router;
-                            rtn._operationRouters.push(router)
+                          if (v.modelRouters) {
+                            v.modelRouters.forEach((f,i2) => {
+                              var router = Router(f);
+                              router.is = "ct-btn";
+                              router.attrs = { size: "mini" }
+                              if(router.rightField){
+                                router.show=v[router.rightField];
+                              } 
+                              if(router.show)rtn._operationList[i].router=router;
+                              rtn._operationRouters.push(router);
+                            });
                           }
                         });
                       }
@@ -292,20 +294,25 @@ const Detail = function (source,para ,callBack) {
             response = response.responseData;
           }
           if(field.id=='Follow' 
-          || field.id=='Trust'
+          || field.id=='Trust' || field.id=='TrustZJJ' || field.id=='TrustDJ' || field.id=='TrustPT'
           || field.id=='RealLook'
           || field.id=='StatusAdjust'
-          || field.id=='OperationKey'
+          || field.id=='OperationKey' || field.id=='OperationKeyCommon' || field.id=='OperationKeyPassword'
           || field.id=='Key'){
             let id=field.id;
-            if(field.id=='OperationKey'){
+            if(field.id=='OperationKey'  || field.id=='OperationKeyCommon' || field.id=='OperationKeyPassword'){
               id='Key';
             }
+            else if(field.id=='TrustZJJ' || field.id=='TrustDJ' || field.id=='TrustPT'){
+              id='Trust';
+            }
             var advIndex = rtn.tags1.findIndex((v) => {
               return v.appID === id;
             });
             rtn.$vue.handleSelect({index:advIndex.toString()});
           }
+          else{
+          }
         },
         //检查是否关闭tab后触发来源页面操作
         checkCloseTabThen(notification) {

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

@@ -2,7 +2,24 @@ import base from '../../index';
 import Base from './Base';
 const T = function (source) {
   var rtn = {
+    flagJson:false,
     get labelValue() {
+      let value = [];
+      if(source.code1){
+        try{
+          let obj=JSON.parse(source.code1);
+          if (typeof obj == 'object' && obj) {
+            obj.forEach((v) => {
+              value.push(v.name);
+            });
+            rtn.flagJson=true;
+            return value;
+          }
+        } 
+        catch(e){
+        }
+      }
+
       var val = ""; 
       var lst = [];
       var joinChar = source.joinChar == undefined ? '' : source.joinChar;
@@ -27,8 +44,6 @@ const T = function (source) {
           lst.push(fieldVal);
         }
       }
-
-
     }
   };
   rtn = base.copy(Base(source), rtn);

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

@@ -0,0 +1,127 @@
+import base from '../../index';
+import Base from './Base';
+import valid from '../../../validate/index';
+import Axios from 'axios';
+import common from '../../../common';
+import Vue from 'vue';
+const QuickInput = function (source, moreActionRouter) {
+  var rtn = {
+    options: [{ code: source.code1, name: source.name1 }],
+    get text() {
+      if (source.isList && source.name1 && rtn.attrs.placeholder && rtn.displayLabelAfterSelected) {
+        return rtn.attrs.placeholder + ":" + source.name1;
+      }
+      return source.name1;
+    },
+    set text(v) {
+      if(source.displayName1)
+      {
+        source.displayName1 = v;
+      }else
+      {
+        source.name1 = v;
+      }
+    },
+    get optionColCount() {
+      return parseInt(source.optCount) || 5;
+    },
+    set optionColCount(v) {
+      source.optCount = v;
+    },
+    get parentName() {
+      return source.parentField;
+    },
+    reset() {
+      this.value = this.defaultValue;
+      this.text = this.defaultText;
+    },
+    defaultText: source.defaultName1,
+    get labelValue() {
+      if (source.name1) {
+        return source.name1;
+      }
+      else {
+        return '';
+      }
+    },
+    optionAttrs: {
+      value: 'code',
+      label: 'name',
+      displayLabel:'displayName',
+      actionType: 'actionType',
+      flagDeleted: 'flagDeleted'
+    },
+    attrs: {
+      style: {
+        width: '100%'
+      },
+      clearable: true,
+      filterable: true,
+      remote: true
+    },
+    apiParams: {
+      paramName: 'k',
+      parentName: 'pk',
+      parentValue: 'pv',
+      search: 't'
+    },
+    get clearable() {
+      if (typeof source.clear === 'undefined') {
+        return true;
+      }
+      if (source.clear) {
+        return true;
+      }
+      else {
+        return false;
+      }
+    },
+    set clearable(v) {
+      source.clear = v;
+    },
+    get searchTick() {
+      return parseInt(source.searchTick) || 250;
+    },
+    set searchTick(v) {
+      source.searchTick = v;
+    },
+    getOptions(paramsAction,key) {     
+      var self = this;
+      var apiAddrs = paramsAction || this.api;
+      var params = {
+        action: apiAddrs,
+        para: {
+          paramName: self.paramName,
+          parentValue: rtn.getFormParentFieldPara(),
+          key: key,
+        }
+      };
+      Vue.prototype.$api.postHandler(common.globalUri(), params).then((response) => {
+        if (response.rtnCode === 200) {
+          self.options = response.content;
+        }
+      });
+    },
+    moreActionRouter: moreActionRouter,//更多高级查询
+    //弹出SearchList类型，0不弹框，1点按钮弹框，2直接点搜索框弹框
+    get popupSearchListType() {
+      if (moreActionRouter) {
+        return 1;
+      }
+
+      return 0;
+    },
+    get moreActionBtnName() {
+      if (moreActionRouter) {
+        return moreActionRouter.label;
+      }
+
+      return null;
+    },
+  };
+  rtn = base.copy(Base(source), rtn);
+  rtn = base.copy(rtn, valid.Init(rtn));
+  return rtn;
+}
+
+export default QuickInput;

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

@@ -247,6 +247,13 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       set flagMoreData(v1) {
         source.page.flagMoreData = v1;
       },
+      get selectAllType() {
+        return source.selectAllType||'';
+      },
+      set selectAllType(v1) {
+        source.selectAllType = v1;
+      },
+      
       getSelectRowData(router) {
         if (rtn.listData.length === 0) {
           return null;
@@ -268,7 +275,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         }
       },
       setSelectAll() {
-        debugger
+       
         if (rtn.listData.length === 0) {
           return;
         }
@@ -280,6 +287,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             if(!rtnData||rtnData.length>0)
             {
               this.selectAll = 0;
+            }else
+            {
+              this.selectAll = 1;
             }
           }
       },
@@ -287,7 +297,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       getSelectAll()
       {
         if (rtn.listData.length === 0) {
-          return 1;
+          rtn.selectAllType='is-disabled';
+          return;
         }
         if (rtn.isMulti) {
             //找出没有被选中的框
@@ -296,18 +307,20 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             });
             if(rtnData.length<=0)//没有找到未选中的复选框
             {
-              return 3;
+              rtn.selectAllType='is-checked';
+              return;
             }
             if(rtnData.length>0&&rtnData.length<rtn.listData.length)//部分选中
             {
-              return 2;
+              rtn.selectAllType='is-indeterminate';
+              return;
             }
             if(rtnData.length>0&&rtnData.length==rtn.listData.length)//没选中
             {
-              return 1;
+              rtn.selectAllType='';
+              return;
             }
         }
-        return 1;
       },
       _buttons: null,
       get buttons() {
@@ -492,6 +505,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                 rtn.dataDictionary = response.content.rows;
                 //self.listData = self.listData.concat(response.content.Rows);
               }
+              rtn.getSelectAll();
               source.page.rows = response.page.rows;
               source.page.rowCount = response.page.rowCount;
               if (typeof response.content.foot !== 'undefined') {

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

@@ -35,6 +35,7 @@ const loader = {
   Detail: require("./ctl/Detail.js").default,
   PhotoSelect: require("./ctl/PhotoSelect.js").default,
   PhotoSelectList: require("./ctl/PhotoSelectList.js").default,
+  QuickInputSos: require("./ctl/QuickInputSos.js").default,
 };
 
 export default loader;

package/src/centaline/quickInput/src/quickInput.vue

@@ -3,7 +3,7 @@
     <el-dropdown @command="handleCommand" @visible-change="getOptions">
       <i class="el-icon-more"></i>
       <el-dropdown-menu ref="dropdown" slot="dropdown">
-        <el-dropdown-item v-for="(op, index) in options" :key="index" :command="op.Code">{{op.Name}}</el-dropdown-item>
+        <el-dropdown-item v-for="(op, index) in options" :key="index" :command="op.code">{{op.name}}</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
   </div>
@@ -30,7 +30,7 @@
           var params = {
             action: this.action,
             para: {
-              paramName: this.paramName1
+              paramName: this.pn
             }
           };
           this.$api.postHandler(this.$common.globalUri(), params).then((response) => {

package/src/centaline/quickInputSos/src/quickInput.vue

@@ -0,0 +1,96 @@
+<template>
+  <div class="ct-quickInput">
+
+     <el-popover ref="pop" placement="bottom-start" v-model="showDrop"  trigger="click">
+            <div>
+              <div>
+                <el-input ref="searchInput" size="mini" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
+              </div>
+              <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
+            </div>
+            <i slot="reference" class="el-icon-more"></i> 
+      </el-popover>
+  </div>
+</template>
+<script>
+
+  import selectOption from '../../selectOption/src/selectOption'
+  import dynamicElement from '../../mixins/dynamicElement'
+  import ctSelectOptionVertical from '../../selectOption/src/selectOptionVertical'
+  export default {
+    name: 'ctQuickInput',
+    mixins: [dynamicElement],
+    props: {
+      pn: String,
+      action: String
+    },
+     components: {
+      'ctSelectOption': selectOption,
+      'ctSelectOptionVertical': ctSelectOptionVertical
+    },
+     created() {
+       let that=this;
+      if (typeof this.vmodel === 'undefined') {
+        this.model = this.loaderObj.QuickInputSos(
+        {
+          code1:'',
+          name1:'',
+          paramName1:that.pn,
+        }
+        );
+      }
+      else {
+        this.model = this.vmodel;
+      }
+      this.searchInputHandle();
+    },
+    data() {
+      return {
+        options:[],
+        searchText: "",
+        showDrop: false,
+       
+      };
+    },
+    methods: {
+     
+      getOptions: function () {
+        var self = this;
+        this.model.getOptions(this.action, self.searchText);
+      
+      },
+      searchInputHandle: function () {
+        var currentSeatch = this.searchText;
+        this.searchTickControl(currentSeatch);
+      },
+      searchTickControl: function (search) {
+        var self = this;
+        setTimeout(function () {
+          if (search === self.searchText) {
+            self.getOptions(self.searchText);
+          }
+        }, self.model.searchTick);
+      },
+      selectOption(value) {
+        if (this.model.value === value) {
+          this.$set(this, 'showDrop', false);
+          return;
+        }
+        else {
+          this.model.value = value;
+        }
+        this.$set(this, 'showDrop', false);
+        this.$emit('click', value);
+      },
+    },
+    mounted() {
+      
+    }
+  }
+</script>
+<style>
+  .ct-quickInput .el-icon-more:hover {
+    cursor: pointer;
+    color: #409EFF;
+  }
+</style>