centaline-data-driven 1.1.69 → 1.1.70

package/package.json

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

package/src/Edit.vue

@@ -1,21 +1,31 @@
 <template>
   <div id="app">
-    <!-- <formListTable></formListTable> -->
-    <el-button @click="copyField">test</el-button>
+       <viewer :images="pics">
+            <img v-for="src in pics" :src="src" :key="src">
+      </viewer>
   </div>
   
 </template>
 
 <script>
   import formListTable from './centaline/dynamicForm/src/dynamicFormListTable'
+ import Viewer from 'v-viewer'
+ import 'viewerjs/dist/viewer.css'
+ import Vue from 'vue'
+ Vue.use(Viewer)
   export default {
     name: 'App',
     components: {
-      'formListTable': formListTable
+      'formListTable': formListTable,
     },
     data() {
       return {
-        template: ""
+        template: "",
+         pics:[
+           'https://wpimg.wallstcn.com/4c69009c-0fd4-4153-b112-6cb53d1cf943',
+           'https://wpimg.wallstcn.com/4c69009c-0fd4-4153-b112-6cb53d1cf943',
+           'https://wpimg.wallstcn.com/4c69009c-0fd4-4153-b112-6cb53d1cf943',
+       ],
       }
     },
     methods: {

package/src/SearchList.vue

@@ -2,7 +2,7 @@
   <div id="app-search" style="height:100%;position: fixed;">
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist>
+    <ct-searchlist :searchConditionApi="'/estatemanage/estatlist/getLayoutOfSearch'" :searchDataApi="'/estatemanage/estatlist/getList'"></ct-searchlist>
     <!-- <ct-searchlist :searchConditionApi="'/WorklistList/getLayoutOfSearch'" :searchDataApi="'/WorklistList/getListOfSearchModel'" :searchCategoryApi="'/WorklistList/getLayoutOfSearchCategory'"></ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"

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

@@ -28,7 +28,14 @@
           <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]">
-                <input type="checkbox" @click="selectAll($event)" v-model="model.selectAll" class="checkbox-td-1" />
+                <label class="el-checkbox"><span class="el-checkbox__input" :class="headAllCheckClass">
+                  <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" />
+                  </span>
+                </label>
+
+                
               </th>
               <th :ref="column.fixed?(column.fixed==='left'?'headLeftThs':'headRightThs'):'headThs'" v-for="(column,colIndex) in columns"
                   v-if="column.show" class="ct-td ct-searchtable-th"
@@ -74,7 +81,12 @@
                 class="ct-tr"
                 :style="row.$style">
               <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td" :class="[model.tdClass]" align="center">
-                <input v-if="!model.rightMulti || row[model.rightMulti] == 1" type="checkbox" v-model="row.$select" @change="selectOne($event)" class="checkbox-td-1" />
+                <label class="el-checkbox is-checked"><span class="el-checkbox__input" :class="rowCheckClass(row)">
+                 <span class="el-checkbox__inner"></span>
+  <!-- <input type="checkbox" aria-hidden="false" class="el-checkbox__original" value=""> -->
+                 <input v-if="!model.rightMulti || row[model.rightMulti] == 1" type="checkbox" v-model="row.$select" @change="selectOne($event)" class="el-checkbox__original checkbox-td-1" />
+                </span>
+              </label>
               </td>
               <td :ref="column.fixed?(column.fixed==='left'?'headLeftTds':'headRightTds'):null"
                   v-for="(column,colIndex) in model.dataFieldcolumns"
@@ -148,6 +160,23 @@
       searchStatsApi: String
     },
     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 {
@@ -171,7 +200,8 @@
         firstRow: 0,//展示出来可视的第一行号
         pageRowMin: 0,//页面实际的第一行号
         pageRowMax: 100,//页面实际的第后行号
-        displayRowNumber: 30
+        displayRowNumber: 30,
+        selectAllType:1,
       }
     },
     activated() {
@@ -180,6 +210,14 @@
       })
     },
     methods: {
+      rowCheckClass(row) {
+
+         if(row.$select)
+         {
+           return 'is-checked';
+         }
+
+       },
       load(data) {
         var self = this;
         self.model = data;
@@ -215,7 +253,7 @@
         }
         self.tableComplate = true;
         this.setTableHeight();
-
+        this.selectAllType=this.model.getSelectAll();
 
         this.$nextTick(() => {
           self.loadStats();
@@ -812,10 +850,13 @@
           }
         });
         this.model.setButtonsDisabled();
