centaline-data-driven-v3 0.1.33 → 0.1.35

package/package.json

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

package/src/assets/commonWeb.css

@@ -888,7 +888,6 @@ body {
 
 .el-select__wrapper .el-select__selection {
   flex-wrap: nowrap !important;
-  margin-right: 20px;
 }
 
 .el-select__input-wrapper {
@@ -1087,4 +1086,8 @@ body {
   height: 26px;
 }
 
+.ct-field .el-select__selected-item {
+  align-items: center !important;
+}
+
 /*elementPlus样式重置结束*/

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"  :formatter="formatLabel">
+                @compositionend="handleCompositionEnd">
                 <template #default="{ item }">
                     <el-tooltip :disabled="!item.toolTip" :content="item.toolTip" placement="right">
                         <span v-html="item.displayName || item.name"></span>
@@ -21,6 +21,7 @@
                 <template #tag>
                     <template v-for="(v, i) in model.labelValue" :key="i">
                         <el-tag class="ml-2" type="info" disable-transitions :closable="!v.locked && !model.locked"
+                        :style="{ marginRight: i+1==model.labelValue.length ? '20px' : '' }"
                             @close="closeTag(v.code)">
                             {{ v.name }}</el-tag>
                     </template>
@@ -113,7 +114,7 @@ function getOptions(key) {
                     if (item) {
                         v.locked = true
                     }
-                    v.label =v.name
+                    v.label = v.name
                     v.value = v.code
                     v.disabled = v.locked
                     if (v.options) {
@@ -273,10 +274,6 @@ 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/Field.vue

@@ -13,9 +13,9 @@
                         </div>
                     </slot>
                 </div>
-                <template v-else>
-                    <div class="el-form-item__label" v-if="model.labelPlacement == '1'"></div>
-                </template>
+                 <!-- <template v-else>
+                   <div class="el-form-item__label" v-if="model.labelPlacement == '1'"></div>
+                </template> -->
 
                 <slot name="PreLabel">
                     <div v-if="model.preLabel1" class="preLabel" :style="model.isList ? 'white-space: nowrap' : ''">

package/src/components/web/Tree/Tree.vue

@@ -180,7 +180,6 @@ function SearchTree(m) {
 //节点击点事件
 function handleNodeClick(data, formType) {
   closeMenu();
-
   if (data && formType) {
     refTree.value.setCurrentKey(data.code)
   }
@@ -198,6 +197,7 @@ function handleNodeClick(data, formType) {
       if (rowdata) {
         newdata.rowRouter = rowdata
       }
+      newdata.title = model.value.source?.content?.title || '';
       emit('loaded', newdata);
     });
   }

package/src/components/web/TreeList.vue

@@ -105,7 +105,7 @@ function loaded(data) {
 
         });
     }
-    emit('loaded');
+    emit('loaded',data);
 }
 function setsearchtreeHeight() {
     if (refleft.value) {

package/src/main.js

@@ -21,7 +21,7 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl: "http://10.88.22.13:7070/onecard-api/",
+    baseUrl: "http://10.88.22.66/IBS.Mvc/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/",
@@ -65,7 +65,7 @@ app.use(centaline, {
         //获取请求头
         getRequestHeaders: function () {
             return {
-              authobject: '{token:"wufw-1988759777316159488",platform:"WEB"}',
+              authobject: '{EmpID:"Token_2db5b0a6-7156-462c-bf29-53731a255b32",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_2db5b0a6-7156-462c-bf29-53731a255b32",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/views/SearchList.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'PersonHoliday_GuangzhouList/getLayoutOfSearch'"
-      :searchDataApi="'PersonHoliday_GuangzhouList/getListOfSearchModel'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'AdvancedSearch/GetLayoutOfSearchForPropertyPublish'"
+      :searchDataApi="'AdvancedSearch/GetListOfSearchModelForPropertyPublish'"></ct-searchlist>
 
        <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
       :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist> -->