cnhis-design-vue 3.0.0 → 3.0.1

package/CHANGELOG.md

@@ -1,7 +1,16 @@
-# Changelog
-
-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.
-
+# Changelog
+
+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.1](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/compare/v3.0.0...v3.0.1) (2022-05-17)
+
+
+### Features
+
+* 部分警告容错处理 ([b5f16ed](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/b5f16ed0a9884a515ebe2729a0f460e2ab170f08))
+* 打包前删除旧包 ([1559071](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/1559071bdd9c6faa7e9f6d5d0c49fff5ffe034bd))
+* rollup打包jsx编译和一些其他优化 ([6625d47](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/6625d473523595bb3479ca444a37ed06bffb55aa))
+
 ## 3.0.0 (2022-05-12)
 
 

package/env.d.ts

@@ -19,4 +19,6 @@ declare module '*.vue' {
   export default component
 }
 
+declare module '*.js'
+
 declare module 'qs'

package/es/big-table/index.css

@@ -69,7 +69,7 @@
 }
 
 
-.svg-icon[data-v-d1ad5be8] {
+.svg-icon[data-v-7e176a4b] {
   width: 1em;
   height: 1em;
   vertical-align: -0.15em;

package/es/big-table/index.js

@@ -1,102 +1,9 @@
-import { inject, computed, watch, defineComponent, openBlock, createElementBlock, unref, createCommentVNode, createElementVNode, toDisplayString, ref, createVNode, withCtx, normalizeClass, renderSlot, createTextVNode, mergeProps, h, resolveComponent, nextTick, reactive, createApp, Teleport, provide, onMounted, onUnmounted, getCurrentInstance, onBeforeUnmount, onActivated, onDeactivated, isVNode, useAttrs, normalizeStyle, withDirectives, vShow, Fragment, createBlock, vModelSelect, vModelText, pushScopeId, popScopeId } from 'vue';
+import { computed, watch, defineComponent, openBlock, createElementBlock, unref, createCommentVNode, createElementVNode, toDisplayString, ref, createVNode, withCtx, normalizeClass, renderSlot, createTextVNode, mergeProps, h, resolveComponent, inject, nextTick, reactive, createApp, Teleport, provide, onMounted, onUnmounted, getCurrentInstance, onBeforeUnmount, onActivated, onDeactivated, isVNode, useAttrs, normalizeStyle, withDirectives, vShow, Fragment, createBlock, vModelSelect, vModelText, pushScopeId, popScopeId } from 'vue';
 import axios from 'axios';
 import { SettingsSharp, CaretDown, CaretForward, CopyOutline, SyncOutline } from '@vicons/ionicons5';
 import { NTooltip, NSelect, NPagination, NEmpty, NSpin, NSpace, NInput, useMessage, NIcon, NPopconfirm, NButton, NInputGroup, NCheckbox, NCheckboxGroup, NProgress, NDropdown, NSwitch, NPopover } from 'naive-ui';
 import draggable from 'vuedraggable';
 
-/*!
-  * vue-router v4.0.13
-  * (c) 2022 Eduardo San Martin Morote
-  * @license MIT
-  */
-
-const hasSymbol = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol';
-const PolySymbol = (name) => 
-// vr = vue router
-hasSymbol
-    ? Symbol((process.env.NODE_ENV !== 'production') ? '[vue-router]: ' + name : name)
-    : ((process.env.NODE_ENV !== 'production') ? '[vue-router]: ' : '_vr_') + name;
-// rvlm = Router View Location Matched
-/**
- * RouteRecord being rendered by the closest ancestor Router View. Used for
- * `onBeforeRouteUpdate` and `onBeforeRouteLeave`. rvlm stands for Router View
- * Location Matched
- *
- * @internal
- */
-/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router view location matched' : 'rvlm');
-/**
- * Allows overriding the router view depth to control which component in
- * `matched` is rendered. rvd stands for Router View Depth
- *
- * @internal
- */
-/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router view depth' : 'rvd');
-/**
- * Allows overriding the router instance returned by `useRouter` in tests. r
- * stands for router
- *
- * @internal
- */
-/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router' : 'r');
-/**
- * Allows overriding the current route returned by `useRoute` in tests. rl
- * stands for route location
- *
- * @internal
- */
-const routeLocationKey = /*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'route location' : 'rl');
-/**
- * Allows overriding the current route used by router-view. Internally this is
- * used when the `route` prop is passed.
- *
- * @internal
- */
-/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router view location' : 'rvl');
-
-var NavigationType;
-(function (NavigationType) {
-    NavigationType["pop"] = "pop";
-    NavigationType["push"] = "push";
-})(NavigationType || (NavigationType = {}));
-var NavigationDirection;
-(function (NavigationDirection) {
-    NavigationDirection["back"] = "back";
-    NavigationDirection["forward"] = "forward";
-    NavigationDirection["unknown"] = "";
-})(NavigationDirection || (NavigationDirection = {}));
-
-/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'navigation failure' : 'nf');
-/**
- * Enumeration with all possible types for navigation failures. Can be passed to
- * {@link isNavigationFailure} to check for specific failures.
- */
-var NavigationFailureType;
-(function (NavigationFailureType) {
-    /**
-     * An aborted navigation is a navigation that failed because a navigation
-     * guard returned `false` or called `next(false)`
-     */
-    NavigationFailureType[NavigationFailureType["aborted"] = 4] = "aborted";
-    /**
-     * A cancelled navigation is a navigation that failed because a more recent
-     * navigation finished started (not necessarily finished).
-     */
-    NavigationFailureType[NavigationFailureType["cancelled"] = 8] = "cancelled";
-    /**
-     * A duplicated navigation is a navigation that failed because it was
-     * initiated while already being at the exact same location.
-     */
-    NavigationFailureType[NavigationFailureType["duplicated"] = 16] = "duplicated";
-})(NavigationFailureType || (NavigationFailureType = {}));
-/**
- * Returns the current route location. Equivalent to using `$route` inside
- * templates.
- */
-function useRoute() {
-    return inject(routeLocationKey);
-}
-
 const bigTableState = {
     curAbleCheckedLen: 0,
     showButtonTop: 0,
@@ -304,7 +211,8 @@ const bigTableEmits = [
     "setNestLastClickTable",
     "selectionChangeLocal",
     "switchBtnOnChange",
-    "asyncTableChange"
+    "asyncTableChange",
+    "clickSelectTable"
 ];
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -13424,7 +13332,7 @@ const useNestTable = (props, state, emit) => {
 
 const useEdit = (props, state, emit, xGrid) => {
     const initEditTable = async () => {
-        const { isEdit, fieldList } = props.columnConfig;
+        const { isEdit, fieldList = [] } = props.columnConfig;
         if (!isEdit)
             return;
         const hasSelectTable = fieldList.find((v) => v.formType === "selectTable");
@@ -13470,6 +13378,7 @@ const useEdit = (props, state, emit, xGrid) => {
         }
     };
     const onClickSelectTable = async (row) => {
+        emit("clickSelectTable", { row });
         const record = {
             initRow: false,
             row: JSON.parse(JSON.stringify(row))
@@ -13644,42 +13553,43 @@ var script$6 = /* @__PURE__ */ defineComponent({
 script$6.__scopeId = "data-v-6633a934";
 script$6.__file = "packages/big-table/src/components/TextOverTooltip.vue";
 
-const _hoisted_1$2 = { key: 0 };
-const _hoisted_2$2 = ["xlink:href"];
-const __default__$2 = {
-  name: "SvgIcon"
-};
-var script$5 = /* @__PURE__ */ defineComponent({
-  ...__default__$2,
-  props: {
-    iconClass: { type: String, required: true, default: "" },
-    title: { type: String, required: true, default: "" },
-    className: { type: String, required: false }
-  },
-  setup(__props) {
-    const props = __props;
-    const iconName = computed(() => `#icon-${props.iconClass}`);
-    const svgClass = computed(() => {
-      if (props.className) {
-        return "svg-icon " + props.className;
-      } else {
-        return "svg-icon";
-      }
-    });
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("svg", mergeProps({
-        class: unref(svgClass),
-        "aria-hidden": "true"
-      }, _ctx.$attrs), [
-        __props.title ? (openBlock(), createElementBlock("title", _hoisted_1$2, toDisplayString(__props.title), 1)) : createCommentVNode("v-if", true),
-        createElementVNode("use", { "xlink:href": unref(iconName) }, null, 8, _hoisted_2$2)
-      ], 16);
-    };
-  }
+const _hoisted_1$2 = { key: 0 };
+const _hoisted_2$2 = ["xlink:href"];
+const __default__$2 = {
+    name: "SvgIcon"
+};
+var script$5 = /* @__PURE__ */ defineComponent({
+    ...__default__$2,
+    props: {
+        iconClass: { type: String, required: true, default: "" },
+        title: { type: String, required: true, default: "" },
+        className: { type: String, required: false }
+    },
+    setup(__props) {
+        const props = __props;
+        const iconName = computed(() => `#icon-${props.iconClass}`);
+        const svgClass = computed(() => {
+            if (props.className) {
+                return "svg-icon " + props.className;
+            }
+            else {
+                return "svg-icon";
+            }
+        });
+        return (_ctx, _cache) => {
+            return openBlock(), createElementBlock("svg", mergeProps({
+                class: unref(svgClass),
+                "aria-hidden": "true"
+            }, _ctx.$attrs), [
+                __props.title ? (openBlock(), createElementBlock("title", _hoisted_1$2, toDisplayString(__props.title), 1)) : createCommentVNode("v-if", true),
+                createElementVNode("use", { "xlink:href": unref(iconName) }, null, 8, _hoisted_2$2)
+            ], 16);
+        };
+    }
 });
 
-script$5.__scopeId = "data-v-d1ad5be8";
-script$5.__file = "src/component/svg/index.vue";
+script$5.__scopeId = "data-v-7e176a4b";
+script$5.__file = "packages/big-table/src/components/svg/index.vue";
 
 var iconPrefix = 'vxe-icon--';
 var GlobalConfig = {
@@ -38834,9 +38744,9 @@ var Grid = defineComponent(create({
     }
 }));
 
-Grid.install = function(app) {
-  app.component(Grid.name, Grid);
-  app.use(VXETableExport);
+Grid.install = function (app) {
+    app.component(Grid.name, Grid);
+    app.use(VXETableExport);
 };
 
 var script$4 = defineComponent({
@@ -38910,7 +38820,7 @@ var script$4 = defineComponent({
                 showHeaderOverflow: true,
                 highlightHoverRow: true,
                 highlightCurrentRow: true,
-                maxHeight: "500",
+                maxHeight: props.col.tableHeight || 200,
                 align: "center",
                 columns: state.columns,
                 data: state.data
@@ -39698,7 +39608,6 @@ var script$1 = /* @__PURE__ */ defineComponent({
         let _beforeSearchConvert = [];
         let addInlineEditPrimaryKey = "";
         const GROUP_TITLE_KEY = "group-show-title";
-        const route = useRoute();
         window.$message = useMessage();
         const xGrid = ref(null);
         const state = reactive(bigTableState);
@@ -39897,7 +39806,7 @@ var script$1 = /* @__PURE__ */ defineComponent({
         };
         const formatColumns = (map) => {
             let { selectType } = getOtherConfigInit() || {};
-            let { isBatchSelect, fieldList, showButtonTop, isScanMultiTable: isScanMultiTable2, isEdit = false, editConfig = {} } = map;
+            let { isBatchSelect, fieldList = [], showButtonTop, isScanMultiTable: isScanMultiTable2, isEdit = false, editConfig = {} } = map;
             if (isEdit) {
                 state.editConfig = Object.assign(state.editConfig, editConfig, {
                     mode: "cell",
@@ -39979,6 +39888,19 @@ var script$1 = /* @__PURE__ */ defineComponent({
                     treeNode = false;
                     type = "";
                 }
+                const getDefaultValue = (params) => {
+                    const value = params.row[item.columnName];
+                    if (item.formType === "select") {
+                        if (item.options) {
+                            return item.options.find((v) => v.value === value)?.label || "";
+                        }
+                        if (item.queryOptions) {
+                            return value;
+                        }
+                        return value;
+                    }
+                    return value;
+                };
                 const col = Object.assign(item, {
                     visible: item.columnName == "operatorColumn" ? showButtonTop == 0 : item.isShow == 1,
                     field: item.columnName,
@@ -40004,7 +39926,7 @@ var script$1 = /* @__PURE__ */ defineComponent({
                                 return formatter(params, item);
                             }
                             else {
-                                return createVNode("span", null, [params.row[item.columnName]]);
+                                return createVNode("span", null, [getDefaultValue(params)]);
                             }
                         }
                     },
@@ -41636,9 +41558,6 @@ var script$1 = /* @__PURE__ */ defineComponent({
             removeInlineAddRow();
             handleClickCancelBtnByInline();
         });
-        watch(() => route, (val) => {
-            resetTableInlineEditStatus();
-        });
         watch(() => props.tableRefreshCache, (val, oldVal) => {
             if (props.isNestTable)
                 return;
@@ -41806,6 +41725,99 @@ var script$1 = /* @__PURE__ */ defineComponent({
 
 script$1.__file = "packages/big-table/src/BigTable.vue";
 
+/*!
+  * vue-router v4.0.13
+  * (c) 2022 Eduardo San Martin Morote
+  * @license MIT
+  */
+
+const hasSymbol = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol';
+const PolySymbol = (name) => 
+// vr = vue router
+hasSymbol
+    ? Symbol((process.env.NODE_ENV !== 'production') ? '[vue-router]: ' + name : name)
+    : ((process.env.NODE_ENV !== 'production') ? '[vue-router]: ' : '_vr_') + name;
+// rvlm = Router View Location Matched
+/**
+ * RouteRecord being rendered by the closest ancestor Router View. Used for
+ * `onBeforeRouteUpdate` and `onBeforeRouteLeave`. rvlm stands for Router View
+ * Location Matched
+ *
+ * @internal
+ */
+/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router view location matched' : 'rvlm');
+/**
+ * Allows overriding the router view depth to control which component in
+ * `matched` is rendered. rvd stands for Router View Depth
+ *
+ * @internal
+ */
+/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router view depth' : 'rvd');
+/**
+ * Allows overriding the router instance returned by `useRouter` in tests. r
+ * stands for router
+ *
+ * @internal
+ */
+/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router' : 'r');
+/**
+ * Allows overriding the current route returned by `useRoute` in tests. rl
+ * stands for route location
+ *
+ * @internal
+ */
+const routeLocationKey = /*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'route location' : 'rl');
+/**
+ * Allows overriding the current route used by router-view. Internally this is
+ * used when the `route` prop is passed.
+ *
+ * @internal
+ */
+/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router view location' : 'rvl');
+
+var NavigationType;
+(function (NavigationType) {
+    NavigationType["pop"] = "pop";
+    NavigationType["push"] = "push";
+})(NavigationType || (NavigationType = {}));
+var NavigationDirection;
+(function (NavigationDirection) {
+    NavigationDirection["back"] = "back";
+    NavigationDirection["forward"] = "forward";
+    NavigationDirection["unknown"] = "";
+})(NavigationDirection || (NavigationDirection = {}));
+
+/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'navigation failure' : 'nf');
+/**
+ * Enumeration with all possible types for navigation failures. Can be passed to
+ * {@link isNavigationFailure} to check for specific failures.
+ */
+var NavigationFailureType;
+(function (NavigationFailureType) {
+    /**
+     * An aborted navigation is a navigation that failed because a navigation
+     * guard returned `false` or called `next(false)`
+     */
+    NavigationFailureType[NavigationFailureType["aborted"] = 4] = "aborted";
+    /**
+     * A cancelled navigation is a navigation that failed because a more recent
+     * navigation finished started (not necessarily finished).
+     */
+    NavigationFailureType[NavigationFailureType["cancelled"] = 8] = "cancelled";
+    /**
+     * A duplicated navigation is a navigation that failed because it was
+     * initiated while already being at the exact same location.
+     */
+    NavigationFailureType[NavigationFailureType["duplicated"] = 16] = "duplicated";
+})(NavigationFailureType || (NavigationFailureType = {}));
+/**
+ * Returns the current route location. Equivalent to using `$route` inside
+ * templates.
+ */
+function useRoute() {
+    return inject(routeLocationKey);
+}
+
 const _withScopeId = (n) => (pushScopeId("data-v-5cd39776"), n = n(), popScopeId(), n);
 const _hoisted_1 = { class: "fields-set-content" };
 const _hoisted_2 = { class: "fields-table" };

package/es/button-print/index.css

@@ -1,3 +1,19 @@
+
+.popver-content {
+  height: 400px;
+  overflow: hidden;
+  overflow-y: auto;
+}
+.popver-ul {
+  margin-bottom: 10px;
+}
+.ul-title {
+  font-size: 14px;
+  font-weight: 400;
+  color: rgba(145, 159, 190, 1);
+  line-height: 20px;
+}
+
 ul[data-v-5cd39776] {
   margin: 0;
   padding: 0;
@@ -180,22 +196,6 @@ ul[data-v-5cd39776] {
   text-overflow: ellipsis;
 }
 
-
-.popver-content {
-  height: 400px;
-  overflow: hidden;
-  overflow-y: auto;
-}
-.popver-ul {
-  margin-bottom: 10px;
-}
-.ul-title {
-  font-size: 14px;
-  font-weight: 400;
-  color: rgba(145, 159, 190, 1);
-  line-height: 20px;
-}
-
 body > .vxe-table--tooltip-wrapper {
   display: none !important;
 }
@@ -771,7 +771,7 @@ body > .vxe-table--tooltip-wrapper {
 }
 
 
-.svg-icon[data-v-d1ad5be8] {
+.svg-icon[data-v-7e176a4b] {
   width: 1em;
   height: 1em;
   vertical-align: -0.15em;

package/es/drag-layout/index.css

@@ -1,3 +1,19 @@
+
+.popver-content {
+  height: 400px;
+  overflow: hidden;
+  overflow-y: auto;
+}
+.popver-ul {
+  margin-bottom: 10px;
+}
+.ul-title {
+  font-size: 14px;
+  font-weight: 400;
+  color: rgba(145, 159, 190, 1);
+  line-height: 20px;
+}
+
 ul[data-v-5cd39776] {
   margin: 0;
   padding: 0;
@@ -180,22 +196,6 @@ ul[data-v-5cd39776] {
   text-overflow: ellipsis;
 }
 
-
-.popver-content {
-  height: 400px;
-  overflow: hidden;
-  overflow-y: auto;
-}
-.popver-ul {
-  margin-bottom: 10px;
-}
-.ul-title {
-  font-size: 14px;
-  font-weight: 400;
-  color: rgba(145, 159, 190, 1);
-  line-height: 20px;
-}
-
 body > .vxe-table--tooltip-wrapper {
   display: none !important;
 }
@@ -771,7 +771,7 @@ body > .vxe-table--tooltip-wrapper {
 }
 
 
-.svg-icon[data-v-d1ad5be8] {
+.svg-icon[data-v-7e176a4b] {
   width: 1em;
   height: 1em;
   vertical-align: -0.15em;

package/es/grid/index.css

@@ -1,3 +1,19 @@
+
+.popver-content {
+  height: 400px;
+  overflow: hidden;
+  overflow-y: auto;
+}
+.popver-ul {
+  margin-bottom: 10px;
+}
+.ul-title {
+  font-size: 14px;
+  font-weight: 400;
+  color: rgba(145, 159, 190, 1);
+  line-height: 20px;
+}
+
 ul[data-v-5cd39776] {
   margin: 0;
   padding: 0;
@@ -180,22 +196,6 @@ ul[data-v-5cd39776] {
   text-overflow: ellipsis;
 }
 
-
-.popver-content {
-  height: 400px;
-  overflow: hidden;
-  overflow-y: auto;
-}
-.popver-ul {
-  margin-bottom: 10px;
-}
-.ul-title {
-  font-size: 14px;
-  font-weight: 400;
-  color: rgba(145, 159, 190, 1);
-  line-height: 20px;
-}
-
 body > .vxe-table--tooltip-wrapper {
   display: none !important;
 }
@@ -771,7 +771,7 @@ body > .vxe-table--tooltip-wrapper {
 }
 
 
-.svg-icon[data-v-d1ad5be8] {
+.svg-icon[data-v-7e176a4b] {
   width: 1em;
   height: 1em;
   vertical-align: -0.15em;

package/es/index.css

@@ -70,7 +70,7 @@
 }
 
 
-.svg-icon[data-v-d1ad5be8] {
+.svg-icon[data-v-7e176a4b] {
   width: 1em;
   height: 1em;
   vertical-align: -0.15em;

package/es/index.js

@@ -30827,99 +30827,6 @@ Grid.install = function (app) {
     app.use(VXETableExport);
 };
 
-/*!
-  * vue-router v4.0.13
-  * (c) 2022 Eduardo San Martin Morote
-  * @license MIT
-  */
-
-const hasSymbol = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol';
-const PolySymbol = (name) => 
-// vr = vue router
-hasSymbol
-    ? Symbol((process.env.NODE_ENV !== 'production') ? '[vue-router]: ' + name : name)
-    : ((process.env.NODE_ENV !== 'production') ? '[vue-router]: ' : '_vr_') + name;
-// rvlm = Router View Location Matched
-/**
- * RouteRecord being rendered by the closest ancestor Router View. Used for
- * `onBeforeRouteUpdate` and `onBeforeRouteLeave`. rvlm stands for Router View
- * Location Matched
- *
- * @internal
- */
-/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router view location matched' : 'rvlm');
-/**
- * Allows overriding the router view depth to control which component in
- * `matched` is rendered. rvd stands for Router View Depth
- *
- * @internal
- */
-/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router view depth' : 'rvd');
-/**
- * Allows overriding the router instance returned by `useRouter` in tests. r
- * stands for router
- *
- * @internal
- */
-/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router' : 'r');
-/**
- * Allows overriding the current route returned by `useRoute` in tests. rl
- * stands for route location
- *
- * @internal
- */
-const routeLocationKey = /*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'route location' : 'rl');
-/**
- * Allows overriding the current route used by router-view. Internally this is
- * used when the `route` prop is passed.
- *
- * @internal
- */
-/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router view location' : 'rvl');
-
-var NavigationType;
-(function (NavigationType) {
-    NavigationType["pop"] = "pop";
-    NavigationType["push"] = "push";
-})(NavigationType || (NavigationType = {}));
-var NavigationDirection;
-(function (NavigationDirection) {
-    NavigationDirection["back"] = "back";
-    NavigationDirection["forward"] = "forward";
-    NavigationDirection["unknown"] = "";
-})(NavigationDirection || (NavigationDirection = {}));
-
-/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'navigation failure' : 'nf');
-/**
- * Enumeration with all possible types for navigation failures. Can be passed to
- * {@link isNavigationFailure} to check for specific failures.
- */
-var NavigationFailureType;
-(function (NavigationFailureType) {
-    /**
-     * An aborted navigation is a navigation that failed because a navigation
-     * guard returned `false` or called `next(false)`
-     */
-    NavigationFailureType[NavigationFailureType["aborted"] = 4] = "aborted";
-    /**
-     * A cancelled navigation is a navigation that failed because a more recent
-     * navigation finished started (not necessarily finished).
-     */
-    NavigationFailureType[NavigationFailureType["cancelled"] = 8] = "cancelled";
-    /**
-     * A duplicated navigation is a navigation that failed because it was
-     * initiated while already being at the exact same location.
-     */
-    NavigationFailureType[NavigationFailureType["duplicated"] = 16] = "duplicated";
-})(NavigationFailureType || (NavigationFailureType = {}));
-/**
- * Returns the current route location. Equivalent to using `$route` inside
- * templates.
- */
-function useRoute() {
-    return inject(routeLocationKey);
-}
-
 const bigTableState = {
     curAbleCheckedLen: 0,
     showButtonTop: 0,
@@ -31127,7 +31034,8 @@ const bigTableEmits = [
     "setNestLastClickTable",
     "selectionChangeLocal",
     "switchBtnOnChange",
-    "asyncTableChange"
+    "asyncTableChange",
+    "clickSelectTable"
 ];
 
 var moment$1 = {exports: {}};
@@ -38582,7 +38490,7 @@ const useNestTable = (props, state, emit) => {
 
 const useEdit = (props, state, emit, xGrid) => {
     const initEditTable = async () => {
-        const { isEdit, fieldList } = props.columnConfig;
+        const { isEdit, fieldList = [] } = props.columnConfig;
         if (!isEdit)
             return;
         const hasSelectTable = fieldList.find((v) => v.formType === "selectTable");
@@ -38628,6 +38536,7 @@ const useEdit = (props, state, emit, xGrid) => {
         }
     };
     const onClickSelectTable = async (row) => {
+        emit("clickSelectTable", { row });
         const record = {
             initRow: false,
             row: JSON.parse(JSON.stringify(row))
@@ -38802,47 +38711,43 @@ var script$b = /* @__PURE__ */ defineComponent({
 script$b.__scopeId = "data-v-6633a934";
 script$b.__file = "packages/big-table/src/components/TextOverTooltip.vue";
 
-const _hoisted_1$6 = { key: 0 };
-const _hoisted_2$6 = ["xlink:href"];
-const __default__$7 = {
-  name: "SvgIcon"
-};
-var script$a = /* @__PURE__ */ defineComponent({
-  ...__default__$7,
-  props: {
-    iconClass: { type: String, required: true, default: "" },
-    title: { type: String, required: true, default: "" },
-    className: { type: String, required: false }
-  },
-  setup(__props) {
-    const props = __props;
-    const iconName = computed(() => `#icon-${props.iconClass}`);
-    const svgClass = computed(() => {
-      if (props.className) {
-        return "svg-icon " + props.className;
-      } else {
-        return "svg-icon";
-      }
-    });
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("svg", mergeProps({
-        class: unref(svgClass),
-        "aria-hidden": "true"
-      }, _ctx.$attrs), [
-        __props.title ? (openBlock(), createElementBlock("title", _hoisted_1$6, toDisplayString(__props.title), 1)) : createCommentVNode("v-if", true),
-        createElementVNode("use", { "xlink:href": unref(iconName) }, null, 8, _hoisted_2$6)
-      ], 16);
-    };
-  }
+const _hoisted_1$6 = { key: 0 };
+const _hoisted_2$6 = ["xlink:href"];
+const __default__$7 = {
+    name: "SvgIcon"
+};
+var script$a = /* @__PURE__ */ defineComponent({
+    ...__default__$7,
+    props: {
+        iconClass: { type: String, required: true, default: "" },
+        title: { type: String, required: true, default: "" },
+        className: { type: String, required: false }
+    },
+    setup(__props) {
+        const props = __props;
+        const iconName = computed(() => `#icon-${props.iconClass}`);
+        const svgClass = computed(() => {
+            if (props.className) {
+                return "svg-icon " + props.className;
+            }
+            else {
+                return "svg-icon";
+            }
+        });
+        return (_ctx, _cache) => {
+            return openBlock(), createElementBlock("svg", mergeProps({
+                class: unref(svgClass),
+                "aria-hidden": "true"
+            }, _ctx.$attrs), [
+                __props.title ? (openBlock(), createElementBlock("title", _hoisted_1$6, toDisplayString(__props.title), 1)) : createCommentVNode("v-if", true),
+                createElementVNode("use", { "xlink:href": unref(iconName) }, null, 8, _hoisted_2$6)
+            ], 16);
+        };
+    }
 });
 
-script$a.__scopeId = "data-v-d1ad5be8";
-script$a.__file = "src/component/svg/index.vue";
-
-Grid.install = function(app) {
-  app.component(Grid.name, Grid);
-  app.use(VXETableExport);
-};
+script$a.__scopeId = "data-v-7e176a4b";
+script$a.__file = "packages/big-table/src/components/svg/index.vue";
 
 var script$9 = defineComponent({
     name: "EditSelectTable",
@@ -38915,7 +38820,7 @@ var script$9 = defineComponent({
                 showHeaderOverflow: true,
                 highlightHoverRow: true,
                 highlightCurrentRow: true,
-                maxHeight: "500",
+                maxHeight: props.col.tableHeight || 200,
                 align: "center",
                 columns: state.columns,
                 data: state.data
@@ -39703,7 +39608,6 @@ var script$6 = /* @__PURE__ */ defineComponent({
         let _beforeSearchConvert = [];
         let addInlineEditPrimaryKey = "";
         const GROUP_TITLE_KEY = "group-show-title";
-        const route = useRoute();
         window.$message = useMessage();
         const xGrid = ref(null);
         const state = reactive(bigTableState);
@@ -39902,7 +39806,7 @@ var script$6 = /* @__PURE__ */ defineComponent({
         };
         const formatColumns = (map) => {
             let { selectType } = getOtherConfigInit() || {};
-            let { isBatchSelect, fieldList, showButtonTop, isScanMultiTable: isScanMultiTable2, isEdit = false, editConfig = {} } = map;
+            let { isBatchSelect, fieldList = [], showButtonTop, isScanMultiTable: isScanMultiTable2, isEdit = false, editConfig = {} } = map;
             if (isEdit) {
                 state.editConfig = Object.assign(state.editConfig, editConfig, {
                     mode: "cell",
@@ -39984,6 +39888,19 @@ var script$6 = /* @__PURE__ */ defineComponent({
                     treeNode = false;
                     type = "";
                 }
+                const getDefaultValue = (params) => {
+                    const value = params.row[item.columnName];
+                    if (item.formType === "select") {
+                        if (item.options) {
+                            return item.options.find((v) => v.value === value)?.label || "";
+                        }
+                        if (item.queryOptions) {
+                            return value;
+                        }
+                        return value;
+                    }
+                    return value;
+                };
                 const col = Object.assign(item, {
                     visible: item.columnName == "operatorColumn" ? showButtonTop == 0 : item.isShow == 1,
                     field: item.columnName,
@@ -40009,7 +39926,7 @@ var script$6 = /* @__PURE__ */ defineComponent({
                                 return formatter(params, item);
                             }
                             else {
-                                return createVNode("span", null, [params.row[item.columnName]]);
+                                return createVNode("span", null, [getDefaultValue(params)]);
                             }
                         }
                     },
@@ -41641,9 +41558,6 @@ var script$6 = /* @__PURE__ */ defineComponent({
             removeInlineAddRow();
             handleClickCancelBtnByInline();
         });
-        watch(() => route, (val) => {
-            resetTableInlineEditStatus();
-        });
         watch(() => props.tableRefreshCache, (val, oldVal) => {
             if (props.isNestTable)
                 return;
@@ -41811,6 +41725,99 @@ var script$6 = /* @__PURE__ */ defineComponent({
 
 script$6.__file = "packages/big-table/src/BigTable.vue";
 
+/*!
+  * vue-router v4.0.13
+  * (c) 2022 Eduardo San Martin Morote
+  * @license MIT
+  */
+
+const hasSymbol = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol';
+const PolySymbol = (name) => 
+// vr = vue router
+hasSymbol
+    ? Symbol((process.env.NODE_ENV !== 'production') ? '[vue-router]: ' + name : name)
+    : ((process.env.NODE_ENV !== 'production') ? '[vue-router]: ' : '_vr_') + name;
+// rvlm = Router View Location Matched
+/**
+ * RouteRecord being rendered by the closest ancestor Router View. Used for
+ * `onBeforeRouteUpdate` and `onBeforeRouteLeave`. rvlm stands for Router View
+ * Location Matched
+ *
+ * @internal
+ */
+/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router view location matched' : 'rvlm');
+/**
+ * Allows overriding the router view depth to control which component in
+ * `matched` is rendered. rvd stands for Router View Depth
+ *
+ * @internal
+ */
+/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router view depth' : 'rvd');
+/**
+ * Allows overriding the router instance returned by `useRouter` in tests. r
+ * stands for router
+ *
+ * @internal
+ */
+/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router' : 'r');
+/**
+ * Allows overriding the current route returned by `useRoute` in tests. rl
+ * stands for route location
+ *
+ * @internal
+ */
+const routeLocationKey = /*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'route location' : 'rl');
+/**
+ * Allows overriding the current route used by router-view. Internally this is
+ * used when the `route` prop is passed.
+ *
+ * @internal
+ */
+/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'router view location' : 'rvl');
+
+var NavigationType;
+(function (NavigationType) {
+    NavigationType["pop"] = "pop";
+    NavigationType["push"] = "push";
+})(NavigationType || (NavigationType = {}));
+var NavigationDirection;
+(function (NavigationDirection) {
+    NavigationDirection["back"] = "back";
+    NavigationDirection["forward"] = "forward";
+    NavigationDirection["unknown"] = "";
+})(NavigationDirection || (NavigationDirection = {}));
+
+/*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'navigation failure' : 'nf');
+/**
+ * Enumeration with all possible types for navigation failures. Can be passed to
+ * {@link isNavigationFailure} to check for specific failures.
+ */
+var NavigationFailureType;
+(function (NavigationFailureType) {
+    /**
+     * An aborted navigation is a navigation that failed because a navigation
+     * guard returned `false` or called `next(false)`
+     */
+    NavigationFailureType[NavigationFailureType["aborted"] = 4] = "aborted";
+    /**
+     * A cancelled navigation is a navigation that failed because a more recent
+     * navigation finished started (not necessarily finished).
+     */
+    NavigationFailureType[NavigationFailureType["cancelled"] = 8] = "cancelled";
+    /**
+     * A duplicated navigation is a navigation that failed because it was
+     * initiated while already being at the exact same location.
+     */
+    NavigationFailureType[NavigationFailureType["duplicated"] = 16] = "duplicated";
+})(NavigationFailureType || (NavigationFailureType = {}));
+/**
+ * Returns the current route location. Equivalent to using `$route` inside
+ * templates.
+ */
+function useRoute() {
+    return inject(routeLocationKey);
+}
+
 const _withScopeId$1 = (n) => (pushScopeId("data-v-5cd39776"), n = n(), popScopeId(), n);
 const _hoisted_1$4 = { class: "fields-set-content" };
 const _hoisted_2$4 = { class: "fields-table" };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.0.0",
+  "version": "3.0.1",
   "main": "es/index.js",
   "module": "es/index.js",
   "scripts": {
@@ -50,12 +50,10 @@
     "rollup-plugin-delete": "^2.0.0",
     "rollup-plugin-esbuild": "^4.9.1",
     "rollup-plugin-external-globals": "^0.6.1",
-    "rollup-plugin-jsx": "^1.0.3",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.31.2",
     "rollup-plugin-vue": "^6.0.0",
-    "rollup-plugin-vue-jsx-compat": "0.0.6",
     "standard-version": "^9.3.2",
     "typescript": "^4.5.4",
     "vite": "^2.8.0",

package/packages/big-table/src/BigTable.vue

@@ -163,7 +163,7 @@ export default create({
 
 <script lang="tsx" setup>
 import { computed, nextTick, onMounted, reactive, ref, useAttrs, watch, isReactive, shallowReactive, onActivated, onUnmounted } from "vue";
-import { useRoute } from 'vue-router';
+// import { useRoute } from 'vue-router';
 import bigTableState from "./bigTableState";
 import bigTableProps from "./bigTableProps";
 import bigTableEmits from "./bigTableEmits";
@@ -175,9 +175,8 @@ import { useEdit } from './hooks/useEdit';
 import { SettingsSharp, SyncOutline, CopyOutline, CaretDown, CaretForward } from "@vicons/ionicons5";
 import NoData from "./components/NoData.vue";
 import TextOverTooltip from "./components/TextOverTooltip.vue";
-import SvgIcon from '@/component/svg/index.vue';
-// import SvgIcon from "./components/SvgIcon.vue";
-// import EditForm from './components/edit-form/EditForm.vue';
+// import SvgIcon from '@/component/svg/index.vue';
+import SvgIcon from './components/svg/index.vue'
 import EditSelectTable from './components/edit-form/edit-select-table.vue'
 import EditInput from './components/edit-form/edit-input.vue'
 import EditSelect from './components/edit-form/edit-select.vue'
@@ -195,13 +194,10 @@ import {
   NSwitch,
   NPopover,
   NDropdown,
-  NPopconfirm,
-  NSelect,
-  NPagination,
-  NEmpty
+  NPopconfirm
 } from "naive-ui";
 import { useMessage } from 'naive-ui'
-import CGrid from '~/grid/index.ts';
+import CGrid from '~/grid';
 import vexutils from '@/utils/vexutils.js';
 import {
   getEvaluate,
@@ -248,7 +244,7 @@ let addInlineEditPrimaryKey: any = '';
 
 const GROUP_TITLE_KEY = "group-show-title";
 
-const route = useRoute();
+// const route = useRoute();
 
 (window as any).$message = useMessage()
 
@@ -521,7 +517,7 @@ const formatColumns = (map: any) => {
    */
   // 配置列表
   let { selectType } = getOtherConfigInit() || {};
-  let { isBatchSelect, fieldList, showButtonTop, isScanMultiTable, isEdit = false, editConfig = {} } = map;
+  let { isBatchSelect, fieldList = [], showButtonTop, isScanMultiTable, isEdit = false, editConfig = {} } = map;
   if (isEdit) {
     state.editConfig = Object.assign(state.editConfig, editConfig, {
       mode: 'cell', 
@@ -631,6 +627,24 @@ const formatColumns = (map: any) => {
       type = "";
     }
 
+    const getDefaultValue = (params: any) => {
+      const value = params.row[item.columnName]
+      if (item.formType === 'select') {
+        // console.log('rowrowrow', params.row, value, item)
+        if (item.options) {
+          return item.options.find((v: any) => v.value === value)?.label || ''
+        }
+        if (item.queryOptions) {
+          return value
+          // setTimeout(() => {
+          //   return (params.row[`${col.columnName}_options`]?.find((v: any) => v.value === value)?.label) || ''
+          // }, 1500)
+        }
+        return value
+      } 
+      return value
+    }
+
     const col = Object.assign(item, {
       visible: item.columnName == "operatorColumn" ? showButtonTop == 0 : item.isShow == 1,
       field: item.columnName,
@@ -664,7 +678,7 @@ const formatColumns = (map: any) => {
           if(!isEdit || item.columnName === 'operatorColumn' || !item.isEdit) {
             return formatter(params, item)
           } else {
-            return <span>{params.row[item.columnName]}</span>
+            return <span>{getDefaultValue(params)}</span>
           }
         }
       },
@@ -2514,12 +2528,12 @@ watch(
     handleClickCancelBtnByInline();
   }
 )
-watch(
-  () => route,
-  val => {
-    resetTableInlineEditStatus();
-  }
-)
+// watch(
+//   () => route,
+//   val => {
+//     resetTableInlineEditStatus();
+//   }
+// )
 watch(
   () => props.tableRefreshCache,
   (val, oldVal) => {

package/packages/big-table/src/bigTableEmits.ts

@@ -40,7 +40,8 @@ const bigTableEmits: string[] = [
   "setNestLastClickTable",
   "selectionChangeLocal",
   "switchBtnOnChange",
-  "asyncTableChange"
+  "asyncTableChange",
+  "clickSelectTable"
 ];
 
 export default bigTableEmits;

package/packages/big-table/src/components/edit-form/edit-select-table.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, ref, reactive } from 'vue'
 import { NSelect, NPagination, NEmpty, NSpin, NSpace } from 'naive-ui'
-import CGrid from '~/grid/index.ts'
+import CGrid from '~/grid'
 import vexutils from '@/utils/vexutils.js'
 
 export default defineComponent({
@@ -77,7 +77,7 @@ export default defineComponent({
         showHeaderOverflow: true,
         highlightHoverRow: true,
         highlightCurrentRow: true,
-        maxHeight: '500',
+        maxHeight: (props.col.tableHeight || 200),
         align: 'center',
         columns: state.columns,
         data: state.data

package/packages/big-table/src/components/svg/index.vue

@@ -0,0 +1,49 @@
+<template>
+  <svg :class="svgClass" aria-hidden="true" v-bind="$attrs">
+    <title v-if="title">{{ title }}</title>
+    <use :xlink:href="iconName" />
+  </svg>
+</template>
+
+<script lang="ts">
+export default {
+  name: "SvgIcon"
+}
+</script>
+<script lang="ts" setup>
+import { ref, computed } from 'vue'
+// svg图标组件 使用方式
+// 将svg图片放入 /assets/icons/svg/图片名称.svg
+// vue页面中 <svg-icon icon-class="图片名称"></svg-icon>
+
+  const props = withDefaults(defineProps<{
+    iconClass: string
+    title: string
+    className?: string
+  }>(), {
+    iconClass: '',
+    title: '',
+    default: ''
+  })
+  
+  const iconName = computed(() => `#icon-${props.iconClass}`)
+
+  const svgClass = computed(() => {
+    if (props.className) {
+      return "svg-icon " + props.className;
+    } else {
+      return "svg-icon";
+    }
+  })
+   
+</script>
+
+<style scoped>
+.svg-icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+</style>

package/packages/big-table/src/hooks/useEdit.ts

@@ -2,7 +2,7 @@ import { computed, ref, reactive, watch, onMounted } from 'vue'
 
 export const useEdit = (props: any, state: any, emit: any, xGrid: any) => {
   const initEditTable = async () => {
-    const { isEdit, fieldList } = props.columnConfig
+    const { isEdit, fieldList = [] } = props.columnConfig
     if (!isEdit) return
     const hasSelectTable = fieldList.find((v: any) => v.formType === 'selectTable')
     if (!hasSelectTable) return
@@ -47,6 +47,7 @@ export const useEdit = (props: any, state: any, emit: any, xGrid: any) => {
   }
   
   const onClickSelectTable = async (row: any) => {
+    emit('clickSelectTable', { row })
     const record: any = {
       initRow: false,
       row: JSON.parse(JSON.stringify(row))
@@ -60,8 +61,15 @@ export const useEdit = (props: any, state: any, emit: any, xGrid: any) => {
       }
     })
     const getInsertRecords = xGrid.value.getInsertRecords()
-    await xGrid.value.insertAt(record, getInsertRecords.at(-1))
+    const { row: newRow } = await xGrid.value.insertAt(record, getInsertRecords.at(-1))
     xGrid.value.clearActived()
+    // xGrid.value.setActiveRow(newRow)
+    // props.columnConfig.fieldList.forEach((col: any) => {
+    //   console.log('--------------2', col.columnName, col.columnName !== 'operatorColumn' && col.isShow && col.isEdit && col.formType !== 'selectTable')
+    //   if (col.columnName !== 'operatorColumn' && col.isShow && col.isEdit && col.formType !== 'selectTable') {
+    //     xGrid.value.setActiveRow(newRow)
+    //   }
+    // })
   }
   
   return {