+        this.selectAllType=this.model.getSelectAll();
         this.$forceUpdate();
       },
       selectOne($ev) {
         this.model.setButtonsDisabled();
+        this.model.setIsMulti();
+        this.selectAllType=this.model.getSelectAll();
       },
       calculatingRowHeight() {
         let self = this;

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

@@ -3,12 +3,34 @@ import Base from './Base';
 const T = function (source) {
   var rtn = {
     get labelValue() {
-      if (source.name1)
-        return source.name1;
-      if (source.code1)
-        return source.code1;
-      else
-        return '';
+      var rtn = "";
+      var rtn1 = "";
+      var rtn2 = "";
+      if (source.name1) {
+        rtn1 = source.name1;
+      }
+      else {
+        if (source.code1) {
+          rtn1 = source.code1;
+        }
+      }
+
+      if (source.name2) {
+        rtn2 = source.name2;
+      }
+      else {
+        if (source.code2) {
+          rtn2 = source.code2;
+        }
+      }
+
+      if (rtn2.trim()) {
+        rtn = rtn1 + " ~ " + rtn2;
+      }
+      else {
+        rtn = rtn1;
+      }
+      return rtn;
     }
   };
   rtn = base.copy(Base(source), rtn);

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

@@ -267,6 +267,50 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           return [rtn.listData[rtn.selectIndex]];
         }
       },
+      setIsMulti() {
+        if (rtn.listData.length === 0) {
+          return;
+        }
+          if (rtn.isMulti) {
+            //找出没有被选中的框
+            var rtnData = rtn.listData.filter((ro) => {
+              return ro.$select === false
+            });
+            if(!rtnData||rtnData.length>0)
+            {
+              this.selectAll = false;
+            }else
+            {
+              this.selectAll = true;
+            }
+          }
+      },
+      //1.没选中 2.部分选中 3.全选中
+      getSelectAll()
+      {
+        if (rtn.listData.length === 0) {
+          return 1;
+        }
+        if (rtn.isMulti) {
+            //找出没有被选中的框
+            var rtnData = rtn.listData.filter((ro) => {
+              return (ro.$select === false||ro.$select ===undefined)
+            });
+            if(rtnData.length<=0)//没有找到未选中的复选框
+            {
+              return 3;
+            }
+            if(rtnData.length>0&&rtnData.length<rtn.listData.length)//部分选中
+            {
+              return 2;
+            }
+            if(rtnData.length>0&&rtnData.length==rtn.listData.length)//没选中
+            {
+              return 1;
+            }
+        }
+        return 1;
+      },
       _buttons: null,
       get buttons() {
         if (rtn._buttons !== null) {

package/src/main.js

@@ -8,6 +8,7 @@ import App from './App';
 import router from './router';
 import centaline from './centaline/index';
 
+
 Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
@@ -27,7 +28,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        Authorization: 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjgyYjQwNjBhLTU4NmMtNGRhYy04N2JkLTJiODQ5N2YxYzQ3MCJ9.c6FZAjNkE8cQqdArVejAWCEe-aVyxeNOVDQhVZfN2MLZCMcAMEeh4d9LSZJAvUxr8yOGZMdQVSjy69kWgE5HyQ',
+        Authorization: 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjFlYmY1ZjczLTExZDItNDJlOS04MTRiLTAwODVjNWUxY2YzZiJ9.2nbFfFzcE46WJLKZxs6-RSYkMeL82IUaBvs_afX7HrHyHEtyq_dR5vl2fj9A_ToPSsRTuc_SMRS6qF31sGA2ow',
         originalRequestURL: 'http://10.88.23.22:9999',
         EstateInfo: '{"estateId":"201509230915485D942241BBA30FF49F","estateName":"A-%E7%88%B1%E7%90%B4%E6%B5%B7B%E7%BB%84"}'
       };