centaline-data-driven-v3 0.1.39 → 0.1.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.1.39",
+  "version": "0.1.40",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",
@@ -25,6 +25,7 @@
     "vue-cropper": "^1.1.1",
     "vue-router": "^4.2.5",
     "vue-ueditor-wrap": "^3.0.8",
+    "vue3-cron-plus-picker": "^1.0.2",
     "vue3-json-viewer": "^2.4.1",
     "vue3-pdf-app": "^1.0.3",
     "vuedraggable": "^4.1.0"

package/src/assets/commonWeb.css

@@ -780,7 +780,10 @@ body {
   user-select: none;
   /* 禁止文本选择 */
 }
-
+.ct-form .btnPadBom .el-checkbox{
+  height: 100% !important;
+  padding: 0 !important;
+}
 
 
 /*elementPlus样式重置开始*/

package/src/components/web/Cron.vue

@@ -0,0 +1,194 @@
+<template>
+  <ct-field :vmodel="model"  v-if="model">
+    <template #Control>
+      <el-input v-model="model.code1" :placeholder="点击选择" @click="showCron = true" />
+      <el-dialog v-model="showCron" title="" width="700px" append-to-body>
+        <Vue3CronPlusPicker :expression="model.code1" class="cron-plus-picker" :teleported="true"
+          @fill="val => { model.code1 = val; showCron = false }" @hide="showCron = false" />
+      </el-dialog>
+    </template>
+  </ct-field>
+</template>
+
+<script setup>
+import { Vue3CronPlusPicker } from 'vue3-cron-plus-picker'
+import 'vue3-cron-plus-picker/style.css'
+import { nextTick, ref, onMounted } from "vue";
+const props = defineProps({
+  api: String,
+  vmodel: Object,
+  actionRouter: Array,
+  listHeight: Number,
+}) 
+const model = ref(null);
+
+const showCron = ref(false)
+
+init()
+//初始化数据
+function init() {
+  nextTick(function () {
+    if (props.vmodel) {
+      load(props.vmodel);
+    }
+  });
+}
+function load(data) {
+  model.value = data;
+}
+</script>
+<style scoped>
+.cron-plus-picker :deep(.el-input__wrapper) {
+  align-items: center;
+  background-color: var(--el-input-bg-color, var(--el-fill-color-blank));
+  background-image: none;
+  border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
+  box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
+  cursor: text;
+  display: inline-flex;
+  flex-grow: 1;
+  justify-content: center;
+  padding: 1px 11px;
+  transform: translateZ(0);
+  transition: var(--el-transition-box-shadow);
+}
+
+.cron-plus-picker :deep(.el-input--small) {
+  --el-input-inner-height: calc(var(--el-input-height, 24px) - 2px);
+}
+
+.cron-plus-picker :deep(.el-input--small),
+.cron-plus-picker :deep(.el-input) {
+  --el-input-height: var(--el-component-size-small);
+  font-size: 12px;
+}
+
+/* 使用更精确的选择器，避免全局覆盖 */
+.cron-plus-picker :deep(.el-input .el-input__wrapper) {
+  align-items: center;
+  background-color: var(--el-input-bg-color, var(--el-fill-color-blank));
+  background-image: none;
+  border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
+  box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
+  cursor: text;
+  display: inline-flex;
+  flex-grow: 1;
+  justify-content: center;
+  padding: 1px 11px;
+  transform: translateZ(0);
+  transition: var(--el-transition-box-shadow);
+}
+
+.cron-plus-picker :deep(.el-select__wrapper) {
+
+  min-height: 24px;
+  /* 使用 min-height 而不是 height */
+}
+
+.cron-plus-picker :deep(.el-radio.el-radio--small) {
+  height: 24px;
+}
+
+.cron-plus-picker :deep(.el-select) {
+  --el-select-border-color-hover: var(--el-border-color-hover);
+  --el-select-disabled-color: var(--el-disabled-text-color);
+  --el-select-disabled-border: var(--el-disabled-border-color);
+  --el-select-font-size: var(--el-font-size-base);
+  --el-select-close-hover-color: var(--el-text-color-secondary);
+  --el-select-input-color: var(--el-text-color-placeholder);
+  --el-select-multiple-input-color: var(--el-text-color-regular);
+  --el-select-input-focus-border-color: var(--el-color-primary);
+  --el-select-input-font-size: 14px;
+  --el-select-width: 100%;
+  display: inline-block;
+  position: relative;
+  vertical-align: middle;
+  width: var(--el-select-width);
+  z-index: 100;
+
+}
+
+/* 修改Cron组件的样式 - 区分焦点和非焦点状态 */
+.cron-plus-picker :deep(.el-form-item.is-error .el-input__wrapper),
+.cron-plus-picker :deep(.el-form-item.is-error .el-select__wrapper),
+.cron-plus-picker :deep(.el-form-item.is-error .el-textarea__inner) {
+  box-shadow: 0 0 0 1px var(--el-border-color) inset;
+  /* 非焦点状态 */
+}
+
+.cron-plus-picker :deep(.el-form-item.is-error .el-input__wrapper.is-focus),
+.cron-plus-picker :deep(.el-form-item.is-error .el-input__wrapper:focus),
+.cron-plus-picker :deep(.el-form-item.is-error .el-select__wrapper.is-focus),
+.cron-plus-picker :deep(.el-form-item.is-error .el-select__wrapper:focus),
+.cron-plus-picker :deep(.el-form-item.is-error .el-textarea__inner.is-focus),
+.cron-plus-picker :deep(.el-form-item.is-error .el-textarea__inner:focus) {
+  box-shadow: 0 0 0 1px var(--el-color-primary) inset !important;
+  /* 焦点状态 - 蓝色 */
+}
+
+/* hover状态保持原来的灰色 */
+.cron-plus-picker :deep(.el-form-item.is-error .el-input__wrapper:hover),
+.cron-plus-picker :deep(.el-form-item.is-error .el-select__wrapper:hover),
+.cron-plus-picker :deep(.el-form-item.is-error .el-textarea__inner:hover) {
+  box-shadow: 0 0 0 1px var(--el-text-color-secondary) inset;
+  /* hover时也保持灰色 */
+}
+
+.cron-plus-picker :deep(.el-radio) {
+  --el-radio-font-size: var(--el-font-size-base);
+  --el-radio-text-color: var(--el-text-color-regular);
+  --el-radio-font-weight: var(--el-font-weight-primary);
+  --el-radio-input-height: 12px;
+  --el-radio-input-width: 12px;
+  --el-radio-input-border-radius: var(--el-border-radius-circle);
+  --el-radio-input-bg-color: var(--el-fill-color-blank);
+  --el-radio-input-border: var(--el-border);
+  --el-radio-input-border-color: var(--el-border-color);
+  --el-radio-input-border-color-hover: var(--el-color-primary);
+  align-items: center;
+  color: var(--el-radio-text-color);
+  cursor: pointer;
+  display: inline-flex;
+  font-size: var(--el-font-size-base);
+  font-weight: var(--el-radio-font-weight);
+  height: 32px;
+  margin-right: 30px;
+  outline: none;
+  position: relative;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+  white-space: nowrap;
+}
+
+.cron-plus-picker :deep(.el-radio:last-child) {
+  margin-right: 0;
+}
+
+.cron-plus-picker :deep(.el-checkbox.el-checkbox--small .el-checkbox__inner),
+.cron-plus-picker :deep(.el-radio.el-radio--small .el-radio__inner) {
+  width: 12px;
+  height: 12px;
+}
+
+/* 1. 让内部 el-select 继续用 ElementPlus 的公共骨架，我们只覆盖 mini 尺寸变量 */
+.cron-plus-picker :deep(.el-radio--small) {
+  font-size: 12px;
+}
+
+.cron-plus-picker :deep(.el-radio--small .el-select__wrapper) {
+  height: 24px;
+  line-height: 24px;
+  padding: 0 7px 0 11px;
+  /* 左右各缩 4px，与官网 mini 保持一致 */
+}
+
+.cron-plus-picker :deep(.el-form-item--small) {
+  margin-bottom: 18px;
+}
+
+.cron-plus-picker :deep(.el-select__placeholder) {
+  pointer-events: none;
+}
+
+</style>

