centaline-data-driven-v3 0.1.18 → 0.1.20

package/package.json

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

package/src/components/Layout/Layout.vue

@@ -1,5 +1,6 @@
 <template>
-    <div class="ct-Layout" v-if="Layout !== null && !loading" @click="rowClickHandle" :style="{ 'background-color': selectIndex === rowindex?selectedRowBackColor:'' }">
+    <div class="ct-Layout" v-if="Layout !== null && !loading" @click="rowClickHandle"
+        :style="{ 'background-color': selectIndex === rowindex ? selectedRowBackColor : '' }">
         <ct-layoutchildren :rowindex="rowindex" :actionRouter="actionRouter" :rowdata="vmodel" :vmodel="LayoutList"
             :flagflex="true" :fields="fields" :parameterAction="parameterAction"
             :rowMenuDisplayCountForAPP="rowMenuDisplayCountForAPP" @click="clickHandler"
@@ -9,7 +10,7 @@
 <script setup lang="ts">
 import { ref, nextTick } from 'vue'
 import common from '../../utils/common'
-const emit = defineEmits(['rolRouterclick', 'changeHandler','rowclick'])
+const emit = defineEmits(['rolRouterclick', 'changeHandler', 'rowclick'])
 const props = defineProps({
     action: String,
     cellLayout: String,
@@ -20,8 +21,8 @@ const props = defineProps({
     apiParam: Object,
     parameterAction: String,
     fields: Array,
-    selectIndex:Number,
-    selectedRowBackColor:String,
+    selectIndex: Number,
+    selectedRowBackColor: String,
     formListactionRouter: {
         type: Array,
         default: [],
@@ -61,16 +62,14 @@ function load(data, cellLayout) {
         return;
     }
     if (cellLayout.indexOf("for=") != -1) {
-
         var cellxmlDOM = loadXML(cellLayout);
-        var listxml = getxmlForStr(cellxmlDOM);
-
-        if (typeof listxml !== "undefined") {
-            for (var j = 0; j < listxml.attributes.length; j++) {
-                var attribute = listxml.attributes.item(j);
+        const nodesWithFor = cellxmlDOM.querySelectorAll('[for]');
+        nodesWithFor.forEach((v) => {
+             for (var j = 0; j < v.attributes.length; j++) {
+                var attribute = v.attributes.item(j);
                 if (attribute.nodeName.toLowerCase() == "for".toLowerCase()) {
                     var liststr = "";
-                    var celllist = xmlToString(listxml);
+                    var celllist = xmlToString(v);
 
                     var celllistNew = loadXML(celllist);
                     var newAtt = celllistNew.createAttribute("forrowindex");
@@ -97,7 +96,7 @@ function load(data, cellLayout) {
                     cellLayout = cellLayout.replace(celllist, liststr);
                 }
             }
-        }
+        });
     }
     if (typeof data !== "undefined") {
         str = cellLayout.replace(/\{\{(.+?)\}\}/g, (...args) => {
@@ -303,7 +302,7 @@ function clickHandler(routerKey, rowindex, forname, forrowindex, flagHaveAlert)
             emit("rolRouterclick", routerKey, rowindex, props.vmodel.$sourceIndex);
         }
         else {
-            emit("rolRouterclick", routerKey, rowindex, forname, forrowindex, flagHaveAlert,props.vmodel,props.actionRouter);
+            emit("rolRouterclick", routerKey, rowindex, forname, forrowindex, flagHaveAlert, props.vmodel, props.actionRouter);
         }
     }
 }
@@ -315,7 +314,7 @@ function changeHandler(field) {
         emit("changeHandler", field, props.vmodel.$sourceIndex);
     }
 }
-function rowClickHandle(){
+function rowClickHandle() {
     emit("rowclick", props.rowindex);
 }
 </script>

package/src/components/app/CheckBox.vue

@@ -1,10 +1,10 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control>
-                <van-checkbox v-if="model.controlType == Enum.ControlType.CheckBox" :disabled="model.locked"
-                    v-model="model.value" shape="square" @change="change">{{ model.sufLabel1 }}</van-checkbox>
-                <van-switch v-if="model.controlType == Enum.ControlType.Switch" :disabled="model.locked"
-                    v-model="model.value" @change="change">{{ model.sufLabel1 }}</van-switch>
+            <van-checkbox v-if="model.controlType == Enum.ControlType.CheckBox" :disabled="model.locked"
+                v-model="model.value" shape="square" @change="change">{{ model.sufLabel1 }}</van-checkbox>
+            <van-switch v-if="model.controlType == Enum.ControlType.Switch" :disabled="model.locked"
+                v-model="model.value" @change="change">{{ model.sufLabel1 }}</van-switch>
         </template>
     </ct-field>
 </template>
@@ -19,6 +19,9 @@ const props = defineProps({
     source: Object,
 })
 const model = initData(props, CheckBox)
+if (!model.value.isList && model.value.code1 == '') {
+    model.value.code1 = '0';
+}
 function change() {
     changeHandler(model.value, emit);
     if (model.value.autoSearch) emit('search');

package/src/components/web/Button.vue

@@ -112,7 +112,7 @@ import Button from '../../loader/src/Button';
 import Enum from '../../utils/Enum'
 import common from '../../utils/common'
 import { ElMessage, UploadFile } from 'element-plus'
-const emit = defineEmits(['input', 'fieldClick', 'importComplete', 'SearchWhereManage', 'SaveSearchWhere','clichSearchWhere'])
+const emit = defineEmits(['input', 'fieldClick', 'importComplete', 'SearchWhereManage', 'SaveSearchWhere','clickSearchWhere'])
 const props = defineProps({
     parameterAction: String,
     fileData: Object,
@@ -276,7 +276,7 @@ function SaveSearchWhere(field) {
 }
 function clickDropdownItem(col) {
     refsearchwhere.value.handleClose();
-    emit('clichSearchWhere', col);
+    emit('clickSearchWhere', col);
 }
 function generateUUID() {
     return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>

package/src/components/web/CheckBox.vue

@@ -3,8 +3,8 @@
         <template #Control>
             <el-checkbox v-if="model.controlType == Enum.ControlType.CheckBox" v-model="model.value"
                 :disabled="model.locked" :tabindex="model.code1" @change="change">{{ model.sufLabel1 }}</el-checkbox>
-            <el-switch v-if="model.controlType == Enum.ControlType.Switch" v-model="model.value" :tabindex="model.code1" :disabled="model.locked"
-                @change="change">
+            <el-switch v-if="model.controlType == Enum.ControlType.Switch" v-model="model.value" :tabindex="model.code1"
+                :disabled="model.locked" @change="change">
                 {{ model.sufLabel1 }}
             </el-switch>
         </template>
@@ -21,6 +21,9 @@ const props = defineProps({
     source: Object,
 })
 const model = initData(props, CheckBox)
+if (!model.value.isList && model.value.code1 == '') {
+    model.value.code1 = '0';
+}
 function change() {
     changeHandler(model.value, emit);
     if (model.value.autoSearch) emit('search');

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

@@ -2,8 +2,8 @@
     <div :class="isOperationalColumn ? 'subdiv_allinline' : ''" v-if="isShowLabel"
         @click="isOperationalColumn ? clickHandler($event) : null">
         <template v-if="eventTriggerType == Enum.EventTriggerType.Hover">
-            <el-popover @before-enter="onShow" :width="tooltipModel.width"
-                :fallback-placements="['bottom', 'top', 'right', 'left']">
+            <el-popover @before-enter="onShow" :width="tooltipModel.width"  placement="right"
+                :popper-options="popperOptions">
                 <template #default>
                     <div :style="'height: ' + tooltipModel.height + ''">
                         <component v-bind="tooltipModel.attrs" :is="tooltipModel.component"></component>
@@ -174,9 +174,27 @@ function voiceEndedHandler() {
 function onShow() {
     emit('mouseenter', props.router, props.rowData, props.rowindex, null, props.columnName, function (data) {
         if (data.height) {
-            data.height = (parseInt(data.height.replace('px', ''))+50)+'px';
+            data.height = (parseInt(data.height.replace('px', '')) + 50) + 'px';
         }
         tooltipModel.value = data
     });
 }
+// 自适应位置配置
+const popperOptions = {
+    modifiers: [
+        {
+            name: 'preventOverflow', // 防止溢出视口
+            options: {
+                padding: 10 // 距离视口边缘的留白
+            }
+        },
+        {
+            name: 'flip', // 当空间不足时翻转位置
+            options: {
+                fallbackPlacements: ['left', 'top', 'bottom'], // 备选位置
+                padding: 5
+            }
+        }
+    ]
+}
 </script>

package/src/components/web/SearchScreen.vue

@@ -232,7 +232,12 @@ function SearchWhereManage(v) {
     let field = model.value.actionRouters.find((b) => {
         return b.key === v.routerKey;
     });
-    RouterClickHandler(field, {}, null, model.value, 'form');
+    var submitData = {};
+    field.getSearchPara().fields.forEach((f) => {
+        submitData[common.initialsToLowerCase(f.fieldName1)] = f.searchValue1;
+    });
+    submitData["sourceFrom"] = "setting";
+    RouterClickHandler(field, submitData, null, model.value, 'form');
 }
 function saveShortcut() {
     emit('saveShortcut', model.value);

package/src/loader/src/Form.js

@@ -104,8 +104,6 @@ function loadFromModel(source, isFormList) {
           }
           if (rtn1.controlType === Enum.ControlType.SearchListBox
             || rtn1.controlType === Enum.ControlType.ComboBox
-            || rtn1.controlType === Enum.ControlType.MultiSelectWithSearch
-            || rtn1.controlType === Enum.ControlType.MultiSelectNoSearch
           ) {
             if (rtn1["options"].length == 0) {
               rtn1["options"] = [{ value: '', label: '' }];
@@ -124,6 +122,29 @@ function loadFromModel(source, isFormList) {
               this.form.$vue.loaded(this.form)
             }
           }
+          if (rtn1.controlType === Enum.ControlType.MultiSelectWithSearch
+            || rtn1.controlType === Enum.ControlType.MultiSelectNoSearch
+          ) {
+            var value = [];
+            var labelValue = [];
+            attrValue = attrValue === '' ? [] : [].concat(JSON.parse(attrValue))
+            rtn1["options"] = attrValue
+            if (attrKey == 'code1') {
+              attrValue.forEach((v) => {
+                if (v.flagDeleted !== 1) {
+                  if (v.flagDeleted != undefined && v.flagDeleted == true) {
+                  }
+                  else {
+                    value.push(v.code);
+                    labelValue.push(v)
+                  }
+                }
+              });
+              rtn1['value'] = value;
+              rtn1['labelValue'] = labelValue;
+            }
+            if (rtn1.itemKey) rtn1.itemKey = Math.random()
+          }
           if (rtn1.controlType === Enum.ControlType.File
             || rtn1.controlType === Enum.ControlType.SliceUpload) {
             if (attrKey.toLowerCase() == 'paramName1'.toLowerCase()) {

package/src/loader/src/SearchScreen.js

@@ -100,8 +100,6 @@ function loadSearchScreenModel(source, prevParam) {
           }
           if (rtn1.controlType === Enum.ControlType.SearchListBox
             || rtn1.controlType === Enum.ControlType.ComboBox
-            || rtn1.controlType === Enum.ControlType.MultiSelectWithSearch
-            || rtn1.controlType === Enum.ControlType.MultiSelectNoSearch
           ) {
             if (rtn1["options"].length == 0) {
               rtn1["options"] = [{ value: '', label: '' }];
@@ -115,6 +113,29 @@ function loadSearchScreenModel(source, prevParam) {
             }
             if (rtn1.itemKey) rtn1.itemKey = Math.random()
           }
+          if (rtn1.controlType === Enum.ControlType.MultiSelectWithSearch
+            || rtn1.controlType === Enum.ControlType.MultiSelectNoSearch
+          ) {
+            var value = [];
+            var labelValue = [];
+            attrValue = attrValue === '' ? [] : [].concat(JSON.parse(attrValue))
+            rtn1["options"] = attrValue
+            if (attrKey == 'code1') {
+              attrValue.forEach((v) => {
+                if (v.flagDeleted !== 1) {
+                  if (v.flagDeleted != undefined && v.flagDeleted == true) {
+                  }
+                  else {
+                    value.push(v.code);
+                    labelValue.push(v)
+                  }
+                }
+              });
+              rtn1['value'] = value;
+              rtn1['labelValue'] = labelValue;
+            }
+            if (rtn1.itemKey) rtn1.itemKey = Math.random()
+          }
           if (rtn1.is == 'ct-button') {
             if (common.flagApp() && this.form.$vue.loaded) {
               this.form.$vue.loaded(this.form)
@@ -431,6 +452,10 @@ function loadSearchScreenModel(source, prevParam) {
     set title(v) {
       source.title = v;
     },
+    //页面加载完后 执行的脚本
+    get onload() {
+      return source.onload;
+    },
     get flagSearch() {
       if (source.flagSearch === true) {
         return true

package/src/main.js

@@ -21,7 +21,7 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl: "https://kq-api.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/",
@@ -65,7 +65,7 @@ app.use(centaline, {
         //获取请求头
         getRequestHeaders: function () {
             return {
-              authobject: '{token:"1647-1967489899997401088",platform:"WEB"}',
+              authobject: '{token:"jiangzf-1968847679618506752",platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',
                 //authObject: '{token:"1-90f7df2c-fba7-4ea0-8874-aa7202034f06"}',

package/src/utils/common.js

@@ -878,7 +878,7 @@ const common = {
     var arr = str.split("&");
     for (var i = 0; i < arr.length; i++) {
       var res = arr[i].split("=");
-      obj[res[0]] = res[1];
+      obj[this.initialsToLowerCase(res[0])] = res[1];
     }
     return obj;
   },

package/src/utils/mixins.js

@@ -776,11 +776,12 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                             model.$vue.init();
                                         }
                                         else {
-                                            model.$vue.updateFields(ev);
+                                            if (model.$vue && model.$vue.updateFields) {
+                                                model.$vue.updateFields(ev);
+                                            }
                                         }
                                     }
                                     common.closeDialog(dialogOption);
-
                                 },
                                 isIframe: model.isIframe,
                             },

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="'/EmployeeAttendanceBillList/getLayoutOfSearchForMy'"
-      :searchDataApi="'/EmployeeAttendanceBillList/getListOfSearchModelForMy'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/ReportPersonAttendanceList/getLayoutOfSearch'"
+      :searchDataApi="'/ReportPersonAttendanceList/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 = {}
+const apiParam = {"rowGUID":"{7AE0A3FB-2D6C-4E51-8B10-71EAFA2D269A}","code":"KD01","name":"中原（中国）物业顾问有限公司","deptID":"{7AE0A3FB-2D6C-4E51-8B10-71EAFA2D269A}","path":"KD01","checkBillLeftHours":"1","rightEdit":"1"}
 
 </script>