centaline-data-driven-v3 0.1.50 → 0.1.52

package/package.json

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

package/src/assets/commonWeb.css

@@ -891,11 +891,11 @@ body {
   line-height: 22px;
 }
 
-.el-select__wrapper {
+.serach-screen .el-select__wrapper {
   height: 28px;
 }
 
-.el-select__wrapper .el-select__selection {
+.serach-screen .el-select__wrapper .el-select__selection {
   flex-wrap: nowrap !important;
 }
 

package/src/components/web/TextBox.vue

@@ -1,7 +1,10 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control>
-            <div v-if="model.controlType === Enum.ControlType.MultiLineText" style="width: 100%;">
+            <template v-if="model.controlType == Enum.ControlType.MultiLineLabel && isEmpty(model.rows)">
+                <span class="ct-html" v-html="nl2br(model.code1)"></span>
+            </template>
+            <div v-else-if="model.controlType === Enum.ControlType.MultiLineText" style="width: 100%;">
                 <el-input :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()"
                     @change="change()" :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
                     :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
@@ -15,7 +18,8 @@
             </div>
             <el-input v-else :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()"
                 @change="change()" :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
-                :show-password="model.inputType == 'password'" :autocomplete="model.inputType == 'password'? 'new-password' : 'on'"
+                :show-password="model.inputType == 'password'"
+                :autocomplete="model.inputType == 'password' ? 'new-password' : 'on'"
                 :maxlength="model.controlType !== Enum.ControlType.NumericTextBox ? model.maxValue1 : ''"
                 :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()"
                 @keydown.enter.native="handleKeyDown" class="fieldControl">
@@ -95,6 +99,13 @@ function popupSearchListHandle() {
     let isSingle = model.value.moreActionRouter.isSingle
     emit('popupSearchList', isSingle, model, model.value.moreActionRouter);
 }
+function isEmpty(value) {
+    return value === undefined || value === null || value === '';
+}
+function nl2br(str) {
+    if (!str) return '';
+    return str.replace(/\r?\n/g, '<br>')
+}
 defineExpose({
     model
 })

package/src/components/web/dialog.vue

@@ -1,5 +1,8 @@
 <template>
-    <render />
+    <teleport to="body" v-if="vmodel.appendToBody">
+        <render />
+    </teleport>
+    <render v-else />
 </template>
 <script setup>
 import { h, ref, onActivated, resolveComponent, onBeforeUnmount } from 'vue'
@@ -12,9 +15,9 @@ const contentTop = ref(0)
 const content = ref()
 const captionBarButtons = ref([])
 const modelSelf = ref(null)
-const submitCancelData= ref(null)
-onBeforeUnmount(()=>{
-  modelSelf.value=null
+const submitCancelData = ref(null)
+onBeforeUnmount(() => {
+    modelSelf.value = null
 })
 onActivated(() => {
     if (contentTop.value && content) {
@@ -33,7 +36,7 @@ function scrollHandle(ev) {
     ev.stopPropagation();
 }
 
-const render = () => { 
+const render = () => {
     return h('div', {}, [
         h('div', {
             style: {
@@ -49,7 +52,7 @@ const render = () => {
                     'ct-dialog_wrapper'
                 ],
                 style: {
-                    'z-index': props.zindex,
+                    'z-index': props.vmodel.appendToBody ? props.zindex + 1000 : props.zindex,
                     'height': '100%',
                     'width': '100%',
                 }
@@ -184,11 +187,11 @@ const render = () => {
                                                             item.height = (props.vmodel.pane.clientHeight - 60) + 'px';
                                                         }
                                                         if (item.component == 'ct-form') {
-                                                            if(props.vmodel.pane.clientHeight>window.innerHeight){
+                                                            if (props.vmodel.pane.clientHeight > window.innerHeight) {
                                                                 item.documentHeight = (window.innerHeight) + 'px';
                                                             }
-                                                            else{
-                                                                 item.documentHeight = (props.vmodel.pane.clientHeight - 60) + 'px';
+                                                            else {
+                                                                item.documentHeight = (props.vmodel.pane.clientHeight - 60) + 'px';
                                                             }
                                                         }
                                                     }

package/src/loader/src/ComboBox.js

@@ -106,7 +106,7 @@ const ComboBox = function (source) {
                 }
 
                 this.labelValue = currentOptions.filter((v) => {
-                    return !v.flagDeleted;
+                    return v.flagDeleted !== true && v.flagDeleted !== 1;
                 });
             }
             else {
@@ -180,7 +180,7 @@ const ComboBox = function (source) {
                     }
                 });
             }
-            else{
+            else {
                 request.postHandler(common.globalUri(), params).then((response) => {
                     if (response.rtnCode === 200) {
                         if (CallBack) {

package/src/main.js

@@ -22,7 +22,7 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 
 app.use(centaline, {
     //baseUrl: "http://10.88.22.13:7080/ibs-api/",
-    baseUrl:"http://10.88.22.69:7080/co-sales-api/",
+    baseUrl:"http://10.88.22.66:7080/ibs-api/",
     //baseUrl: "https://kq-api.centaline.com.cn/onecard-api/",
     //baseUrl: "http://10.88.22.13:6060/onecard-api/",
     //baseUrl: "http://10.88.22.66/IBS.Mvc/api/",
@@ -67,7 +67,7 @@ app.use(centaline, {
             return {
                 
              //AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyaWQiOiIyNTEyMTUxNzQyMTg5QzI4MTgwRDkxRTk0MDhEOTA0QSIsImxvZ2luX3VzZXJfa2V5IjoiN2MzYzNjNjAtNWVjMy00MzdkLWExMDYtOWYxZTMwYjU0Mjg2In0.daG9mS98Gg8KmHSUjYHktMcO2Jk7SVtCcqm2sRB0I8Y2N0TuonIrVUDcHdNdDiuD3v6qO_f010tQWlBsAQ1dqg',
-              authobject: '{token:"TY002-2031915589290885120",platform:"WEB"}',
+              authobject: '{token:"T5067-2038438946182201344",platform:"WEB"}',
               //authobject: '{EmpID:"Token_946d56e1-7972-4382-9d10-4a72496aab39",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_946d56e1-7972-4382-9d10-4a72496aab39",Platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',

package/src/views/SearchList.vue

@@ -4,9 +4,9 @@
       
     :searchDataApi="'/ccesmanage/AppUseSummaryList/getList'"></ct-searchlist> -->
 
-      <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/AttendanceBalanceSettingList/getLayoutOfSearch'"
+      <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/PropertyComprehensiveQueryList/getLayoutOfSearch'"
       
-    :searchDataApi="'/AttendanceBalanceSettingList/getListOfSearchModel'"></ct-searchlist>
+    :searchDataApi="'/PropertyComprehensiveQueryList/getListOfSearchModel'"></ct-searchlist>
        <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
       :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist> -->