centaline-data-driven-v3 0.1.26 → 0.1.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",

package/src/components/web/SearchList/SearchSideMenu.vue

@@ -1,27 +1,20 @@
 <template>
     <div class="searchSideMenu toggler" :style="{ right: sideBarMenuRight + 'px' }" @click="clickHandler()">
         <el-icon>
-            <ArrowRight v-show="side == 'open'" />
-            <ArrowLeft v-show="side == 'close'" />
+            <ArrowRight v-show="sideBarStatus == 'open'" />
+            <ArrowLeft v-show="sideBarStatus == 'close'" />
         </el-icon>
     </div>
 </template>
 <script setup lang="ts">
-import { ref } from 'vue'
 const emit = defineEmits(['sideMenuClickHandler'])
 const props = defineProps({
     sideBarMenuRight: Number,
     sideBarStatus: String,
 })
-const side = ref('open')
-if (props.sideBarStatus) {
-    side.value = props.sideBarStatus;
-}
+
 function clickHandler() {
-    let v = side.value;
-    if (v == 'close') side.value = 'open';
-    else if (v == 'open') side.value = 'close';
-    emit('sideMenuClickHandler', v);
+    emit('sideMenuClickHandler', props.sideBarStatus);
 }
 defineExpose({
     clickHandler

package/src/components/web/SearchList/SearchSideRight.vue

@@ -32,7 +32,6 @@ const props = defineProps({
 })
 const detailSearchlist=ref()
 
-
 function submit(modelForm, responseData) {
     emit('submit', modelForm, responseData);
 }

package/src/components/web/SearchList/SearchTable.vue

@@ -1,8 +1,8 @@
 <template>
     <div style="width: 100%" class="ct-searchtable" ref="refSearchTable">
         <ct-searchstats ref="refTableStats" v-if="!isLoading && model && searchStatsApi" :api="searchStatsApi"
-            @searchStats="clickSearchStats" :searchModel="model.searchModel" 
-            :flagDisabled="disabledStats" :apiParam="apiParam">
+            @searchStats="clickSearchStats" :searchModel="model.searchModel" :flagDisabled="disabledStats"
+            :apiParam="apiParam">
         </ct-searchstats>
         <TableToolbar ref="refToolbar" v-if="!isLoading && model && model.buttons" :buttons="model.buttons"
             :key="model.toolbarKey" @click="toolbarClickHandler" @importComplete="importComplete"
@@ -25,8 +25,9 @@
                     <thead ref="refTableHead" class="right-no-fixation-th">
                         <tr class="ct-tr" ref="refHeadTr" v-for="(columns, columnsIndex) in model.columnsArr"
                             :key="columnsIndex">
-                            <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs" :rowspan="model.multiRowSpan"
-                                class="ct-td left-fixation-th checkbox-td" :class="[model.tdClass]">
+                            <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs"
+                                :rowspan="model.multiRowSpan" class="ct-td left-fixation-th checkbox-td"
+                                :class="[model.tdClass]">
                                 <el-checkbox v-model="model.selectAll" :indeterminate="model.isIndeterminate"
                                     size="default" @change="selectAll"></el-checkbox>
                             </th>
@@ -184,7 +185,7 @@
                                                     :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'"
                                                     :columnName="column.id" :router="column.router"
                                                     :columnGroupId="column.groupId"
-                                                    :colValue="getValueCaseInsensitive(row,column.id)" :rowData="row"
+                                                    :colValue="getValueCaseInsensitive(row, column.id)" :rowData="row"
                                                     :eventTriggerType="column.eventTriggerType"
                                                     @click="rolRouterClickHandler"
                                                     @mouseenter="rolRouterMouseenterHandler">
@@ -405,6 +406,9 @@ function load(data) {
     model.value = data;
     model.value.$vue = { searchStrat, searchEnd, downloadUrl, loadStats, setTableHeight, updateCurrentRow, doAction, itemKey, refreshTableColumns, calculatingRowHeight, emit, operationLoading, getPage, toolbarClickHandler };
     model.value.isIframe = props.isIframe
+    model.value.isPageInSideBar = false
+    model.value.columnName = null
+    model.value.columnGroupId = null
     //自动查询 调用合并列
     if (model.value.listData.length > 0) {
         if (model.value.rowMergedColumns.length > 0) {
@@ -555,7 +559,7 @@ function importComplete(res, field) {
                                             message: data.rtnMsg,
                                             type: 'success',
                                             showClose: true,
-                                            dangerouslyUseHTMLString:true,
+                                            dangerouslyUseHTMLString: true,
                                         });
                                     }
                                     getPage(1, false);
@@ -566,7 +570,7 @@ function importComplete(res, field) {
                                         message: data.rtnMsg,
                                         type: 'warning',
                                         showClose: true,
-                                        dangerouslyUseHTMLString:true,
+                                        dangerouslyUseHTMLString: true,
                                     });
                                 }
                             },
