cnhis-design-vue 3.1.1 → 3.1.2

package/es/grid/index.css

@@ -506,37 +506,6 @@ body > .vxe-table--tooltip-wrapper {
   height: 20px;
 }
 
-.text-over-tooltip-components[data-v-6633a934] {
-  display: inline-block;
-  max-width: 98%;
-  /* 文字超出宽度显示省略号 单行 */
-  /* 自定义样式 */
-}
-.text-over-tooltip-components[data-v-6633a934] .ellipsis[data-v-6633a934] {
-  font-size: 14px;
-  color: #35393c;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.text-over-tooltip-components[data-v-6633a934] .ellipsis[data-v-6633a934] i[data-v-6633a934] {
-  font-style: normal;
-  word-break: keep-all;
-  white-space: nowrap;
-}
-.text-over-tooltip-components[data-v-6633a934] .fs20[data-v-6633a934] {
-  font-size: 20px;
-  font-weight: 600;
-  color: green;
-  line-height: 22px;
-}
-.text-over-tooltip-components[data-v-6633a934] .fs12[data-v-6633a934] {
-  font-size: 12px;
-  font-weight: 400;
-  color: orange;
-  line-height: 14px;
-}
-
 .no-data-tip[data-v-4a4b0812] {
   display: -webkit-box;
   display: -webkit-flex;
@@ -576,6 +545,37 @@ body > .vxe-table--tooltip-wrapper {
   margin-top: 6px;
 }
 
+.text-over-tooltip-components[data-v-6633a934] {
+  display: inline-block;
+  max-width: 98%;
+  /* 文字超出宽度显示省略号 单行 */
+  /* 自定义样式 */
+}
+.text-over-tooltip-components[data-v-6633a934] .ellipsis[data-v-6633a934] {
+  font-size: 14px;
+  color: #35393c;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.text-over-tooltip-components[data-v-6633a934] .ellipsis[data-v-6633a934] i[data-v-6633a934] {
+  font-style: normal;
+  word-break: keep-all;
+  white-space: nowrap;
+}
+.text-over-tooltip-components[data-v-6633a934] .fs20[data-v-6633a934] {
+  font-size: 20px;
+  font-weight: 600;
+  color: green;
+  line-height: 22px;
+}
+.text-over-tooltip-components[data-v-6633a934] .fs12[data-v-6633a934] {
+  font-size: 12px;
+  font-weight: 400;
+  color: orange;
+  line-height: 14px;
+}
+
 
 .svg-icon[data-v-d1ad5be8] {
   width: 1em;
@@ -596,25 +596,25 @@ body > .vxe-table--tooltip-wrapper {
   color: #5585f5;
 }
 
-.login-form[data-v-06588d4e] {
-  padding-top: 15px;
-}
-.login-form[data-v-06588d4e][data-v-06588d4e] .n-input {
-  height: 50px;
-  font-size: 14px;
-  color: #757575;
-  border-radius: 6px;
-}
 .login-form-button[data-v-06588d4e] {
   width: 100%;
   height: 50px;
-  background: #2d7aff;
   border-radius: 24px;
-  border-color: #2d7aff !important;
   font-size: 16px;
   color: #ffffff;
 }
 
+.login-form-button-print {
+  padding-top: 15px;
+}
+.login-form-button-print .n-input {
+  height: 50px;
+  line-height: 50px;
+  font-size: 14px;
+  color: #757575;
+  border-radius: 6px;
+}
+
 .drag-layout-container[data-v-3b2d7d19] {
   width: 100%;
   height: 100%;
@@ -735,6 +735,48 @@ body > .vxe-table--tooltip-wrapper {
   z-index: 2001;
 }
 
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] {
+  width: 100%;
+  margin-bottom: 16px;
+  overflow: hidden;
+  cursor: pointer;
+  color: #2e2e2e;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  width: 100%;
+  height: 60px;
+  padding: 0 8px;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  margin-bottom: 8px;
+  background: #f3f5f8;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966]-input[data-v-55852966] {
+  width: 85%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer !important;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"][disabled][data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"][disabled][data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"].disabled[data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"].disabled[data-v-55852966] {
+  cursor: pointer !important;
+}
+
 .DragFormRightItem[data-v-2d9603cc] {
   position: relative;
 }
@@ -806,48 +848,6 @@ body > .vxe-table--tooltip-wrapper {
   color: red;
 }
 
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] {
-  width: 100%;
-  margin-bottom: 16px;
-  overflow: hidden;
-  cursor: pointer;
-  color: #2e2e2e;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-      -ms-flex-pack: center;
-          justify-content: center;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-      -ms-flex-align: center;
-          align-items: center;
-  width: 100%;
-  height: 60px;
-  padding: 0 8px;
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  margin-bottom: 8px;
-  background: #f3f5f8;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966]-input[data-v-55852966] {
-  width: 85%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  cursor: pointer !important;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"][disabled][data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"][disabled][data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"].disabled[data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"].disabled[data-v-55852966] {
-  cursor: pointer !important;
-}
-
 
 .popver-content {
   height: 400px;

package/es/index.css

@@ -1017,25 +1017,25 @@ ul[data-v-726261b7] {
   z-index: 2001;
 }
 
-.login-form[data-v-06588d4e] {
-  padding-top: 15px;
-}
-.login-form[data-v-06588d4e][data-v-06588d4e] .n-input {
-  height: 50px;
-  font-size: 14px;
-  color: #757575;
-  border-radius: 6px;
-}
 .login-form-button[data-v-06588d4e] {
   width: 100%;
   height: 50px;
-  background: #2d7aff;
   border-radius: 24px;
-  border-color: #2d7aff !important;
   font-size: 16px;
   color: #ffffff;
 }
 
+.login-form-button-print {
+  padding-top: 15px;
+}
+.login-form-button-print .n-input {
+  height: 50px;
+  line-height: 50px;
+  font-size: 14px;
+  color: #757575;
+  border-radius: 6px;
+}
+
 .dropdown-button[data-v-1e5281d7] {
   color: #212121;
   border-color: #d5d5d5 !important;

package/es/index.js

@@ -1,6 +1,6 @@
 import { watch, h as h$1, resolveComponent, defineComponent, inject, computed, nextTick, reactive, createApp, ref, Teleport, createCommentVNode, provide, onMounted, onUnmounted, getCurrentInstance, onBeforeUnmount, onActivated, onDeactivated, createVNode, mergeProps, isVNode, openBlock, createElementBlock, unref, createElementVNode, toDisplayString, withCtx, normalizeClass, renderSlot, createTextVNode, useAttrs, normalizeStyle, withDirectives, vShow, Fragment, createBlock, vModelSelect, vModelText, pushScopeId, popScopeId, vModelCheckbox, withModifiers, renderList } from 'vue';
 import { NInput, NInputNumber, NSelect, NDatePicker, NTooltip, useMessage, NIcon, NPopconfirm, NButton, NInputGroup, NCheckbox, NCheckboxGroup, NSpace, NProgress, NDropdown, NSwitch, NPopover, NSpin, NRadio, NModal, NForm, NGrid, NFormItemGi, NFormItem, NTree } from 'naive-ui';
-import { SettingsSharp, CaretDown, CaretForward, CopyOutline, SyncOutline, EllipsisVerticalSharp, Reload, ChevronDown, Search, CloseCircleSharp } from '@vicons/ionicons5';
+import { SettingsSharp, CaretDown, CaretForward, CopyOutline, SyncOutline, EllipsisVerticalSharp, ChevronDown, Search, CloseCircleSharp } from '@vicons/ionicons5';
 import draggable from 'vuedraggable';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -38533,7 +38533,6 @@ var script$d = defineComponent({
                 "consistentMenuWidth": false,
                 "clearable": true,
                 "filterable": true,
-                "to": false,
                 "placeholder": "\u8BF7\u9009\u62E9",
                 "loading": state.loading,
                 "onUpdateValue": onUpdateValue
@@ -38608,7 +38607,6 @@ var script$c = defineComponent({
             clearable: props.col.clearable || true,
             disabled: props.col.disabled || false,
             valueFormat: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
-            to: false,
             isDateDisabled: props.col.isDateDisabled || isDateDisabled
         };
         if (config.type.includes("time")) {
@@ -38711,12 +38709,11 @@ const useEdit = (props, state, emit, xGrid) => {
                 return params.row[item.formatMap.label];
             }
             if (item.options) {
-                return item.options.find((v) => v.value == value)?.label || "";
+                return item.options.find((v) => v.value == value)?.label || value || "";
             }
             if (item.queryOptions) {
-                return params.row[`${item.columnName}_options`]?.find((v) => v.value === value)?.label || "";
+                return params.row[`${item.columnName}_options`]?.find((v) => v.value === value)?.label || value || "";
             }
-            return value;
         }
         return value;
     };
@@ -39590,7 +39587,8 @@ var script$8 = /* @__PURE__ */ defineComponent({
         const GROUP_TITLE_KEY = "group-show-title";
         window.$message = useMessage();
         const xGrid = ref(null);
-        const state = reactive(bigTableState);
+        const copyState = xeUtils.clone(bigTableState, true);
+        const state = reactive(copyState);
         const { formatData, htmlToText, getBtnStyle } = useFormat(state);
         const { imgs2imgArr, parseDurationValue, parseCombinationValue, formatFieldText } = useTableParse(formatData);
         const { allSelectedLength, checkOperateCurrentTable, setRowStatus, resetBatchOperationRowStatus, checkListFormUnionSettingParamsList, handleClickCancelBtnByInline, setAllRowInlineStatus, hideSelectCloumns, handleEditFormLength, resetOperationRowStatus, recordClickBtnInfo, getInlineOpreateRow } = useBatchEditing(props, state, emit, xGrid);
@@ -39948,13 +39946,13 @@ var script$8 = /* @__PURE__ */ defineComponent({
                 onFormChange
             };
             if (formType === "date") {
-                propsData.defaultFormattedValue = row[col.columnName];
+                propsData.formattedValue = row[col.columnName];
             }
             else if (formatMap) {
-                propsData.defaultValue = row[formatMap.value];
+                propsData.value = row[formatMap.value];
             }
             else {
-                propsData.defaultValue = row[col.columnName];
+                propsData.value = row[col.columnName];
             }
             if (formType === "select") {
                 propsData.onSetOptions = (options) => row[`${col.columnName}_options`] = options;
@@ -41441,7 +41439,8 @@ var script$8 = /* @__PURE__ */ defineComponent({
                 loadData(value);
             });
         }, {
-            immediate: true
+            immediate: true,
+            deep: true
         });
         watch(() => currentCheckedKeys, (val) => {
             setVisibleCheckAllWrap(state, props, currentCheckedKeys.value);
@@ -41591,7 +41590,7 @@ var script$8 = /* @__PURE__ */ defineComponent({
                     "highlight-current-row": "",
                     "show-footer-overflow": "title",
                     "keep-source": "",
-                    height: "auto",
+                    height: props.height ? "auto" : "unset",
                     resizable: "",
                     "auto-resize": "",
                     "seq-config": unref(handleSeqConfig),
@@ -41691,7 +41690,7 @@ var script$8 = /* @__PURE__ */ defineComponent({
                             }
                         })]),
                     _: 3
-                }, 8, ["seq-config", "tree-config", "row-id", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
+                }, 8, ["height", "seq-config", "tree-config", "row-id", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
                     class: "refresh",
                     onClick: hanldeClickRefresh
                 }, [createVNode(unref(NIcon), {
@@ -45208,8 +45207,7 @@ var script$3 = /* @__PURE__ */ defineComponent({
             password: { required: true, message: "\u8BF7\u8F93\u5165\u5BC6\u7801" }
         };
         const style = {
-            width: "416px",
-            height: "328px"
+            width: "416px"
         };
         const formRef = ref(null);
         const handleClickClose = () => {
@@ -45249,13 +45247,13 @@ var script$3 = /* @__PURE__ */ defineComponent({
                 show: __props.modelValue,
                 "close-on-esc": false,
                 "show-icon": false,
-                style: normalizeStyle({ width: style.width, maxHeight: style.height, overflowY: "auto" }),
-                onAfterLeave: handleClickClose
+                style: normalizeStyle({ width: style.width, overflowY: "auto" }),
+                onClose: handleClickClose
             }, {
                 default: withCtx(() => [
                     createElementVNode("div", _hoisted_1$2, [
                         createVNode(unref(NForm), {
-                            class: "login-form",
+                            class: "login-form-button-print",
                             ref_key: "formRef",
                             ref: formRef,
                             model: unref(form),
@@ -45376,9 +45374,19 @@ var script$2 = /* @__PURE__ */ defineComponent({
         printParams: {
             type: Array,
             required: false
+        },
+        clickPrevFn: {
+            type: Function,
+            required: false,
+            default: () => Promise.resolve(true)
+        },
+        noDataMsg: {
+            type: String,
+            required: false,
+            default: "\u8BF7\u9009\u4E2D\u9700\u8981\u6253\u5370\u7684\u6570\u636E"
         }
     },
-    emits: ["success", "error"],
+    emits: ["success", "error", "clickoutside"],
     setup(__props, { emit }) {
         const props = __props;
         window.$message = useMessage();
@@ -45556,16 +45564,7 @@ var script$2 = /* @__PURE__ */ defineComponent({
         };
         const handleClickOutside = () => {
             state.visible = false;
-        };
-        const handleClickWrap = () => {
-            setTimeout(() => {
-                state.visible = true;
-            }, 0);
-        };
-        const setTimeoutSpin = () => {
-            state.spinTimer = setTimeout(() => {
-                state.spinning = true;
-            }, 1500);
+            emit("clickoutside");
         };
         const instantiatePrintSDK = () => {
             if (printInstance)
@@ -45600,16 +45599,9 @@ var script$2 = /* @__PURE__ */ defineComponent({
             });
             return formatList;
         };
-        const setLoaded = () => {
-            state.spinning = false;
-            if (!state.spinTimer)
-                return false;
-            clearTimeout(state.spinTimer);
-            state.spinTimer = null;
-        };
         const requestError = () => {
             state.isInited = false;
-            setLoaded();
+            state.spinning = false;
             setTimeout(() => {
                 state.visible = false;
             }, 0);
@@ -45678,14 +45670,21 @@ var script$2 = /* @__PURE__ */ defineComponent({
             if (state.isInited)
                 return true;
             state.isInited = true;
-            setTimeoutSpin();
+            state.spinning = true;
             instantiatePrintSDK();
             const formatListResult = await props.queryPrintFormatByNumber();
             await initCRM(formatListResult);
-            setLoaded();
+            state.spinning = false;
             return true;
         };
         const handleClickBtn = async () => {
+            const status = await props.clickPrevFn();
+            if (!status)
+                return;
+            if (!props.params?.length) {
+                window.$message.warning(props.noDataMsg);
+                return;
+            }
             if (!state.visible) {
                 let result = await init();
                 if (!result)
@@ -45728,11 +45727,10 @@ var script$2 = /* @__PURE__ */ defineComponent({
             deep: true
         });
         return (_ctx, _cache) => {
-            return openBlock(), createElementBlock("span", {
-                onClick: handleClickWrap
-            }, [createVNode(unref(NDropdown), {
+            return openBlock(), createElementBlock(Fragment, null, [createVNode(unref(NDropdown), {
                     class: "rowFoldHideBtnList-dropdown",
                     placement: "bottom-start",
+                    trigger: "click",
                     show: unref(state).visible,
                     onClickoutside: handleClickOutside,
                     options: unref(options),
@@ -45751,13 +45749,7 @@ var script$2 = /* @__PURE__ */ defineComponent({
                                 },
                                 onClick: withModifiers(handleClickBtn, ["stop"])
                             }, {
-                                default: withCtx(() => [unref(state).spinning ? (openBlock(), createBlock(unref(NIcon), {
-                                        key: 0,
-                                        component: unref(Reload),
-                                        style: {
-                                            "line-height": "10px"
-                                        }
-                                    }, null, 8, ["component"])) : createCommentVNode("v-if", true), createTextVNode(" " + toDisplayString(__props.btnText) + " ", 1), createVNode(unref(NIcon), {
+                                default: withCtx(() => [createCommentVNode(' <n-spin v-show="state.spinning" size="small"></n-spin> '), createTextVNode(toDisplayString(__props.btnText) + " ", 1), createVNode(unref(NIcon), {
                                         component: unref(ChevronDown)
                                     }, null, 8, ["component"])]),
                                 _: 1
@@ -45768,7 +45760,7 @@ var script$2 = /* @__PURE__ */ defineComponent({
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(state).identityVerification.visible = $event)
                 }, _ctx.$attrs, {
                     onSuccess: verifiySuccess
-                }), null, 16, ["modelValue"])]);
+                }), null, 16, ["modelValue"])], 64);
         };
     }
 });