cnhis-design-vue 3.1.16-beta.14 → 3.1.16-beta.15

package/es/packages/big-table/src/BigTable.vue.d.ts

@@ -1126,7 +1126,12 @@ declare const _default: import("vue").DefineComponent<{
                 textColorGhostHoverWarning: string;
                 textColorGhostPressedWarning: string;
                 textColorGhostFocusWarning: string;
-                textColorGhostDisabledWarning: string;
+                textColorGhostDisabledWarning: string; /**
+                 * 判断是否渲染EditForm
+                 * @param {*} row
+                 * @param {*} column
+                 * @returns
+                 */
                 borderWarning: string;
                 borderHoverWarning: string;
                 borderPressedWarning: string;

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -354,10 +354,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         showSeq = true
       } = map;
       if (isEdit) {
-        state.editConfig = Object.assign(state.editConfig, editConfig);
+        Object.assign(state.editConfig, editConfig);
         state.rowConfig.height = 48;
       }
-      state.rowConfig = Object.assign(state.rowConfig, rowConfig);
+      Object.assign(state.rowConfig, rowConfig);
       state.rowConfig.keyField = handleRowId.value;
       if (selectType) {
         isBatchSelect = 1;

package/es/packages/big-table/src/components/edit-form/edit-date.js

@@ -1,4 +1,5 @@
-import { defineComponent, createVNode, mergeProps } from 'vue';
+import { defineComponent, computed, createVNode, mergeProps } from 'vue';
+import { generateTimeFormat } from '../../../../../src/utils';
 import { isFunction } from 'lodash-es';
 import { NDatePicker } from 'naive-ui';
 
@@ -25,7 +26,6 @@ var EditDate = defineComponent({
   emits: ["formChange"],
   setup(props, {
     attrs,
-    slots,
     emit
   }) {
     const onConfirm = (value) => {
@@ -102,11 +102,21 @@ var EditDate = defineComponent({
         return customDateDisabled(ts, props.row);
       };
     }
+    const formatConfig = computed(() => {
+      const valueFormat = props.col.valueFormat || "yyyy-MM-dd HH:mm:ss";
+      return {
+        valueFormat,
+        format: valueFormat,
+        timePickerProps: {
+          format: generateTimeFormat(valueFormat)
+        }
+      };
+    });
     const config = {
       type: props.col.type || props.col.dateType || "datetime",
       clearable: props.col.clearable || true,
       disabled: props.col.disabled || false,
-      valueFormat: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
+      ...formatConfig.value,
       isDateDisabled: customDateDisabledDecorator(props.col.isDateDisabled) || isDateDisabled,
       placeholder: props.col.placeholder || "\u8BF7\u9009\u62E9",
       ...props.col.componentProps || {}

package/es/packages/big-table/src/components/edit-form/edit-time.js

@@ -41,6 +41,7 @@ var editTime = defineComponent({
     const config = {
       placeholder: props.col.placeholder || "\u8BF7\u9009\u62E9",
       valueFormat: props.col.valueFormat || "HH:mm",
+      format: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
       ...props.col.componentProps || {}
     };
     return () => createVNode(NTimePicker, mergeProps(attrs, config, {

package/es/packages/big-table/src/hooks/useSeparateRow.js

@@ -84,13 +84,15 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
         });
       }
       (await res).push(...Array.from({ length: getColumnInfoMaxLength(parsedRowData) }).map((_, index) => {
+        const separateData = getSeparateRowData(parsedRowData, index);
         if (index === 0) {
           separateDataMap.value.set(row, {
             row,
             rawRow: rawData[dataIndex],
             index,
-            separateData: getSeparateRowData(parsedRowData, index)
+            separateData
           });
+          row.$__SEPARATE_DATA = [separateData];
           return row;
         }
         const data2 = { $__SEPARATE: true };
@@ -98,8 +100,9 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
           row: data2,
           rawRow: rawData[dataIndex],
           index,
-          separateData: getSeparateRowData(parsedRowData, index)
+          separateData
         });
+        row.$__SEPARATE_DATA.push(separateData);
         return data2;
       }));
       return res;

package/es/packages/fabric-chart/src/components/PopupTip.js

@@ -20,8 +20,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           style: normalizeStyle(unref(pointStyle))
         }, [
           (openBlock(true), createElementBlock(Fragment, null, renderList(__props.list, (item) => {
-            return openBlock(), createElementBlock("li", null, toDisplayString(item), 1);
-          }), 256))
+            return openBlock(), createElementBlock("li", { key: item }, toDisplayString(item), 1);
+          }), 128))
         ], 4), [
           [vShow, __props.show]
         ])

