cnhis-design-vue 3.0.3 → 3.0.4

package/es/index.css

@@ -394,11 +394,11 @@ body > .vxe-table--tooltip-wrapper {
   width: var(--tableImageWidth);
 }
 
+/*
 @font-face {
   font-family: "iconfont";
-  /* Project id  */
   src: url('iconfont.ttf?t=1631151904509') format('truetype');
-}
+}*/
 .iconfont {
   font-family: "iconfont" !important;
   font-size: 16px;
@@ -438,6 +438,16 @@ body > .vxe-table--tooltip-wrapper {
   overflow: hidden;
   -webkit-transition: width 2s;
   transition: width 2s;
+  /*
+  .sort-icon-asc {
+    background-image: url('../img/icon-asc.png');
+  }
+  */
+  /*
+  .sort-icon-desc {
+    background-image: url('../img/icon-desc.png');
+  }
+  */
 }
 .big-table-filter-wrap .sort-list {
   margin-top: 6px;
@@ -464,18 +474,12 @@ body > .vxe-table--tooltip-wrapper {
   background-size: contain;
   display: inline-block;
 }
-.big-table-filter-wrap .sort-icon-asc {
-  background-image: url('../img/icon-asc.png');
-}
 .big-table-filter-wrap .sort-text {
   margin-left: 11px;
   font-size: 14px;
   line-height: 32px;
   color: rgba(0, 0, 0, 0.8);
 }
-.big-table-filter-wrap .sort-icon-desc {
-  background-image: url('../img/icon-desc.png');
-}
 .big-table-filter-wrap .filter-header {
   padding: 0 13px;
   cursor: initial;
@@ -582,11 +586,11 @@ body > .vxe-table--tooltip-wrapper {
   height: 20px;
 }
 
-ul[data-v-5cd39776] {
+ul[data-v-726261b7] {
   margin: 0;
   padding: 0;
 }
-.fields-set-content[data-v-5cd39776] {
+.fields-set-content[data-v-726261b7] {
   height: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -599,7 +603,7 @@ ul[data-v-5cd39776] {
           flex-direction: column;
   overflow: hidden;
 }
-.fields-set-content[data-v-5cd39776] .fields-table[data-v-5cd39776] {
+.fields-set-content[data-v-726261b7] .fields-table[data-v-726261b7] {
   -webkit-box-flex: 1;
   -webkit-flex: 1;
       -ms-flex: 1;
@@ -615,42 +619,42 @@ ul[data-v-5cd39776] {
           flex-direction: column;
   overflow: auto;
 }
-.setting-view[data-v-5cd39776] {
+.setting-view[data-v-726261b7] {
   height: 100%;
   position: relative;
 }
-.setting-view[data-v-5cd39776] [data-v-5cd39776] .n-spin-container {
+.setting-view[data-v-726261b7] [data-v-726261b7] .n-spin-container {
   width: 100%;
   height: 100%;
 }
-.setting-view[data-v-5cd39776] [data-v-5cd39776] .n-spin-content {
+.setting-view[data-v-726261b7] [data-v-726261b7] .n-spin-content {
   height: 100%;
 }
-.setting-view[data-v-5cd39776] .setting-title[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .setting-title[data-v-726261b7] {
   background: #f2f2f4;
   border: 1px solid #f2f2f2;
   height: 52px;
   line-height: 52px;
 }
-.setting-view[data-v-5cd39776] .setting-title[data-v-5cd39776] span[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .setting-title[data-v-726261b7] span[data-v-726261b7] {
   display: inline-block;
 }
-.setting-view[data-v-5cd39776] .setting-title[data-v-5cd39776].seting-title-api[data-v-5cd39776] .width-large[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .setting-title[data-v-726261b7].seting-title-api[data-v-726261b7] .width-large[data-v-726261b7] {
   width: 15%;
 }
-.setting-view[data-v-5cd39776] .set-show[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .set-show[data-v-726261b7] {
   min-height: 100px;
   overflow-y: auto;
 }
-.setting-view[data-v-5cd39776] .set-show[data-v-5cd39776].set-show-api[data-v-5cd39776] .width-large[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .set-show[data-v-726261b7].set-show-api[data-v-726261b7] .width-large[data-v-726261b7] {
   width: 15%;
 }
-.setting-view[data-v-5cd39776] .set-show[data-v-5cd39776] .left-style.sortable-chosen[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .set-show[data-v-726261b7] .left-style.sortable-chosen[data-v-726261b7] {
   background: #fafafa;
   -webkit-box-shadow: 0px 0px 10px 0px #d5d5d5;
           box-shadow: 0px 0px 10px 0px #d5d5d5;
 }
-.setting-view[data-v-5cd39776] .set-show[data-v-5cd39776] li[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .set-show[data-v-726261b7] li[data-v-726261b7] {
   padding: 5px 0;
   display: -webkit-box;
   display: -webkit-flex;
@@ -664,7 +668,7 @@ ul[data-v-5cd39776] {
   height: 52px;
   line-height: 52px;
 }
-.setting-view[data-v-5cd39776] .set-show[data-v-5cd39776] .alias-style[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .set-show[data-v-726261b7] .alias-style[data-v-726261b7] {
   outline: none;
   border-radius: 4px 4px 4px 4px;
   border: solid 1px #d5d5d5;
@@ -673,7 +677,7 @@ ul[data-v-5cd39776] {
   color: #38454f;
   width: 100%;
 }
-.setting-view[data-v-5cd39776] .set-show[data-v-5cd39776] .is-sort-style[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .set-show[data-v-726261b7] .is-sort-style[data-v-726261b7] {
   outline: none;
   border-radius: 4px 4px 4px 4px;
   border: solid 1px #d5d5d5;
@@ -683,14 +687,14 @@ ul[data-v-5cd39776] {
   width: 87px;
   margin-right: 5px;
 }
-.setting-view[data-v-5cd39776] .set-show[data-v-5cd39776] .is-sort-style[data-v-5cd39776][data-v-5cd39776]:disabled {
+.setting-view[data-v-726261b7] .set-show[data-v-726261b7] .is-sort-style[data-v-726261b7][data-v-726261b7]:disabled {
   cursor: not-allowed;
   background: #f5f5f5;
 }
-.setting-view[data-v-5cd39776] .set-show[data-v-5cd39776] .col-width-style[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .set-show[data-v-726261b7] .col-width-style[data-v-726261b7] {
   width: 70px;
 }
-.setting-view[data-v-5cd39776] .set-show[data-v-5cd39776] .title-item[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .set-show[data-v-726261b7] .title-item[data-v-726261b7] {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
   display: -ms-inline-flexbox;
@@ -705,14 +709,14 @@ ul[data-v-5cd39776] {
           align-items: center;
   text-align: left;
 }
-.setting-view[data-v-5cd39776] .set-show[data-v-5cd39776] .title-item[data-v-5cd39776] > span[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .set-show[data-v-726261b7] .title-item[data-v-726261b7] > span[data-v-726261b7] {
   display: inline-block;
   max-width: calc(100% - 20px);
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
-.setting-view[data-v-5cd39776] .alias-style[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .alias-style[data-v-726261b7] {
   outline: none;
   border-radius: 4px 4px 4px 4px;
   border: solid 1px #d4dee5;
@@ -720,43 +724,43 @@ ul[data-v-5cd39776] {
   text-indent: 16px;
   color: #38454f;
 }
-.setting-view[data-v-5cd39776] .btn-operate[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .btn-operate[data-v-726261b7] {
   border-top: 1px solid #d5d5d5;
   padding: 12px 0 12px;
 }
-.setting-view[data-v-5cd39776] .width-show[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .width-show[data-v-726261b7] {
   display: inline-block;
   width: 10%;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
-.setting-view[data-v-5cd39776] .drag-icon-wrap[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .drag-icon-wrap[data-v-726261b7] {
   width: 5% !important;
   cursor: pointer;
   text-align: center;
 }
-.setting-view[data-v-5cd39776] .width-showed[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .width-showed[data-v-726261b7] {
   display: inline-block;
   width: 15%;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
-.setting-view[data-v-5cd39776] .width-showed[data-v-5cd39776] select[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .width-showed[data-v-726261b7] select[data-v-726261b7] {
   width: 90% !important;
 }
-.setting-view[data-v-5cd39776] .width-word[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .width-word[data-v-726261b7] {
   display: inline-block;
   width: 20%;
   line-height: 52px;
   overflow: hidden;
   white-space: nowrap;
 }
-.setting-view[data-v-5cd39776] .width-word[data-v-5cd39776] input[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .width-word[data-v-726261b7] input[data-v-726261b7] {
   width: 90% !important;
 }
-.setting-view[data-v-5cd39776] .width-large[data-v-5cd39776] {
+.setting-view[data-v-726261b7] .width-large[data-v-726261b7] {
   display: inline-block;
   width: 20%;
   overflow: hidden;

package/es/index.js

@@ -39810,7 +39810,7 @@ var script$6 = /* @__PURE__ */ defineComponent({
             }
         };
         const getEditBtn = (row, col, index) => {
-            return col.tileBtnList.map((btn) => {
+            return col.tileBtnList?.map((btn) => {
                 if (btn.settingObj[0].trigger_type === "DELETE") {
                     return createVNode(NPopconfirm, {
                         "onPositiveClick": () => deleteRow(row, col, index)
@@ -41539,100 +41539,11 @@ 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);
-}
+script$6.install = function (app) {
+    app.component(script$6.name, script$6);
+};
 
-const _withScopeId$1 = (n) => (pushScopeId("data-v-5cd39776"), n = n(), popScopeId(), n);
+const _withScopeId$1 = (n) => (pushScopeId("data-v-726261b7"), n = n(), popScopeId(), n);
 const _hoisted_1$4 = { class: "fields-set-content" };
 const _hoisted_2$4 = { class: "fields-table" };
 const _hoisted_3$3 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("span", {
@@ -41706,7 +41617,6 @@ var script$5 = /* @__PURE__ */ defineComponent({
     emits: ["onSave", "onClose"],
     setup(__props, { emit }) {
         const props = __props;
-        const route = useRoute();
         const settingView = ref(null);
         const state = reactive({
             spinning: false,
@@ -41723,9 +41633,6 @@ var script$5 = /* @__PURE__ */ defineComponent({
             };
         };
         const isMiddleAndAdmin = computed(() => props.menuSource == "middle");
-        computed(() => {
-            return route.fullPath.includes("middleListDetail");
-        });
         const showCheckBox = (key) => {
             return state.fields.some((i) => Object.prototype.hasOwnProperty.call(i, key));
         };
@@ -41968,16 +41875,12 @@ var script$5 = /* @__PURE__ */ defineComponent({
     }
 });
 
-script$5.__scopeId = "data-v-5cd39776";
-script$5.__file = "packages/big-table/src/FieldSet.vue";
+script$5.__scopeId = "data-v-726261b7";
+script$5.__file = "packages/field-set/src/FieldSet.vue";
 
-script$6.install = function (app) {
-    app.component(script$6.name, script$6);
+script$5.install = function (app) {
     app.component(script$5.name, script$5);
-};
-Object.assign(script$6, {
-    FieldSet: script$5
-});
+};
 
 const _hoisted_1$3 = { class: "DragFormLeftItem" };
 const _hoisted_2$3 = {
@@ -45745,6 +45648,7 @@ script.install = function (app) {
 const components = [
     Grid,
     script$6,
+    script$5,
     script$2,
     script
 ];
@@ -45758,4 +45662,4 @@ var index = {
     ...components
 };
 
-export { script$6 as CBigTable, script as CButtonPrint, script$2 as CDragLayout, Grid as CGrid, index as default };
+export { script$6 as CBigTable, script as CButtonPrint, script$2 as CDragLayout, script$5 as CFieldSet, Grid as CGrid, index as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.0.3",
+  "version": "3.0.4",
   "main": "es/index.js",
   "module": "es/index.js",
   "scripts": {

package/packages/big-table/index.ts

@@ -2,21 +2,16 @@ import type { App } from "vue";
 // import XEUtils from "xe-utils";
 // 导入组件
 import BigTable from "./src/BigTable.vue"
-import FieldSet from './src/FieldSet.vue'
 
 // type SFCWithInstall<T> = T & { install(app: App): void }; // vue 安装
 
 // 为组件提供 install 安装方法，供按需引入
 BigTable.install = function(app: App) {
   app.component(BigTable.name, BigTable);
-  app.component(FieldSet.name, FieldSet)
   // app.config.globalProperties.$utils = XEUtils;
 };
 
 // const CBigTable: SFCWithInstall<typeof BigTable> = BigTable; // 增加类型
 
-Object.assign(BigTable, {
-  FieldSet
-});
 // 默认导出组件
 export default BigTable;

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

@@ -729,7 +729,7 @@ const formatterEdit = (params: any, col: any) => {
   }
 }
 const getEditBtn = (row: any, col: any, index: number) => {
-  return col.tileBtnList.map((btn: any) => {
+  return col.tileBtnList?.map((btn: any) => {
     if (btn.settingObj[0].trigger_type === 'DELETE') {
       return <NPopconfirm
         onPositiveClick={() => deleteRow(row, col, index)}

package/packages/big-table/src/assets/iconfont/iconfont.less

@@ -1,7 +1,8 @@
+/*
 @font-face {
-  font-family: "iconfont"; /* Project id  */
+  font-family: "iconfont";
   src: url('iconfont.ttf?t=1631151904509') format('truetype');
-}
+}*/
 
 .iconfont {
   font-family: "iconfont" !important;

package/packages/big-table/src/assets/style/table-global.less

@@ -41,9 +41,11 @@
     display: inline-block;
   }
 
+  /*
   .sort-icon-asc {
     background-image: url('../img/icon-asc.png');
   }
+  */
 
   .sort-text {
     margin-left: 11px;
@@ -52,9 +54,11 @@
     color: rgba(0, 0, 0, 0.8);
   }
 
+  /*
   .sort-icon-desc {
     background-image: url('../img/icon-desc.png');
   }
+  */
 
   .filter-header {
     padding: 0 13px;

package/packages/field-set/index.ts

@@ -0,0 +1,15 @@
+import type { App } from "vue";
+// 导入组件
+import FieldSet from './src/FieldSet.vue'
+
+// type SFCWithInstall<T> = T & { install(app: App): void }; // vue 安装
+
+// 为组件提供 install 安装方法，供按需引入
+FieldSet.install = function(app: App) {
+  app.component(FieldSet.name, FieldSet);
+};
+
+// const CBigTable: SFCWithInstall<typeof BigTable> = BigTable; // 增加类型
+
+// 默认导出组件
+export default FieldSet;

package/packages/{big-table → field-set}/src/FieldSet.vue

@@ -128,7 +128,6 @@ export default create({
 </script>
 <script lang="ts" setup>
 import { reactive, onMounted, computed, ref, toRefs } from "vue";
-import { useRoute, useRouter } from "vue-router";
 import draggable from "vuedraggable";
 import { NButton, NCheckbox, NSpin, NTooltip } from "naive-ui";
 
@@ -170,7 +169,6 @@ type Istate = {
   };
   fields: Ifields[];
 };
-const route = useRoute();
 
 const emit = defineEmits(["onSave", "onClose"]);
 
@@ -216,10 +214,6 @@ const leftStyle = (ele: Ifields) => {
 
 const isMiddleAndAdmin = computed(() => props.menuSource == "middle");
 
-const isMenuSource = computed(() => {
-  return route.fullPath.includes("middleListDetail");
-});
-
 const showCheckBox = (key: string) => {
   return state.fields.some((i: Ifields) => Object.prototype.hasOwnProperty.call(i, key));
 };

package/packages/index.ts

@@ -2,6 +2,7 @@ import type { App } from "vue";
 // 导入组件
 import { default as CGrid } from './grid';
 import { default as CBigTable } from './big-table';
+import { default as CFieldSet } from './field-set';
 import { default as CDragLayout } from './drag-layout';
 import { default as CButtonPrint } from './button-print';
 
@@ -9,6 +10,7 @@ import { default as CButtonPrint } from './button-print';
 const components: any[] = [
   CGrid,
   CBigTable,
+  CFieldSet,
   CDragLayout,
   CButtonPrint
 ];
@@ -23,6 +25,7 @@ const install = function(app: App) {
 export {
   CGrid,
   CBigTable,
+  CFieldSet,
   CDragLayout,
   CButtonPrint
 }