centaline-data-driven-v3 0.1.34 → 0.1.36

package/package.json

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

package/src/assets/commonWeb.css

@@ -889,10 +889,6 @@ body {
 .el-select__wrapper .el-select__selection {
   flex-wrap: nowrap !important;
 }
-.el-select__wrapper .el-select__selection .tagMultiple{
-  display: flex;
-  margin-right: 20px;
-}
 
 .el-select__input-wrapper {
   height: 22px;
@@ -1090,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>
@@ -19,14 +19,12 @@
                     <span>{{ model.prefix }}</span>
                 </template>
                 <template #tag>
-                    <div class="tagMultiple">
-                        <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.name }}</el-tag>
-
-                        </template>
-                    </div>
+                    <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>
                 </template>
             </el-select-v2>
             <template v-if="model.flagaFterText">
@@ -276,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

@@ -1,7 +1,7 @@
 <template>
     <div class="ct-field">
         <div class="el-form-item el-form-item--small"
-            :class="[!model.valid ? 'is-error' : '', 'label-' + model.labelPlacement]">
+            :class="[!model.valid ? 'is-error' : '',model.isList?'': 'label-' + model.labelPlacement]">
 
             <!-- 使用单一元素结构 -->
             <template v-if="model.isList">
@@ -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' : ''">
@@ -94,7 +94,9 @@ const model = props.vmodel
     flex-direction: column;
 
     .el-form-item__label {
+        width: 100% !important;
         justify-content: flex-start;
+        text-align: left;
     }
 }
 </style>

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

@@ -65,7 +65,7 @@ const searchtreeHeight = ref(0)
 const refleft = ref()
 const reftree = ref()
 
-const asideWidth = ref(Number(props.leftWidth ? props.leftWidth : 200));
+const asideWidth = ref(Number(props.leftWidth ? props.leftWidth : 300));
 
 let isResizing = false;
 let startX = 0;
@@ -105,7 +105,7 @@ function loaded(data) {
 
         });
     }
-    emit('loaded');
+    emit('loaded',data);
 }
 function setsearchtreeHeight() {
     if (refleft.value) {

package/src/main.js

@@ -65,7 +65,7 @@ app.use(centaline, {
         //获取请求头
         getRequestHeaders: function () {
             return {
-              authobject: '{EmpID:"Token_0e4bedbe-95f9-449f-940b-ce0226207b2b",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_0e4bedbe-95f9-449f-940b-ce0226207b2b",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"}',