cnhis-design-vue 3.0.6 → 3.0.7

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.0.7](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/compare/v3.0.6...v3.0.7) (2022-05-25)
+
+
+### Features
+
+* big-table 编辑增加date类型 ([fce033b](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/fce033b338b0ea2ccd4b4496e21a27e44ef8e68b))
+
+
+### Bug Fixes
+
+* 表格编辑初始化不应展示操作项 ([165217d](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/165217d96e076b67f449483cf957b4b211545af8))
+
 ### [3.0.6](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/compare/v3.0.5...v3.0.6) (2022-05-24)
 
 

package/es/big-table/index.js

@@ -1,6 +1,6 @@
-import { computed, watch, defineComponent, openBlock, createElementBlock, unref, createCommentVNode, createElementVNode, toDisplayString, ref, createVNode, withCtx, normalizeClass, renderSlot, createTextVNode, mergeProps, reactive, h, resolveComponent, inject, nextTick, createApp, Teleport, provide, onMounted, onUnmounted, getCurrentInstance, onBeforeUnmount, onActivated, onDeactivated, isVNode, useAttrs, normalizeStyle, withDirectives, vShow, Fragment, createBlock } from 'vue';
+import { computed, watch, defineComponent, createVNode, mergeProps, reactive, openBlock, createElementBlock, unref, createCommentVNode, createElementVNode, toDisplayString, ref, withCtx, normalizeClass, renderSlot, createTextVNode, h, resolveComponent, inject, nextTick, createApp, Teleport, provide, onMounted, onUnmounted, getCurrentInstance, onBeforeUnmount, onActivated, onDeactivated, isVNode, useAttrs, normalizeStyle, withDirectives, vShow, Fragment, createBlock } from 'vue';
+import { NInput, NInputNumber, NSelect, NDatePicker, NTooltip, useMessage, NIcon, NPopconfirm, NButton, NInputGroup, NCheckbox, NCheckboxGroup, NSpace, NProgress, NDropdown, NSwitch, NPopover } from 'naive-ui';
 import { SettingsSharp, CaretDown, CaretForward, CopyOutline, SyncOutline } from '@vicons/ionicons5';
-import { NTooltip, NInput, NInputNumber, NSelect, NDatePicker, useMessage, NIcon, NPopconfirm, NButton, NInputGroup, NCheckbox, NCheckboxGroup, NSpace, NProgress, NDropdown, NSwitch, NPopover } from 'naive-ui';
 
 const bigTableState = {
     curAbleCheckedLen: 0,
@@ -13254,6 +13254,162 @@ const useNestTable = (props, state, emit) => {
     };
 };
 