package/es/packages/fabric-chart/src/hooks/useCenter.js

@@ -430,9 +430,18 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       x: point.left,
       y: point.top
     };
-    const yValue = getYValue(type, point.top);
-    pointTipProps.list = [`${title} ${yValue}${unit || ""}`, `\u65F6\u95F4 ${((data == null ? void 0 : data.time) || getXValue(point.left)).slice(-5)}`];
+    pointTipProps.list = [getListValue(), `\u65F6\u95F4 ${((data == null ? void 0 : data.time) || getXValue(point.left)).slice(-5)}`];
     pointTipProps.show = true;
+    function getListValue() {
+      const { value, drugReduce, physicsReduce } = data;
+      if (drugReduce) {
+        return `\u836F\u7269\u964D${type == "pain" ? "\u75DB" : "\u6E29"} ${value}\u2014>${drugReduce}${unit || ""}`;
+      }
+      if (physicsReduce) {
+        return `\u7269\u7406\u964D${type == "pain" ? "\u75DB" : "\u6E29"} ${value}\u2014>${physicsReduce}${unit || ""}`;
+      }
+      return `${title} ${value}${unit || ""}`;
+    }
   }
   function moveLimit(point) {
     point.setCoords();

package/es/packages/form-render/src/components/renderer/date.js

@@ -1,4 +1,5 @@
 import { defineComponent, computed, watch, createVNode, mergeProps } from 'vue';
+import { generateTimeFormat } from '../../../../../src/utils';
 import { connect, mapProps } from '@formily/vue';
 import { isObject } from '@vueuse/core';
 import { format } from 'date-fns';
@@ -66,9 +67,7 @@ const script = defineComponent({
       }
     }
     const validateConfig = computed(() => {
-      const result = {
-        valueFormat: props.valueFormat
-      };
+      const result = {};
       if (isObject(props.validate)) {
         const {
           min_date,
@@ -81,6 +80,15 @@ const script = defineComponent({
       }
       return result;
     });
+    const formatConfig = computed(() => {
+      return {
+        valueFormat: props.valueFormat,
+        format: props.valueFormat,
+        timePickerProps: {
+          format: generateTimeFormat(props.valueFormat)
+        }
+      };
+    });
     function formatDate(value) {
       if (!value)
         return value;
@@ -95,7 +103,7 @@ const script = defineComponent({
       get: () => formatDate(props.value),
       set: (value) => emit("update:value", value)
     });
-    return () => createVNode(NDatePicker, mergeProps(validateConfig.value, {
+    return () => createVNode(NDatePicker, mergeProps(validateConfig.value, formatConfig.value, {
       "formatted-value": valueRef.value,
       "onUpdate:formatted-value": ($event) => valueRef.value = $event
     }), null);

package/es/packages/shortcut-provider/src/hooks/useShortcuts.js

@@ -88,6 +88,7 @@ class ShortcutManager {
       const callback = this.shortcutCallbackMap.get(keySignature);
       if (!callback)
         return;
+      event.preventDefault();
       const shortcutItem = Object.values(this.shortcutCache.value).find((item) => item.currentKeySignature === keySignature);
       if (!shortcutItem || shortcutItem.status !== ShortcutStatus.ACTIVE || shortcutItem.disabled)
         return;

package/es/src/utils/index.d.ts

@@ -1,2 +1,3 @@
 import { App, Component } from 'vue';
 export declare function safeComponentRegister(app: App, component: Component, cName?: string | undefined, scheduler?: () => void): void;
+export declare function generateTimeFormat(format: string): string | undefined;

package/es/src/utils/index.js

@@ -1,3 +1,5 @@
+import { isString } from 'lodash-es';
+
 function safeComponentRegister(app, component, cName = component.name, scheduler) {
   if (!cName)
     throw new Error(`[CUI]: invalid component name for ${component}`);
@@ -11,5 +13,13 @@ function safeComponentRegister(app, component, cName = component.name, scheduler
     app.component(cName, component);
   }
 }
+function generateTimeFormat(format) {
+  if (!isString(format))
+    return;
+  const matched = format.match(/[Hms:]+/);
+  if (!matched)
+    return;
+  return matched[0];
+}
 
-export { safeComponentRegister };
+export { generateTimeFormat, safeComponentRegister };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.16-beta.14",
+  "version": "3.1.16-beta.15",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",