centaline-data-driven-v3 0.1.29 → 0.1.30

package/package.json

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

package/src/assets/commonWeb.css

@@ -98,6 +98,14 @@ body {
   align-items: center;
 }
 
+.ct-form .search-list .serach-screen .list-field .el-form-item__label {
+  width: auto;
+  text-align: right;
+  line-height: normal;
+  min-height: 26px;
+  align-items: center;
+}
+
 
 .errorMessage {
   height: 26px;
@@ -874,6 +882,15 @@ body {
   line-height: 22px;
 }
 
+.el-select__wrapper {
+  height: 28px;
+}
+
+.el-select__wrapper .el-select__selection {
+  flex-wrap: nowrap !important;
+  margin-right: 20px;
+}
+
 .el-select__input-wrapper {
   height: 22px;
   line-height: 22px;
@@ -913,7 +930,7 @@ body {
 .el-col1 {
   display: flex;
   flex-direction: column;
-  justify-content: flex-end; 
+  justify-content: flex-end;
 }
 
 .el-collapse {

package/src/components/web/ComboBox.vue

@@ -8,7 +8,7 @@
                 :height="300" @click="clickHandler"
                 :class="[model.moreActionRouter ? 'selectmore' : '', open ? 'open' : '']"
                 :filter-method="debouncedRemoteMethod" @compositionstart="handleCompositionStart"
-                @compositionend="handleCompositionEnd">
+                @compositionend="handleCompositionEnd"  :formatter="formatLabel">
                 <template #default="{ item }">
                     <el-tooltip :disabled="!item.toolTip" :content="item.toolTip" placement="right">
                         <span v-html="item.displayName || item.name"></span>
@@ -22,7 +22,7 @@
                     <template v-for="(v, i) in model.labelValue" :key="i">
                         <el-tag class="ml-2" type="info" disable-transitions :closable="!v.locked && !model.locked"
                             @close="closeTag(v.code)">
-                            {{ v.displayName || v.name }}</el-tag>
+                            {{ v.name }}</el-tag>
                     </template>
                 </template>
             </el-select-v2>
@@ -113,7 +113,7 @@ function getOptions(key) {
                     if (item) {
                         v.locked = true
                     }
-                    v.label = v.displayName || v.name
+                    v.label =v.name
                     v.value = v.code
                     v.disabled = v.locked
                     if (v.options) {
@@ -125,7 +125,7 @@ function getOptions(key) {
                             if (item1) {
                                 v2.locked = true
                             }
-                            v2.label = v2.displayName || v2.name
+                            v2.label = v2.name
                             v2.value = v2.code
                             v2.disabled = v2.locked
                         });
@@ -165,10 +165,18 @@ function debounce(func, delay) {
 const debouncedRemoteMethod = debounce(getOptions, 300);
 //选中值发生变化时触发
 function change(val) {
-    if (typeof val == 'undefined') {
+    if (typeof val == 'undefined' || (model.value.multiple && val.length == 0)) {
         if (model.value.defaultCode1) {
-            val = model.value.defaultCode1
-            model.value.value = val
+            if (model.value.multiple) {
+                var defaultCode1 = JSON.parse(model.value.defaultCode1)
+                defaultCode1.forEach((v) => {
+                    model.value.value.push(v.code);
+                });
+            }
+            else {
+                val = model.value.defaultCode1
+                model.value.value = val
+            }
             model.value.itemKey = Math.random()
         }
         else {
@@ -265,6 +273,10 @@ function closeTag(val) {
     model.value.value.splice(model.value.value.indexOf(val), 1)
     change(model.value.value)
 }
+const formatLabel = (option) => {
+  console.log('进入 formatter', option); // 测试是否触发
+  return option.name || option.label;
+};
 defineExpose({
     model
 })

package/src/components/web/RichText.vue

@@ -260,8 +260,8 @@ if (model.value.paramName1 && !model.value.locked) {
 }
 else if (!model.value.locked) {
     config.value.maximumWords = model.value && model.value.maxValue1 ? parseFloat(model.value.maxValue1) : 5000;
-    config.value.serverUrl = model.value.moreActionRouter.action;
-    config.value.imageUrl = model.value.moreActionRouter.action;
+    config.value.serverUrl = model.value.moreActionRouter?.action;
+    config.value.imageUrl = model.value.moreActionRouter?.action;
 }
 
 

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

@@ -15,7 +15,7 @@
         <div v-loading="operationLoading"></div>
 
         <div class="ct-tableParent" ref="refTableParent" v-bind="model.attrs" v-if="!isLoading && model"
-            :style="{ height: from == 'form' ? '100%' : model.tableHeight + 'px', 'border-bottom': model.isLayout ? 'none' : '', 'border-top': model.isLayout ? 'none' : '', }"
+            :style="{ height:model.tableHeight + 'px', 'border-bottom': model.isLayout ? 'none' : '', 'border-top': model.isLayout ? 'none' : '', }"
             @scroll="scrollHandle($event)" @keydown.up="rowKeyDownHandle($event, 0)"
             @keydown.down="rowKeyDownHandle($event, 1)" tabindex="-1">
             <div class="ct-table-content" v-if="!model.isLayout">

package/src/components/web/SearchList.vue

@@ -26,11 +26,12 @@
         <div ref="refSidebar" v-if="flagSideBar && flagSideBarOfData"
             :style="{ 'height': pageHeight ? pageHeight : '100%', 'width': sideBarWidth + 'px', right: sideBarRight + 'px' }"
             class="sidebar">
-            <SearchSideRight ref="RefSideRight" :apiParam="sideBarApiParam" :pageType="sideBarPageType"
-                :rowSelectRouter="rowSelectRouter" :listHeight="listHeight" :selectIndex="selectIndex"
-                :rowCount="rowCount" :key="detailKey" :drowerClose="drowerClose" @clickNextHandler="clickNextHandler"
-                @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
-                @closeSideHandler="closeSideHandler" @submit="submitHandler"></SearchSideRight>
+            <SearchSideRight :style="{ 'display': sideBarWidth && sideBarWidth > 0 ? 'block' : 'none' }" ref="RefSideRight"
+                :apiParam="sideBarApiParam" :pageType="sideBarPageType" :rowSelectRouter="rowSelectRouter"
+                :listHeight="listHeight" :selectIndex="selectIndex" :rowCount="rowCount" :key="detailKey"
+                :drowerClose="drowerClose" @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler"
+                @simpleRouterclickHandler="simpleRouterclickHandler" @closeSideHandler="closeSideHandler"
+                @submit="submitHandler"></SearchSideRight>
             <SearchSideMenu ref="refSideMenu" :sideBarMenuRight="sideBarMenuRight" :sideBarStatus="sideBarStatus"
                 @sideMenuClickHandler="sideMenuClickHandler"></SearchSideMenu>
         </div>
@@ -266,8 +267,8 @@ function tableLoaded() {
                 var tagkey = window.localStorage.getItem(sideBarPageType.value + "key" + title.value);
                 sideBarStatus.value = tagkey;
             }
-              
-            if ((flagDefaultDisplaySideBar.value && !sideBarStatus.value)||refTable.value.model.isPageInSideBar) {
+
+            if ((flagDefaultDisplaySideBar.value && !sideBarStatus.value) || refTable.value.model.isPageInSideBar) {
                 sideMenuClickHandler('close');
             }
             else {
@@ -283,6 +284,9 @@ function tableLoaded() {
         flagSideBarOfData.value = false;
         searchWidth.value = 0;
     }
+    if (model.value) {
+        model.value.table = refTable.value;
+    }
     emit('tableLoaded', refTable.value.model);
     emit('loaded', refTable.value.model);
 }
@@ -390,10 +394,10 @@ function rowClickHandle() {
                     }
                 );
             }
-            if(refTable.value.model.columnName){
+            if (refTable.value.model.columnName) {
                 sideBarApiParam.value.columnName = refTable.value.model.columnName;
             }
-            if(refTable.value.model.columnGroupId){
+            if (refTable.value.model.columnGroupId) {
                 sideBarApiParam.value.columnGroupId = refTable.value.model.columnGroupId;
             }
             sideBarApiParam.value.actionType = refTable.value.model.rowSelectRouter.actionType;

package/src/loader/src/Field.js

@@ -852,8 +852,9 @@ const Base = function (source, moreActionRouter, formLabelPlacement) {
                     if (this.multiple) {
                         this.value.splice(0);
                         this.labelValue.splice(0);
-                        if (this.defaultValue) {
-                            this.defaultValue.forEach((v) => {
+                        if (this.defaultCode1) {
+                            var defaultCode1=JSON.parse(this.defaultCode1)
+                            defaultCode1.forEach((v) => {
                                 this.value.push(v.code);
                                 this.labelValue.push(v);
                             });

package/src/loader/src/Form.js

@@ -820,6 +820,26 @@ function loadFromModel(source, isFormList) {
             });
             Object.assign(rtnFormObj, customizeColumnsObj);
           }
+          else if (f.controlType == Enum.ControlType.SearchPage) {
+            if (f.table) {
+              let rtnFormArr = [];
+              var tempListData = f.table.model.getSelectRowData({ isMulti: f.table.model.isMulti });
+              for (let i = 0; i < tempListData.length; i++) {
+                rtnFormArr.push(tempListData[i]);
+              }
+
+              let rtnObj = {};
+              Object.defineProperty(rtnObj, f.fieldName1, {
+                get: function () {
+                  return rtnFormArr;
+                },
+                enumerable: true,
+                configurable: true
+              });
+              Object.assign(rtnFormObj, rtnObj);
+            }
+
+          }
           else {
             if (f.hasOwnProperty('getFormObj') && typeof f.getFormObj === "function") {
               Object.assign(rtnFormObj, f.getFormObj());

package/src/loader/src/LibFunction.js

@@ -222,13 +222,12 @@ const LibFunction = {
               item.is = 'ct-location';
               break;
             case Enum.ControlType.SearchPage: //搜索列表页面
-                item = {};
+                //item = {};
                 item.is = 'ct-searchlist';
                 item.bindPara = {
                     searchConditionApi: field.code1,
                     searchDataApi: field.code2,
                     pageHeight: field.code4 ? field.code4 + 'px' : '',
-                    from: 'form',
                     apiParam: field.code3 ? JSON.parse(field.code3) : {}
                 };
                 break;

package/src/loader/src/Router.js

@@ -148,7 +148,8 @@ const Router = function (source) {
       return source.pageStyle === Enum.PageStyle.BrowserNewTab;
     },
     get isClientFuntion() {
-      return source.pageStyle === Enum.PageStyle.ClientFunction;
+      return source.pageStyle === Enum.PageStyle.ClientFunction
+      ||source.actionType===Enum.ActionType.ExcuteClientFunction;
     },
     get isSearchPageWithList() {
       return source.pageStyle === Enum.PageStyle.SearchPageWithList;

package/src/main.js

@@ -21,7 +21,7 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl: "https://kq-api-gz.centaline.com.cn/onecard-api/",
+    baseUrl: "http://10.88.22.13:7070/onecard-api/",
     //baseUrl:"http://10.88.22.13:7070/onecard-api/",
     //baseUrl: "https://kq-api.centaline.com.cn/onecard-api/",
     //baseUrl: "http://10.88.22.13:6060/onecard-api/",
@@ -30,7 +30,7 @@ app.use(centaline, {
     //baseUrl: "http://10.1.245.111:38028/",
 
     flagRouterSelf: true,
-    flagApp: true,//是否app端
+    flagApp: false,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: true,
@@ -65,7 +65,7 @@ app.use(centaline, {
         //获取请求头
         getRequestHeaders: function () {
             return {
-              authobject: '{token:"jiangzf-1983422832318779392",platform:"WEB"}',
+              authobject: '{token:"wufw-1988032150800367616",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

@@ -486,6 +486,11 @@ const Enum = {
     * 打开百度地图
     */
     OpenBaiduMap: 100,
+
+    /// <summary>
+    ///  执行客户端函数
+    /// </summary>
+    ExcuteClientFunction: 27,
   },
 
   /// <summary>
@@ -669,13 +674,13 @@ const Enum = {
     * 在tab页打开 前端的VUE组件， 组件名称放在action参数里
    */
     OpenVueComponentInTab: 122,
-     /**
-     * 表单在侧边栏打开
-     */
+    /**
+    * 表单在侧边栏打开
+    */
     FormPageInSideBar: 123,
-     /**
-     * 列表在侧边栏打开
-     */
+    /**
+    * 列表在侧边栏打开
+    */
     SearchPageInSideBar: 124
   },
 

package/src/views/Form.vue

@@ -1,12 +1,10 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
-   <ct-form :api="'/EmployeeMaternity/readDetail'" :apiParam="apiParam"></ct-form>
+   <ct-form :api="'/Employee/readDetail'" :apiParam="apiParam"></ct-form>
     <!-- <ct-textbox :source="source"></ct-textbox> -->
 <ct-dialoglist ref="dialogList"></ct-dialoglist>
  </div>  
 </template>
 <script lang="ts" setup>
- const apiParam={
-    "actionType": 2
-}
+ const apiParam={"actionType":2}
 </script>

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="'https://kq-api-gz.centaline.com.cn/onecard-api/EmployeeWorkLogList/ind/getLayoutOfSearch'"
-      :searchDataApi="'https://kq-api-gz.centaline.com.cn/onecard-api/EmployeeWorkLogList/ind/getListOfSearchModel'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'ReportOverTimeList/getLayoutOfSearch'"
+      :searchDataApi="'ReportOverTimeList/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 = {"rowGUID":"{7AE0A3FB-2D6C-4E51-8B10-71EAFA2D269A}","code":"KD01","name":"中原（中国）物业顾问有限公司","deptID":"{7AE0A3FB-2D6C-4E51-8B10-71EAFA2D269A}","path":"KD01","checkBillLeftHours":"1","rightEdit":"1"}
+const apiParam = {}
 
 </script>

package/src/views/Tree.vue

@@ -1,7 +1,7 @@
 <template>
    <div id="app-Tree" style="height:100%;position: fixed;width:100%;padding: 10px;">
       <ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'280'"
-         :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'" :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'"
+         :searchConditionApi="'/SystemUser/getSystemBusinessCategory'" :searchDataApi="'/SystemUser/getSystemBusinessCategory'"
          @loaded="loaded"></ct-treelist>
       <!-- <ct-textbox :source="source"></ct-textbox> -->
       <ct-dialoglist></ct-dialoglist>