centaline-data-driven-v3 0.1.27 → 0.1.29

package/package.json

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

package/src/components/app/File.vue

@@ -2,7 +2,8 @@
     <div class="ct-fielduploader" ref="refupload" v-if="model !== null">
         <div class="van-uploader">
             <div class="van-uploader__wrapper">
-                <draggable :list="model.fileList" v-bind="dragOptions" @change="onEnd" class="card" style="display: flex;">
+                <draggable :list="model.fileList" v-bind="dragOptions" @change="onEnd" :delay="100"
+                    :touch-start-threshold="5" class="card" style="display: flex;">
                     <template #item="{ element, index }">
                         <div class="van-uploader__preview">
                             <template v-if="!element.progressFlag">
@@ -11,7 +12,8 @@
                                         class="van-image__img" style="object-fit: cover;">
                                     <div class="van-uploader__preview-cover"
                                         v-if="(model.locked && element.mediaLabelName) || model.paramName1">
-                                        <div class="preview-cover van-ellipsis" @click.stop="classifyClickHandle(element)">
+                                        <div class="preview-cover van-ellipsis"
+                                            @click.stop="classifyClickHandle(element)">
                                             {{ element.mediaLabelName }}</div>
                                     </div>
                                 </div>
@@ -27,7 +29,8 @@
                                 </div>
                                 <span class="cover-list-item-play" v-if="element.videoPlayIconUrl">
                                     <div class="swiper-i">
-                                        <img @click="viewerfile(element)" :src="element.videoPlayIconUrl" class="hous-icon" />
+                                        <img @click="viewerfile(element)" :src="element.videoPlayIconUrl"
+                                            class="hous-icon" />
                                     </div>
                                 </span>
                                 <span class="cover-list-item-play"