@@ -609,7 +613,7 @@ function importComplete(res, field) {
                                         message: data.rtnMsg,
                                         type: 'success',
                                         showClose: true,
-                                         dangerouslyUseHTMLString:true,
+                                        dangerouslyUseHTMLString: true,
                                     });
                                 }
                                 getPage(1, false);
@@ -620,7 +624,7 @@ function importComplete(res, field) {
                                     message: data.rtnMsg,
                                     type: 'warning',
                                     showClose: true,
-                                     dangerouslyUseHTMLString:true,
+                                    dangerouslyUseHTMLString: true,
                                 });
                             }
                         },
@@ -727,7 +731,7 @@ function rowLayoutClickHandle(index) {
 }
 
 //表单列表操作
-function rolRouterClickHandler(field, rowData, rowindex, visible, columnName, columnGroupId,callBack, flagMouseenter) {
+function rolRouterClickHandler(field, rowData, rowindex, visible, columnName, columnGroupId, callBack, flagMouseenter) {
     field.rowindex = rowindex;
     if (refRowsPopover.value[rowindex]) {
         refRowsPopover.value[rowindex].hide();
@@ -739,6 +743,7 @@ function rolRouterClickHandler(field, rowData, rowindex, visible, columnName, co
         model.value.currentListenVoice = visible ? 'router' + field.id + rowindex : '';
     }
 
+
     var submitData = {};
     field.submitListField.forEach((k) => {
         submitData[k] = rowData[k];
@@ -752,9 +757,11 @@ function rolRouterClickHandler(field, rowData, rowindex, visible, columnName, co
     }
     if (columnName) {
         submitData.columnName = columnName;
+        model.value.columnName = columnName
     }
     if (columnGroupId) {
         submitData.columnGroupId = columnGroupId;
+        model.value.columnGroupId = columnGroupId
     }
 
     let action = field.action;
@@ -762,11 +769,26 @@ function rolRouterClickHandler(field, rowData, rowindex, visible, columnName, co
         action = rowData[field.actionField];
     }
 
+    if (field.isFormPageInSideBar || field.isSearchPageInSideBar) {
+        if (field.isFormPageInSideBar) {
+            field.actionSource = 'Form';
+        }
+        else if (field.isSearchPageInSideBar) {
+            field.actionSource = 'SearchList';
+        }
+        model.value._rowSelectRouter = field;
+        model.value.flagSideBar = true;
+        model.value.isPageInSideBar = true;
+        model.value.sideBarWidth = field.pageWidth;
+        emit("loaded");
+        return;
+    }
+
     RouterClickHandler(field, submitData, action, model.value, 'table', callBack, flagMouseenter)
 }
 //表单列表操作
-function rolRouterMouseenterHandler(field, rowData, rowindex, visible, columnName,columnGroupId, callBack, flagMouseenter) {
-    rolRouterClickHandler(field, rowData, rowindex, visible, columnName,columnGroupId, callBack, true)
+function rolRouterMouseenterHandler(field, rowData, rowindex, visible, columnName, columnGroupId, callBack, flagMouseenter) {
+    rolRouterClickHandler(field, rowData, rowindex, visible, columnName, columnGroupId, callBack, true)
 }
 function popupClickHandler() {
     var tempListData = model.value.getSelectRowData({ isMulti: model.value.isMulti });
@@ -1609,9 +1631,9 @@ function addClass(el, className) {
     el.className = newClassName.join(" ");
 }
 function getValueCaseInsensitive(obj, key) {
-  const searchKey = key.toLowerCase();
-  const foundKey = Object.keys(obj).find(k => k.toLowerCase() === searchKey);
-  return foundKey ? obj[foundKey] : undefined;
+    const searchKey = key.toLowerCase();
+    const foundKey = Object.keys(obj).find(k => k.toLowerCase() === searchKey);
+    return foundKey ? obj[foundKey] : undefined;
 }
 
 defineExpose({

package/src/components/web/SearchList.vue

@@ -32,7 +32,7 @@
                 @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
                 @closeSideHandler="closeSideHandler" @submit="submitHandler"></SearchSideRight>
             <SearchSideMenu ref="refSideMenu" :sideBarMenuRight="sideBarMenuRight" :sideBarStatus="sideBarStatus"
-                @sideMenuClickHandler="sideMenuClickHandler"></SearchSideMenu>
+                @sideMenuClickHandler="sideMenuClickHandler" :key="reloadKey"></SearchSideMenu>
         </div>
     </div>
 </template>
@@ -218,7 +218,6 @@ function categoryLoadedError() {
 function categorychange(param) {
     if (param) screenPara.value = param;
     reloadKey.value++;
-    reloadKey.value++;
 
 }
 function searchComplate(index) {
@@ -267,8 +266,8 @@ function tableLoaded() {
                 var tagkey = window.localStorage.getItem(sideBarPageType.value + "key" + title.value);
                 sideBarStatus.value = tagkey;
             }
-
-            if (flagDefaultDisplaySideBar.value && !sideBarStatus.value) {
+              
+            if ((flagDefaultDisplaySideBar.value && !sideBarStatus.value)||refTable.value.model.isPageInSideBar) {
                 sideMenuClickHandler('close');
             }
             else {
@@ -391,6 +390,12 @@ function rowClickHandle() {
                     }
                 );
             }
+            if(refTable.value.model.columnName){
+                sideBarApiParam.value.columnName = refTable.value.model.columnName;
+            }
+            if(refTable.value.model.columnGroupId){
+                sideBarApiParam.value.columnGroupId = refTable.value.model.columnGroupId;
+            }
             sideBarApiParam.value.actionType = refTable.value.model.rowSelectRouter.actionType;
             detailKey.value = detailKey.value + 1;
         }

package/src/loader/src/Router.js

@@ -50,6 +50,9 @@ const Router = function (source) {
     get actionSource() {
       return source.actionSource;
     },
+    set actionSource(v) {
+      source.actionSource = v;
+    },
     //动作之前执行的脚本，属性名称需再斟酌
     get onChanged() {
       return source.onChanged;
@@ -165,6 +168,12 @@ const Router = function (source) {
     get isLayerInSystem() {
       return source.pageStyle === Enum.PageStyle.LayerInSystem;
     },
+    get isFormPageInSideBar() {
+      return source.pageStyle === Enum.PageStyle.FormPageInSideBar;
+    },
+    get isSearchPageInSideBar() {
+      return source.pageStyle === Enum.PageStyle.SearchPageInSideBar;
+    },
 
     //执行的动作类型（比如新增、修改） 
     get actionType() {
@@ -270,6 +279,9 @@ const Router = function (source) {
       })
       return submitArr;
     },
+    set submitListField(v) {
+      rtn.submitListField = v;
+    },
     //选中列表时，调用回调函数
     get callBackFunName() {
       return source.callBackFunName;

package/src/loader/src/SearchTable.js

@@ -151,6 +151,9 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         get flagSideBar() {
             return source.content.flagSideBar || false;
         },
+        set flagSideBar(v) {
+            source.content.flagSideBar = v;
+        },
         //侧边栏默认是否显示
         get flagDefaultDisplaySideBar() {
             return source.content.flagDefaultDisplaySideBar || false;
@@ -166,6 +169,9 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         get mainBarWidth() {
             return source.content.mainBarWidth;
         },
+        set mainBarWidth(v) { 
+            source.content.mainBarWidth = v;
+        },  
         //用于移动端列表单元格的布局
         get cellLayout() {
             return source.content.cellLayout;

package/src/main.js

@@ -65,7 +65,7 @@ app.use(centaline, {
         //获取请求头
         getRequestHeaders: function () {
             return {
-              authobject: '{token:"wufw-1980431367841927168",platform:"WEB"}',
+              authobject: '{token:"jiangzf-1980566715226116096",platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',
                 //authObject: '{EmpID:"Token_4e09499b-4b76-46df-9ce5-5498d48ed062",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_4e09499b-4b76-46df-9ce5-5498d48ed062",Platform:"WEB"}',

package/src/utils/Enum.js

@@ -668,7 +668,15 @@ const Enum = {
     /**
     * 在tab页打开 前端的VUE组件， 组件名称放在action参数里
    */
-    OpenVueComponentInTab: 122
+    OpenVueComponentInTab: 122,
+     /**
+     * 表单在侧边栏打开
+     */
+    FormPageInSideBar: 123,
+     /**
+     * 列表在侧边栏打开
+     */
+    SearchPageInSideBar: 124
   },
 
   /// <summary>

package/src/views/SearchList.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/ReportPersonAttendanceList/getLayoutOfSearch'"
-      :searchDataApi="'ReportPersonAttendanceList/getListOfSearchModel'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'http://10.88.22.13:7070/onecard-api/EmployeeWorkLogList/ind/getLayoutOfSearch'"
+      :searchDataApi="'http://10.88.22.13:7070/onecard-api/EmployeeWorkLogList/ind/getListOfSearchModel'"></ct-searchlist>
 
        <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
       :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist> -->
@@ -15,6 +15,6 @@
   
 <script lang="ts" setup>
 import { ref, nextTick } from 'vue'
-const apiParam = {}
+const apiParam = {"rowGUID":"{7AE0A3FB-2D6C-4E51-8B10-71EAFA2D269A}","code":"KD01","name":"中原（中国）物业顾问有限公司","deptID":"{7AE0A3FB-2D6C-4E51-8B10-71EAFA2D269A}","path":"KD01","checkBillLeftHours":"1","rightEdit":"1"}
 
 </script>