package/src/components/web/DatePicker.vue

@@ -22,11 +22,11 @@
                     </DateTimePicker>
                 </template>
                 <template v-else>
-                    <el-date-picker v-model="model.code1" :type="model.dateType" v-bind="model.attrs"
+                    <el-date-picker v-model="model.code1" :type="model.dateType" v-bind="model.attrs" :format="model.format"
                         :disabled="model.locked" :disabled-date="disabledDate" @change="changeHandler(model, emit)"
                         class="fieldControl" />
                     <span class="range-span" v-if="model.flagrange"> - </span>
-                    <el-date-picker v-if="model.flagrange" v-model="model.code2" :type="model.dateType"
+                    <el-date-picker v-if="model.flagrange" v-model="model.code2" :type="model.dateType" :format="model.format"
                         v-bind="model.attrs" :disabled="model.locked" :disabled-date="disabledDate"
                         @change="changeHandler(model, emit)" class="fieldControl" />
                 </template>

package/src/components/web/JsonViewer.vue

@@ -24,7 +24,7 @@ import { JsonViewer } from "vue3-json-viewer"
 import "vue3-json-viewer/dist/vue3-json-viewer.css";
 import { useDistanceCalculator } from '../../utils/distance-utils.js';
 
-import { nextTick, ref, onMounted ,inject} from "vue";
+import { nextTick, ref, onMounted} from "vue";
 const props = defineProps({
   api: String,
   vmodel: Object,

package/src/components/web/SearchScreen.vue

@@ -180,8 +180,10 @@ function searchHandler(field) {
                 SearchScreen.hiddenHandle(v, model.value);
                 SearchScreen.displayHandle(v, model.value);
             })
-            if (validExcute()) {
-                emit('resetSearch', model.value);
+            if (field.autoSearch) {
+                if (validExcute()) {
+                    emit('resetSearch', model.value);
+                }
             }
             break;
         default:

package/src/components/web/dialog.vue

@@ -12,6 +12,7 @@ const contentTop = ref(0)
 const content = ref()
 const captionBarButtons = ref([])
 const modelSelf = ref(null)
+const submitCancelData= ref(null)
 onBeforeUnmount(()=>{
   modelSelf.value=null
 })
@@ -23,7 +24,7 @@ onActivated(() => {
 function close() {
     emit('close', props);
     if (props.vmodel.content[0].component != 'ct-iframe' && props.vmodel.content[0].attrs && typeof props.vmodel.content[0].attrs["onCloseDialog"] === "function") {
-        props.vmodel.content[0].attrs["onCloseDialog"]();
+        props.vmodel.content[0].attrs["onCloseDialog"](submitCancelData.value);
     }
 }
 function scrollHandle(ev) {
@@ -159,6 +160,13 @@ const render = () => {
                                                             close();
                                                         }
                                                     }
+
+                                                    //加载失败关闭弹框
+                                                    if (!item.attrs.onSubmitCancel) {
+                                                        item.attrs.onSubmitCancel = (ev) => {
+                                                            submitCancelData.value = ev;
+                                                        }
+                                                    }
                                                     //此行代码是为了防止弹出的窗口高度 大于父级页面的高度
                                                     //暂时注释 高度由接口控制
                                                     var ph = 0;

package/src/loader/src/Cron.js

@@ -0,0 +1,11 @@
+import base from '../../loader/index';
+import valid from '../../utils//validate';
+const Cron = function (source) {
+    let rtn = { 
+       
+    };
+    rtn = base.copy(source, rtn);
+    rtn = base.copy(rtn, valid.Init(rtn));
+    return rtn;
+};
+export default Cron

package/src/loader/src/DatePicker.js

@@ -41,13 +41,6 @@ const DatePicker = function (source) {
 
             if (this.flagtime) {
                 dateformat = 'HH:mm';
-                if (source.paramName1 && source.paramName1.length >= 2) {
-                    dateformat = source.paramName1;
-                }
-            }
-
-            else if (source.paramName1 && source.paramName1.length >= 10) {
-                dateformat = source.paramName1;
             }
             else if (source.controlType == Enum.ControlType.DateTime || source.controlType == Enum.ControlType.DateTimeRange) {
                 dateformat = 'YYYY-MM-DD HH:mm';
@@ -55,6 +48,9 @@ const DatePicker = function (source) {
             else if (source.controlType == Enum.ControlType.DateYearMonth) {
                 dateformat = 'YYYY-MM';
             }
+            if (source.paramName1) {
+                dateformat = source.paramName1;
+            }
             return dateformat
         },
         get minuteStep() {

package/src/loader/src/LibFunction.js

@@ -24,6 +24,7 @@ import Tags from './Tags';
 import Location from './Location';
 import AIChat from './AIChat';
 import JsonViewer from './JsonViewer';
+import Cron from './Cron';
 const LibFunction = {
     install(app) {
     },
@@ -279,6 +280,10 @@ const LibFunction = {
                 item = JsonViewer.loadJsonViewerModel(item);
                 item.is = 'ct-jsonviewer';
                 break;
+            case Enum.ControlType.Cron: //Cron表达式控件
+                item = Cron(item)
+                item.is = 'ct-cron'
+                break;
             default:
                 item = Label(item)
                 item.is = 'ct-label'

package/src/main.js

@@ -21,7 +21,7 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl: "http://10.88.22.66/IBS.Mvc/api/",
+    baseUrl: "http://10.88.22.46:20808/service-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,9 @@ app.use(centaline, {
         //获取请求头
         getRequestHeaders: function () {
             return {
-              authobject: '{EmpID:"Token_a3e4add3-642b-40b6-bc3f-32bdf8114668",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_a3e4add3-642b-40b6-bc3f-32bdf8114668",Platform:"WEB"}',
+                
+AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjI3NjY3NmE5LWE5ZDEtNDJhNy05N2UwLWZjYjM4ZmM4NGExYiJ9.NMtc9T_b_BHBj1Ru6_BsVrlkUiptS4EKrrMsx9i7FScbcpGSnQqd1JnQ0ObEu_kwkNAqvMA4LDHuve1DsS8hkA',
+              authobject: '{"currentEstate":{},"platform":1,"osVersion":"","clientVersion":"","machineCode":"f1fe9ca3d9c88ffd7d1298227dbb4def","token":"","random":"c6HfeQ","time":1766043585321,"sign":""}',
                 //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/utils/Enum.js

@@ -313,7 +313,12 @@ const Enum = {
     /// <summary>
     ///  Json预览控件
     /// </summary>
-    JsonViewer: 63
+    JsonViewer: 63,
+
+    /**
+     *  cron 表达式生成/选择
+     */
+    Cron:65,
   },
 
   //返回状态码

package/src/utils/mixins.js

@@ -310,6 +310,9 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                     }
                                                 }
                                                 model.$vue.emit('submit', { formData: model, responseData: data });
+                                            }, () => {
+                                                model.$vue.emit('submitCancel', { formData: model, responseData: data });
+                                                model.$vue.init();
                                             }).catch(() => {
                                                 model.$vue.init();
                                             });
@@ -788,6 +791,53 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                     }
                                     common.closeDialog(dialogOption);
                                 },
+                                onCloseDialog: (ev) => {
+                                    if (ev) {
+                                        if (source == 'table') {
+                                            if (ev.responseData.notification == Enum.ActionType.UpdateColumns) {
+                                                //更新列                            
+                                                model.$vue.refreshTableColumns();
+                                            }
+                                            else if (ev.responseData.notification == Enum.ActionType.Delete
+                                                || ev.responseData.notification == Enum.ActionType.Refersh
+                                            ) {
+                                                model.$vue.doAction(ev);
+                                                model.$vue.loadStats();
+                                            }
+                                            else {
+                                                if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
+                                                    model.$vue.doAction(ev);
+                                                    let response = ev;
+                                                    if (response.responseData) {
+                                                        response = response.responseData;
+                                                    }
+                                                    if (response.notification === Enum.ActionType.Delete || response.notification === Enum.ActionType.CloseTabThenDelete) {
+                                                        model.$vue.loadStats();
+                                                    }
+                                                }
+                                                model.$vue.updateCurrentRow(field, ev);
+                                                if (ev.responseData && ev.responseData.notification === Enum.ActionType.Router) {
+                                                    setTimeout(() => {
+                                                        routerClickHandler(model.getRtnRouter(ev.responseData.content), {}, action, model, source);
+                                                    });
+                                                }
+                                            }
+                                        }
+                                        else {
+                                            if (callBack) {
+                                                callBack(ev.responseData.content[0]);
+                                            }
+                                            if (ev.responseData && ev.responseData.notification === Enum.ActionType.Refersh) {
+                                                model.$vue.init();
+                                            }
+                                            else {
+                                                if (model.$vue && model.$vue.updateFields) {
+                                                    model.$vue.updateFields(ev);
+                                                }
+                                            }
+                                        }
+                                    }
+                                },
                                 isIframe: model.isIframe,
                             },
                         }]

package/src/views/Form.vue

@@ -1,10 +1,10 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
-   <ct-form :api="'/Role/readDetail'" :apiParam="apiParam"></ct-form>
+   <ct-form :api="'/jobschedulingmanage/JobManage/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={"roleId":"61","actionType":3}
+ const apiParam={"actionType":2}
 </script>

package/src/views/SearchList.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
-      :searchStatsApi="'/propertyPublishList/getListStats'"    
-    :searchDataApi="'/propertyPublishList/getListOfSearchModel'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/comprehensive/ApplicationList/getLayoutOfSearch'"
+      
+    :searchDataApi="'/comprehensive/ApplicationList/getList'"></ct-searchlist>
 
        <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
       :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist> -->