centaline-data-driven-v3 0.1.32 → 0.1.34

package/package.json

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

package/src/assets/commonWeb.css

@@ -888,6 +888,9 @@ body {
 
 .el-select__wrapper .el-select__selection {
   flex-wrap: nowrap !important;
+}
+.el-select__wrapper .el-select__selection .tagMultiple{
+  display: flex;
   margin-right: 20px;
 }
 

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" :formatter="formatLabel">
                 <template #default="{ item }">
                     <el-tooltip :disabled="!item.toolTip" :content="item.toolTip" placement="right">
                         <span v-html="item.displayName || item.name"></span>
@@ -19,11 +19,14 @@
                     <span>{{ model.prefix }}</span>
                 </template>
                 <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"
-                            @close="closeTag(v.code)">
-                            {{ v.name }}</el-tag>
-                    </template>
+                    <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>
             </el-select-v2>
             <template v-if="model.flagaFterText">
@@ -113,7 +116,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) {
@@ -274,8 +277,8 @@ function closeTag(val) {
     change(model.value.value)
 }
 const formatLabel = (option) => {
-  console.log('进入 formatter', option); // 测试是否触发
-  return option.name || option.label;
+    console.log('进入 formatter', option); // 测试是否触发
+    return option.name || option.label;
 };
 defineExpose({
     model

package/src/components/web/Label.vue

@@ -1,6 +1,6 @@
 <template>
     <ct-field :vmodel="model">
-        <template #Control v-if="model.code1">
+        <template #Control>
             <template v-if="model.controlType == Enum.ControlType.HtmlLabel">
                 <span class="ct-html" :class="{ 'cursor-pointer': model.onChanged }" @click="clickHandle"
                     v-html="HtmlReplace(model.value)"></span>

package/src/loader/src/Label.js

@@ -1,7 +1,7 @@
 import Enum from '../../utils/Enum';
 import base from '../index';
 function getFileNameVal(source) {
-   
+
     let lst = [];
     for (var i = 1; i <= 5; i++) {
         let fieldVal = "";
@@ -23,28 +23,34 @@ const Label = function (source) {
     let rtn = {
         flagJson: false,
         get value() {
-            if (source.code1) {
-                try {
-                    let _value = []
-                    var obj = JSON.parse(source.code1)
-                    if (typeof obj == 'object' && obj) {
-                        obj.forEach((v) => {
-                            if (!v.flagDeleted) {
-                                _value.push(v.name);
-                            }
-                        });
-                        rtn.flagJson = true;
-                        return _value;
-                    }
+            if (source.name1) {
+                 return source.name1;
+            }
+            else {
+                if (source.code1) {
+                    try {
+                        let _value = []
+                        var obj = JSON.parse(source.code1)
+                        if (typeof obj == 'object' && obj) {
+                            obj.forEach((v) => {
+                                if (!v.flagDeleted) {
+                                    _value.push(v.name);
+                                }
+                            });
+                            rtn.flagJson = true;
+                            return _value;
+                        }
 
-                } catch (e) {
+                    } catch (e) {
 
+                    }
                 }
+                let _value = [];
+                var joinChar = source.joinChar == undefined ? '' : source.joinChar;
+                _value = getFileNameVal(source);
+                return _value.join(joinChar);
             }
-            let _value = [];
-            var joinChar = source.joinChar == undefined ? '' : source.joinChar;
-            _value = getFileNameVal(source);
-            return _value.join(joinChar);
+
         }
     };
     rtn = base.copy(source, rtn);

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-1988477363054436352",platform:"WEB"}',
+              authobject: '{EmpID:"Token_0e4bedbe-95f9-449f-940b-ce0226207b2b",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_0e4bedbe-95f9-449f-940b-ce0226207b2b",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="'RoleList/getLayoutOfSearch'"
-      :searchDataApi="'RoleList/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> -->