@@ -146,9 +149,9 @@ function uploadProcess(file) {
 function handleRemove(file) {
     showConfirmDialog({
         title: "提示",
-        confirmButtonText: common.LocalizedString("确定","確認"),
+        confirmButtonText: common.LocalizedString("确定", "確認"),
         cancelButtonText: "取消",
-        message: common.LocalizedString("确定删除该附件？","確定刪除該附件？"),
+        message: common.LocalizedString("确定删除该附件？", "確定刪除該附件？"),
     })
         .then(() => {
             File.deleteFile(file, false, model.value);
@@ -274,7 +277,7 @@ function viewerfile(file) {
 }
 
 function onEnd(ev) {
-    File.changeFile(model.value,model.value.fileList[ev.moved.oldIndex], model.value.fileList[ev.moved.newIndex])
+    File.changeFile(model.value, model.value.fileList[ev.moved.oldIndex], model.value.fileList[ev.moved.newIndex])
 }
 defineExpose({
     model
@@ -294,8 +297,9 @@ defineExpose({
     color: #fff;
     font-size: 12px;
     text-align: center;
-    background: rgba(0, 0, 0, 0.3);
+    background: #000000;
     height: 24px;
+    opacity: 0.5;
 }
 
 .ct-fielduploader .van-uploader__preview-image {

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

@@ -32,6 +32,7 @@ const props = defineProps({
 })
 const detailSearchlist=ref()
 
+
 function submit(modelForm, responseData) {
     emit('submit', modelForm, responseData);
 }

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

@@ -780,6 +780,13 @@ function rolRouterClickHandler(field, rowData, rowindex, visible, columnName, co
         model.value.flagSideBar = true;
         model.value.isPageInSideBar = true;
         model.value.sideBarWidth = field.pageWidth;
+        var clientX = event.clientX;
+        setTimeout(() => {
+            if (window.innerWidth - 40 - field.pageWidth < clientX) {
+                refTableParent.value.scrollLeft = refTableParent.value.scrollLeft + (clientX - (window.innerWidth - 40 - field.pageWidth)) + 100;
+            }
+        }, 100);
+
         emit("loaded");
         return;
     }

package/src/components/web/SearchList.vue

@@ -32,7 +32,7 @@
                 @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
                 @closeSideHandler="closeSideHandler" @submit="submitHandler"></SearchSideRight>
             <SearchSideMenu ref="refSideMenu" :sideBarMenuRight="sideBarMenuRight" :sideBarStatus="sideBarStatus"
-                @sideMenuClickHandler="sideMenuClickHandler" :key="reloadKey"></SearchSideMenu>
+                @sideMenuClickHandler="sideMenuClickHandler"></SearchSideMenu>
         </div>
     </div>
 </template>

package/src/components/web/TextBox.vue

@@ -6,7 +6,7 @@
                     @change="change()" :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
                     :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
                     :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()"
-                    class="fieldControl">
+                    @keydown.enter.native="handleKeyDown" class="fieldControl">
                     <template #suffix>
                         <span v-if="model.unitName1">{{ model.unitName1 }}</span>
                     </template>
@@ -17,7 +17,8 @@
                 @change="change()" :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
                 :show-password="model.inputType == 'password'" autocomplete="on"
                 :maxlength="model.controlType !== Enum.ControlType.NumericTextBox ? model.maxValue1 : ''"
-                :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()" class="fieldControl">
+                :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()"
+                @keydown.enter.native="handleKeyDown" class="fieldControl">
                 <template #suffix>
                     <span v-if="model.unitName1">{{ model.unitName1 }}</span>
                 </template>
@@ -34,6 +35,8 @@
     </ct-field>
 </template>
 <script lang="ts" setup>
+import { ref } from 'vue'
+
 import { initData, changeHandler } from '../../utils/mixins';
 import TextBox from '../../loader/src/TextBox';
 import Enum from '../../utils/Enum'
@@ -47,6 +50,7 @@ const props = defineProps({
         default: ''
     },
 })
+const isEnterPressed = ref(false);
 const model = initData(props, TextBox)
 model.value.selfValidExcute = () => {
     model.value.valid = true;
@@ -64,6 +68,12 @@ function search() {
     if (model.value.autoSearch || props.from == 'tree') {
         emit('search');
     }
+    setTimeout(() => {
+        isEnterPressed.value = false;
+    }, 100);
+}
+function handleKeyDown(event) {
+    isEnterPressed.value = true;
 }
 function input() {
     if (model.value.controlType === Enum.ControlType.MultiLineText || model.value.controlType === Enum.ControlType.TextBox) {
@@ -74,6 +84,9 @@ function input() {
 }
 function change() {
     changeHandler(model.value, emit);
+    if (isEnterPressed.value) {
+        return;
+    }
     if (props.from == 'tree') { emit('search'); }
 }
 //弹出选择列表

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

@@ -1,5 +1,6 @@
 <template>
-  <div id="ct-tree" class="ct-tree" oncontextmenu="event.preventDefault()" style="overflow:auto;" v-loading="loading" :style="{ height: props.treeHeight-10 + 'px' }">
+  <div id="ct-tree" class="ct-tree" oncontextmenu="event.preventDefault()" style="overflow:auto;" v-loading="loading"
+    :style="{ height: props.treeHeight - 10 + 'px' }">
     <el-tree class="tree-line" :props="defaultProps" :load="loadNode" :expand-on-click-node="false"
       @node-click="handleNodeClick" lazy ref="refTree" @node-contextmenu="rightClick" node-key="code"
       current-node-key="currentNodeKey">
@@ -50,10 +51,10 @@ const props = defineProps({
     Number,
     default: 500,
   },
-}) 
+})
 const refTree = ref()
-const rootNode  = ref();
-const rootResolve  = ref();
+const rootNode = ref();
+const rootResolve = ref();
 const LastClickNode = ref(null)
 const defaultProps = ref({
   label: 'name',
@@ -65,13 +66,13 @@ const defaultProps = ref({
 const searchStatus = ref([])
 
 const menuVisible = ref(false)//右键菜单显示控制
-const currentData = ref({code:""})// 当前节点所对应的数据
+const currentData = ref({ code: "" })// 当前节点所对应的数据
 const currentNode = ref(null)//当前节点对应的 Node
 const loading = ref(false)//数据理否查询完成
 
-const model = ref(null) 
+const model = ref(null)
 const nodeRef = ref()
-
+const retryCount = ref(0);
 const treeNodeRefMap = ref({});
 /** 动态设置Input Ref */
 const handleSetInputMap = (el: refItem, item) => {
@@ -80,8 +81,8 @@ const handleSetInputMap = (el: refItem, item) => {
   }
 };
 
-const qrtimer=ref(null)
-onBeforeUnmount(()=>{
+const qrtimer = ref(null)
+onBeforeUnmount(() => {
   if (qrtimer.value) {
     clearTimeout(qrtimer.value);
     qrtimer.value = null;
@@ -91,24 +92,32 @@ onBeforeUnmount(()=>{
 //搜索（查询条件调用）
 function search(m) {
   if (searchStatus.value.length == 0) {
-    if(qrtimer.value)clearTimeout(qrtimer.value);
+    // 重置计数器
+    retryCount.value = 0
+    if (qrtimer.value) clearTimeout(qrtimer.value);
     searchStatus.value.push('a');
     rootNode.value.childNodes = []
-    loadNode(rootNode.value, rootResolve.value,m) 
+    loadNode(rootNode.value, rootResolve.value, m)
   }
   else {
+    if (retryCount.value >= 50) {
+      console.warn(`搜索繁忙，请稍后再试`); 
+      return;
+    }
+    retryCount.value++
+
     qrtimer.value = setTimeout(() => {
       search(m);
     }, 200);
   }
 }
 //加载节点（点击节点加号时调用）
-function loadNode(node, resolve,m) {
+function loadNode(node, resolve, m) {
   if (node.level === 0) {
     loading.value = true;
     rootNode.value = node
     rootResolve.value = resolve;
-    return SearchTree(m||undefined).then(data => {
+    return SearchTree(m || undefined).then(data => {
       loading.value = false;
       resolve(data.rows);
       load(data, true)
@@ -131,7 +140,7 @@ async function load(data, firstLoad) {
   model.value = data;
   if (searchStatus.value.length > 0) {
     searchStatus.value = searchStatus.value.slice(1)
-  } 
+  }
   loading.value = false;
   menuVisible.value = false;
   if (firstLoad) {
@@ -150,7 +159,7 @@ function SearchTree(m) {
 
   return new Promise((resolve, reject) => {
     if (typeof props.api !== 'undefined') {
-     
+
       resolve(Tree.loadSearchTreeApi(props.api, m));
     }
   });
@@ -183,7 +192,7 @@ function handleNodeClick(data, formType) {
 //右键菜单
 function rightClick(event, object, Node) { // event、object该节点所对应的对象、节点对应的 Node、节点组件本身
   nodeRef.value = treeNodeRefMap.value[`node_Ref_${object.code}`]
- 
+
   currentData.value = object
   currentNode.value = Node
   let actionIndex = 0;
@@ -201,7 +210,7 @@ function rightClick(event, object, Node) { // event、object该节点所对应
 function closeMenu() {
   menuVisible.value = false;
   nodeRef.value = null
-  currentData.value = { ...currentData.value,code:"" }
+  currentData.value = { ...currentData.value, code: "" }
   document.removeEventListener('click', closeMenu)
 }
 // 菜单路由
@@ -440,10 +449,10 @@ defineExpose({
   background-size: 10px;
 }
 
-.box-menu { 
+.box-menu {
   z-index: 1000;
   background-color: #fff;
-   padding: 10px;
+  padding: 10px;
 
   div {
     cursor: pointer;
@@ -459,4 +468,3 @@ defineExpose({
   color: var(--btnHoverRed);
 }
 </style>
-

package/src/components/web/Tree.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <div ref="refscreenDiv" id="refscreenDiv">
-            <ct-searchscreen ref="reftreescreen" :from="'tree'" :api="searchConditionApi" :screenPara="screenPara"
+            <ct-searchscreen ref="reftreescreen" :from="'tree'" style="padding-left: 11px;" :api="searchConditionApi" :screenPara="screenPara"
                 @search="search" @loaded="screenload" ></ct-searchscreen>
         </div>
         <tree v-if="loadTree" ref="reftree" :api="searchDataApi"  @loaded="loaded" :treeHeight="treeHeight">

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: "https://kq-api-gz.centaline.com.cn/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/",
@@ -30,7 +30,7 @@ app.use(centaline, {
     //baseUrl: "http://10.1.245.111:38028/",
 
     flagRouterSelf: true,
-    flagApp: false,//是否app端
+    flagApp: true,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: true,
@@ -65,7 +65,7 @@ app.use(centaline, {
         //获取请求头
         getRequestHeaders: function () {
             return {
-              authobject: '{token:"jiangzf-1980566715226116096",platform:"WEB"}',
+              authobject: '{token:"jiangzf-1983422832318779392",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/Form.vue

@@ -1,14 +1,12 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
-   <ct-form :api="'/EmployeeAttendanceBillApply/getLayoutOfNew'" :apiParam="apiParam"></ct-form>
+   <ct-form :api="'/EmployeeMaternity/readDetail'" :apiParam="apiParam"></ct-form>
     <!-- <ct-textbox :source="source"></ct-textbox> -->
-
+<ct-dialoglist ref="dialogList"></ct-dialoglist>
  </div>  
 </template>
 <script lang="ts" setup>
  const apiParam={
-    "actionType": 2,
-    "empID": "{90A76197-49CC-4D81-A08E-048557757B57}"
+    "actionType": 2
 }
- const source={"controlType":2,"showLabel":true,"controlLabel":"制度标识","groupExpand":false,"singleLine":false,"rows":1,"required":true,"spanCols":1,"locked":false,"autoFill":false,"searchDataType":1,"searchOperation":1,"displayLabelAfterSelected":true,"autoSearch":false,"mediaViewPageType":1,"fieldName1":"WorkSystemID","code1":"CD","name1":"","decimals1":-1,"maxValue1":"50","preLabel1":"","sufLabel1":"","fieldName2":"","code2":"","name2":"","decimals2":-1,"decimals3":0,"decimals4":-1,"width":200,"applyNew":1,"applyEdit":1,"applyBrowse":1}
 </script>

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="'http://10.88.22.13:7070/onecard-api/EmployeeWorkLogList/ind/getLayoutOfSearch'"
-      :searchDataApi="'http://10.88.22.13:7070/onecard-api/EmployeeWorkLogList/ind/getListOfSearchModel'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'https://kq-api-gz.centaline.com.cn/onecard-api/EmployeeWorkLogList/ind/getLayoutOfSearch'"
+      :searchDataApi="'https://kq-api-gz.centaline.com.cn/onecard-api/EmployeeWorkLogList/ind/getListOfSearchModel'"></ct-searchlist>
 
        <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
       :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist> -->