+var script$6 = defineComponent({
+    name: "EditInput",
+    inheritAttrs: false,
+    components: {
+        NInput,
+        NInputNumber
+    },
+    props: {
+        type: {
+            type: String,
+            default: "input"
+        },
+        col: {
+            type: Object,
+            default: () => ({})
+        },
+        row: {
+            type: Object,
+            default: () => ({})
+        },
+        index: {
+            type: [Number, Object],
+            default: 0
+        }
+    },
+    emits: ["formChange"],
+    setup(props, { attrs, slots, emit }) {
+        const onUpdateValue = (value) => {
+            emit("formChange", {
+                value,
+                row: props.row,
+                column: props.col,
+                index: props.index
+            });
+        };
+        return () => props.type === "input" ? createVNode(NInput, mergeProps(attrs, {
+            "onUpdateValue": onUpdateValue
+        }), null) : createVNode(NInputNumber, mergeProps(attrs, {
+            "onUpdateValue": onUpdateValue
+        }), null);
+    }
+});
+
+script$6.__file = "packages/big-table/src/components/edit-form/edit-input.vue";
+
+var script$5 = defineComponent({
+    name: "EditSelect",
+    inheritAttrs: false,
+    components: {
+        NSelect
+    },
+    props: {
+        col: {
+            type: Object,
+            default: () => ({})
+        },
+        row: {
+            type: Object,
+            default: () => ({})
+        },
+        index: {
+            type: [Number, Object],
+            default: 0
+        }
+    },
+    emits: ["setOptions", "formChange"],
+    setup(props, { attrs, slots, emit }) {
+        const state = reactive({
+            options: []
+        });
+        const setOptions = async () => {
+            if (props.col.options) {
+                state.options = JSON.parse(JSON.stringify(props.col.options));
+            }
+            else {
+                const optionsName = `${props.col.columnName}_options`;
+                state.options = props.row[optionsName] || await props.col.queryOptions();
+                if (!props.row[optionsName]) {
+                    emit("setOptions", state.options);
+                }
+            }
+        };
+        setOptions();
+        const onUpdateValue = (value) => {
+            emit("formChange", {
+                value,
+                row: props.row,
+                column: props.col,
+                index: props.index
+            });
+        };
+        return () => [createVNode(NSelect, mergeProps(attrs, {
+                "options": state.options,
+                "consistentMenuWidth": false,
+                "clearable": true,
+                "filterable": true,
+                "to": false,
+                "placeholder": "\u8BF7\u9009\u62E9",
+                "onUpdateValue": onUpdateValue
+            }), null)];
+    }
+});
+
+script$5.__file = "packages/big-table/src/components/edit-form/edit-select.vue";
+
+var script$4 = defineComponent({
+    name: "EditDate",
+    inheritAttrs: false,
+    components: {
+        NDatePicker
+    },
+    props: {
+        col: {
+            type: Object,
+            default: () => ({})
+        },
+        row: {
+            type: Object,
+            default: () => ({})
+        },
+        index: {
+            type: [Number, Object],
+            default: 0
+        }
+    },
+    emits: ["formChange"],
+    setup(props, { attrs, slots, emit }) {
+        const onConfirm = (value) => {
+            emit("formChange", {
+                value,
+                row: props.row,
+                column: props.col,
+                index: props.index
+            });
+        };
+        const config = {
+            type: props.col.type || "datetime",
+            clearable: props.col.clearable || true,
+            disabled: props.col.disabled || false,
+            valueFormat: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
+            to: false
+        };
+        return () => createVNode(NDatePicker, mergeProps(attrs, config, {
+            "onUpdateFormattedValue": onConfirm
+        }), null);
+    }
+});
+
+script$4.__file = "packages/big-table/src/components/edit-form/edit-date.vue";
+
+const comps = {
+    "input": script$6,
+    "number": script$6,
+    "select": script$5,
+    "date": script$4
+};
 const useEdit = (props, state, emit, xGrid) => {
     const initEditTable = async () => {
         const { isEdit, fieldList = [] } = props.columnConfig;
@@ -13310,6 +13466,7 @@ const useEdit = (props, state, emit, xGrid) => {
         xGrid.value.clearActived();
     };
     const onFormChange = ({ value, row, column }) => {
+        row[column.columnName] = value;
         emit("formChange", { value, row, column });
     };
     const getDefaultValue = (params, item) => {
@@ -13346,7 +13503,7 @@ var img$3 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQQAAADKCAYAAABDnT56A
 const _hoisted_1$3 = { class: "no-data-tip NoData-page" };
 const _hoisted_2$2 = ["src"];
 const _hoisted_3$1 = { key: 1 };
-var script$6 = /* @__PURE__ */ defineComponent({
+var script$3 = /* @__PURE__ */ defineComponent({
     props: {
         noDataTip: {
             type: String,
@@ -13407,14 +13564,14 @@ var script$6 = /* @__PURE__ */ defineComponent({
     }
 });
 
-script$6.__scopeId = "data-v-4a4b0812";
-script$6.__file = "packages/big-table/src/components/NoData.vue";
+script$3.__scopeId = "data-v-4a4b0812";
+script$3.__file = "packages/big-table/src/components/NoData.vue";
 
 const _hoisted_1$2 = { class: "text-over-tooltip-components" };
 const __default__$2 = {
     name: "TextOverTooltip"
 };
-var script$5 = /* @__PURE__ */ defineComponent({
+var script$2 = /* @__PURE__ */ defineComponent({
     ...__default__$2,
     props: {
         content: { type: [String, Number], required: false },
@@ -13482,15 +13639,15 @@ var script$5 = /* @__PURE__ */ defineComponent({
     }
 });
 
-script$5.__scopeId = "data-v-6633a934";
-script$5.__file = "packages/big-table/src/components/TextOverTooltip.vue";
+script$2.__scopeId = "data-v-6633a934";
+script$2.__file = "packages/big-table/src/components/TextOverTooltip.vue";
 
 const _hoisted_1$1 = { key: 0 };
 const _hoisted_2$1 = ["xlink:href"];
 const __default__$1 = {
     name: "SvgIcon"
 };
-var script$4 = /* @__PURE__ */ defineComponent({
+var script$1 = /* @__PURE__ */ defineComponent({
     ...__default__$1,
     props: {
         iconClass: { type: String, required: true, default: "" },
@@ -13520,159 +13677,8 @@ var script$4 = /* @__PURE__ */ defineComponent({
     }
 });
 
-script$4.__scopeId = "data-v-d1ad5be8";
-script$4.__file = "src/component/svg/index.vue";
-
-var script$3 = defineComponent({
-    name: "EditInput",
-    inheritAttrs: false,
-    components: {
-        NInput,
-        NInputNumber
-    },
-    props: {
-        type: {
-            type: String,
-            default: "input"
-        },
-        col: {
-            type: Object,
-            default: () => ({})
-        },
-        row: {
-            type: Object,
-            default: () => ({})
-        },
-        index: {
-            type: [Number, Object],
-            default: 0
-        }
-    },
-    emits: ["formChange"],
-    setup(props, { attrs, slots, emit }) {
-        const onUpdateValue = (value) => {
-            emit("formChange", {
-                value,
-                row: props.row,
-                column: props.col,
-                index: props.index
-            });
-        };
-        return () => props.type === "input" ? createVNode(NInput, mergeProps(attrs, {
-            "onUpdateValue": onUpdateValue
-        }), null) : createVNode(NInputNumber, mergeProps(attrs, {
-            "onUpdateValue": onUpdateValue
-        }), null);
-    }
-});
-
-script$3.__file = "packages/big-table/src/components/edit-form/edit-input.vue";
-
-var script$2 = defineComponent({
-    name: "EditSelect",
-    inheritAttrs: false,
-    components: {
-        NSelect
-    },
-    props: {
-        col: {
-            type: Object,
-            default: () => ({})
-        },
-        row: {
-            type: Object,
-            default: () => ({})
-        },
-        index: {
-            type: [Number, Object],
-            default: 0
-        }
-    },
-    emits: ["setOptions", "formChange"],
-    setup(props, { attrs, slots, emit }) {
-        const state = reactive({
-            options: []
-        });
-        const setOptions = async () => {
-            if (props.col.options) {
-                state.options = JSON.parse(JSON.stringify(props.col.options));
-            }
-            else {
-                const optionsName = `${props.col.columnName}_options`;
-                state.options = props.row[optionsName] || await props.col.queryOptions();
-                if (!props.row[optionsName]) {
-                    emit("setOptions", state.options);
-                }
-            }
-        };
-        setOptions();
-        const onUpdateValue = (value) => {
-            emit("formChange", {
-                value,
-                row: props.row,
-                column: props.col,
-                index: props.index
-            });
-        };
-        return () => [createVNode(NSelect, mergeProps(attrs, {
-                "options": state.options,
-                "consistentMenuWidth": false,
-                "clearable": true,
-                "filterable": true,
-                "to": false,
-                "placeholder": "\u8BF7\u9009\u62E9",
-                "onUpdateValue": onUpdateValue
-            }), null)];
-    }
-});
-
-script$2.__file = "packages/big-table/src/components/edit-form/edit-select.vue";
-
-var script$1 = defineComponent({
-    name: "EditDate",
-    inheritAttrs: false,
-    components: {
-        NDatePicker
-    },
-    props: {
-        col: {
-            type: Object,
-            default: () => ({})
-        },
-        row: {
-            type: Object,
-            default: () => ({})
-        },
-        index: {
-            type: [Number, Object],
-            default: 0
-        }
-    },
-    emits: ["formChange"],
-    setup(props, { attrs, slots, emit }) {
-        const onConfirm = (value, formattedValue) => {
-            console.log("\u65F6\u95F4\u9009\u62E9->", value);
-            emit("formChange", {
-                value,
-                row: props.row,
-                column: props.col,
-                index: props.index
-            });
-        };
-        const config = {
-            type: props.col.type || "datetime",
-            clearable: props.col.clearable || true,
-            disabled: props.col.disabled || false,
-            valueFormat: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
-            to: false
-        };
-        return () => createVNode(NDatePicker, mergeProps(attrs, config, {
-            "onConfirm": onConfirm
-        }), null);
-    }
-});
-
-script$1.__file = "packages/big-table/src/components/edit-form/edit-date.vue";
+script$1.__scopeId = "data-v-d1ad5be8";
+script$1.__file = "src/component/svg/index.vue";
 
 var iconPrefix = 'vxe-icon--';
 var GlobalConfig = {
@@ -39841,37 +39847,31 @@ var script = /* @__PURE__ */ defineComponent({
         const formatterEdit = (params, col) => {
             let { row, column, $rowIndex, rowIndex } = params;
             let formType = column.formType || col.formType || "";
+            if (!formType)
+                return null;
             if (formType === "custom") {
                 return col.slotFn(params);
             }
+            const Comp = comps[formType] || "";
+            if (!Comp)
+                return null;
             const propsData = {
                 col,
                 row,
-                index: $rowIndex
+                index: $rowIndex,
+                type: formType,
+                onFormChange
             };
-            if (formType === "input" || formType === "number") {
-                return createVNode(script$3, mergeProps(propsData, {
-                    "type": formType,
-                    "value": row[col.columnName],
-                    "onUpdate:value": ($event) => row[col.columnName] = $event,
-                    "onFormChange": onFormChange
-                }), null);
+            if (formType === "date") {
+                propsData.defaultFormattedValue = row[col.columnName];
             }
-            if (formType === "select") {
-                return createVNode(script$2, mergeProps(propsData, {
-                    "value": row[col.columnName],
-                    "onUpdate:value": ($event) => row[col.columnName] = $event,
-                    "onSetOptions": (options) => row[`${col.columnName}_options`] = options,
-                    "onFormChange": onFormChange
-                }), null);
+            else {
+                propsData.defaultValue = row[col.columnName];
             }
-            if (formType === "date") {
-                return createVNode(script$1, mergeProps(propsData, {
-                    "formattedValue": row[col.columnName],
-                    "onUpdate:formattedValue": ($event) => row[col.columnName] = $event,
-                    "onFormChange": onFormChange
-                }), null);
+            if (formType === "select") {
+                propsData.onSetOptions = (options) => row[`${col.columnName}_options`] = options;
             }
+            return createVNode(Comp, propsData, null);
         };
         const getEditBtn = (row, col, index) => {
             return col.tileBtnList?.map((btn) => {
@@ -39967,7 +39967,7 @@ var script = /* @__PURE__ */ defineComponent({
                 return getOrCode(row, own, attrType);
             }
             if (column.property === "operatorColumn") {
-                if (props.columnConfig.isEdit) {
+                if (props.columnConfig.isEdit && !row.initRow) {
                     return getEditBtn(row, col, $rowIndex);
                 }
                 if (state.showButtonTop != 0 || props.isBatchEditing)
@@ -40252,13 +40252,13 @@ var script = /* @__PURE__ */ defineComponent({
                 isAlias = !!tooltipTitle;
             }
             if (type === "format")
-                return createVNode(script$5, {
+                return createVNode(script$2, {
                     "tooltipTitle": tooltipTitle,
                     "content": name,
                     "isAlias": isAlias
                 }, null);
             return () => {
-                return [createVNode(script$5, {
+                return [createVNode(script$2, {
                         "tooltipTitle": tooltipTitle,
                         "content": name,
                         "isAlias": isAlias
@@ -40812,7 +40812,7 @@ var script = /* @__PURE__ */ defineComponent({
             return createVNode(NPopconfirm, {
                 "onPositiveClick": () => confirmScanMulti(params)
             }, {
-                trigger: () => createVNode(script$4, {
+                trigger: () => createVNode(script$1, {
                     "class": "scan-multi-delete",
                     "iconClass": "shanchu"
                 }, null),
@@ -41025,7 +41025,7 @@ var script = /* @__PURE__ */ defineComponent({
                 }, [createVNode("img", {
                         "class": "bigTable-qr-img",
                         "src": src
-                    }, null), createVNode("span", null, [createVNode(script$4, {
+                    }, null), createVNode("span", null, [createVNode(script$1, {
                             "iconClass": "fangda"
                         }, null)])])];
         };
@@ -41109,7 +41109,7 @@ var script = /* @__PURE__ */ defineComponent({
                 }
                 else {
                     icon = createVNode(NTooltip, null, {
-                        trigger: () => createVNode(script$4, {
+                        trigger: () => createVNode(script$1, {
                             "iconClass": btn.icon,
                             "style": {
                                 marginRight: mr
@@ -41120,7 +41120,7 @@ var script = /* @__PURE__ */ defineComponent({
                 }
             }
             else if (btn.iconSetting) {
-                icon = createVNode(script$4, {
+                icon = createVNode(script$1, {
                     "iconClass": JSON.parse(btn.iconSetting).icon,
                     "style": {
                         marginRight: mr
@@ -41549,7 +41549,7 @@ var script = /* @__PURE__ */ defineComponent({
                     onScroll: handlerScroll,
                     onCellMouseenter: handleCellMouseenter
                 }, {
-                    empty: withCtx(() => [unref(state).isShowEmpty ? (openBlock(), createElementBlock("div", _hoisted_9, [createVNode(script$6, {
+                    empty: withCtx(() => [unref(state).isShowEmpty ? (openBlock(), createElementBlock("div", _hoisted_9, [createVNode(script$3, {
                                 "no-data-img": props.emptyItems.noDataImg,
                                 "no-data-tip": props.emptyItems.noDataTip,
                                 "show-img": !props.isNestTable