cnhis-design-vue 3.1.7 → 3.1.8-beta.3

package/es/packages/form-table/style/index.less

@@ -1,301 +1,301 @@
-.table-form-age-error {
-  border-color: red !important;
-
-  .table-age-input {
-    border-color: red !important;
-  }
-
-  .n-select-selection--single {
-    border-color: red !important;
-  }
-}
-
-.table-date-picker {
-  min-width: unset !important;
-  width: 100%;
-}
-
-.table-date-picker-error {
-  .n-input {
-    border-color: red !important;
-  }
-}
-
-.text-over-tooltip-components {
-  display: inline-block;
-  max-width: 100%;
-  /* 文字超出宽度显示省略号 单行 */
-
-  .ellipsis {
-    font-size: 14px;
-    color: #35393c;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-
-    i {
-      font-style: normal;
-      word-break: keep-all;
-      white-space: nowrap;
-    }
-  }
-
-  /* 自定义样式 */
-
-  .fs20 {
-    font-size: 20px;
-    font-weight: 600;
-    color: green;
-    line-height: 22px;
-  }
-
-  .fs12 {
-    font-size: 12px;
-    font-weight: 400;
-    color: orange;
-    line-height: 14px;
-  }
-}
-
-.ant-input-group {
-  display: table !important;
-
-  .n-input-number {
-    width: 100%;
-
-    &.table-error-digital {
-      border-color: red !important;
-
-      input {
-        border-color: red !important;
-      }
-    }
-  }
-}
-
-.table-digital-com {
-  .n-input-group-addon {
-    max-width: 52px;
-
-    .text-over-tooltip-components {
-      display: inline;
-    }
-  }
-}
-
-.table-error-input {
-  border-color: red !important;
-
-  input {
-    border-color: red !important;
-  }
-}
-
-.table-input-com {
-  .n-input-group-addon {
-    max-width: 52px;
-
-    .text-over-tooltip-components {
-      display: inline;
-    }
-  }
-}
-
-.table-month-picker {
-  width: 100%;
-}
-
-.table-month-picker-error {
-  .n-input {
-    border-color: red !important;
-  }
-}
-
-.table-default-select {
-  .title-line {
-    font-weight: 700;
-    color: #000;
-    font-size: 14px;
-  }
-
-  .select-content-item {
-    padding: 0 5px;
-  }
-
-  .n-select-dropdown-menu-item-selected {
-    color: #5585f5;
-  }
-}
-
-.tableItem-search-more-select {
-  .title-line {
-    font-weight: 700;
-    color: #000;
-    font-size: 14px;
-  }
-  .select-content-item {
-    padding: 0 5px;
-  }
-  .n-select-dropdown-menu-item-selected {
-    color: #5585f5;
-  }
-}
-
-.table-select-error {
-  .n-select-selection {
-    border-color: red !important;
-  }
-}
-
-.table-error-textarea {
-  .n-input {
-    border-color: red !important;
-  }
-}
-
-.table-time-picker {
-  width: 100%;
-}
-
-.table-time-picker-error {
-  .n-input {
-    border-color: red !important;
-  }
-}
-
-
-.formTable-page-disabled--detail {
-  .vxe-table {
-    .vxe-cell {
-      .form-table-item {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        height: 31px;
-      }
-
-      .ant-select-disabled {
-        .ant-select-selection {
-          border: 0 !important;
-          background: transparent;
-        }
-
-        .ant-select-arrow {
-          display: none;
-        }
-
-        .ant-select-selection-selected-value {
-          color: #606266;
-        }
-      }
-
-      .DATE-container {
-        .ant-input {
-          padding: 0;
-          text-align: center;
-          border: 0 !important;
-          background-color: transparent;
-        }
-
-        .ant-calendar-picker-icon {
-          display: none;
-        }
-      }
-
-      .SELECT-container {
-        .ant-select-selection {
-          max-width: 100%;
-        }
-      }
-    }
-  }
-}
-
-.formTable-page {
-  width: 100%;
-  min-height: 100px;
-  max-height: 350px;
-
-  .vxe-table {
-    &.vxe-table--render-default .vxe-body--column:not(.col--ellipsis),
-    &.vxe-table--render-default .vxe-footer--column:not(.col--ellipsis),
-    &.vxe-table--render-default .vxe-header--column:not(.col--ellipsis) {
-      padding: 0;
-    }
-
-    .vxe-table--body-wrapper::-webkit-scrollbar {
-      width: 10px;
-      height: 10px;
-    }
-
-    .vxe-table--empty-content {
-      height: 100%;
-      max-height: 100%;
-
-      > div {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        height: 100%;
-        max-height: 100%;
-      }
-    }
-
-    .vxe-cell {
-      width: 100%;
-      padding: 9px 10px;
-      max-height: unset;
-      line-height: unset;
-      height: unset;
-      min-height: 32px;
-      justify-content: center;
-      text-overflow: inherit !important;
-
-      .tableItem-select {
-        width: 100%;
-      }
-
-      textarea {
-        line-height: 20px;
-        height: 100%;
-        resize: none;
-      }
-
-      .select-content {
-        width: 100%;
-      }
-
-      .table-form-age {
-        display: flex;
-        width: 100%;
-        line-height: unset;
-
-        .table-age-input {
-          flex: 1;
-        }
-
-        .table-age-select {
-          .ant-select-selection__placeholder {
-            font-size: 12px;
-          }
-        }
-      }
-
-      .span-required {
-        color: red;
-      }
-    }
-
-    .vxe-body--column.col--ellipsis,
-    .vxe-editable .vxe-body--column,
-    .vxe-footer--column.col--ellipsis,
-    .vxe-header--column.col--ellipsis {
-      height: 40px;
-    }
-
-    .span-remark-icon {
-      color: #337ab7;
-      margin-left: 6px;
-    }
-  }
-}
+.table-form-age-error {
+  border-color: red !important;
+
+  .table-age-input {
+    border-color: red !important;
+  }
+
+  .n-select-selection--single {
+    border-color: red !important;
+  }
+}
+
+.table-date-picker {
+  min-width: unset !important;
+  width: 100%;
+}
+
+.table-date-picker-error {
+  .n-input {
+    border-color: red !important;
+  }
+}
+
+.text-over-tooltip-components {
+  display: inline-block;
+  max-width: 100%;
+  /* 文字超出宽度显示省略号 单行 */
+
+  .ellipsis {
+    font-size: 14px;
+    color: #35393c;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+
+    i {
+      font-style: normal;
+      word-break: keep-all;
+      white-space: nowrap;
+    }
+  }
+
+  /* 自定义样式 */
+
+  .fs20 {
+    font-size: 20px;
+    font-weight: 600;
+    color: green;
+    line-height: 22px;
+  }
+
+  .fs12 {
+    font-size: 12px;
+    font-weight: 400;
+    color: orange;
+    line-height: 14px;
+  }
+}
+
+.ant-input-group {
+  display: table !important;
+
+  .n-input-number {
+    width: 100%;
+
+    &.table-error-digital {
+      border-color: red !important;
+
+      input {
+        border-color: red !important;
+      }
+    }
+  }
+}
+
+.table-digital-com {
+  .n-input-group-addon {
+    max-width: 52px;
+
+    .text-over-tooltip-components {
+      display: inline;
+    }
+  }
+}
+
+.table-error-input {
+  border-color: red !important;
+
+  input {
+    border-color: red !important;
+  }
+}
+
+.table-input-com {
+  .n-input-group-addon {
+    max-width: 52px;
+
+    .text-over-tooltip-components {
+      display: inline;
+    }
+  }
+}
+
+.table-month-picker {
+  width: 100%;
+}
+
+.table-month-picker-error {
+  .n-input {
+    border-color: red !important;
+  }
+}
+
+.table-default-select {
+  .title-line {
+    font-weight: 700;
+    color: #000;
+    font-size: 14px;
+  }
+
+  .select-content-item {
+    padding: 0 5px;
+  }
+
+  .n-select-dropdown-menu-item-selected {
+    color: #5585f5;
+  }
+}
+
+.tableItem-search-more-select {
+  .title-line {
+    font-weight: 700;
+    color: #000;
+    font-size: 14px;
+  }
+  .select-content-item {
+    padding: 0 5px;
+  }
+  .n-select-dropdown-menu-item-selected {
+    color: #5585f5;
+  }
+}
+
+.table-select-error {
+  .n-select-selection {
+    border-color: red !important;
+  }
+}
+
+.table-error-textarea {
+  .n-input {
+    border-color: red !important;
+  }
+}
+
+.table-time-picker {
+  width: 100%;
+}
+
+.table-time-picker-error {
+  .n-input {
+    border-color: red !important;
+  }
+}
+
+
+.formTable-page-disabled--detail {
+  .vxe-table {
+    .vxe-cell {
+      .form-table-item {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 31px;
+      }
+
+      .ant-select-disabled {
+        .ant-select-selection {
+          border: 0 !important;
+          background: transparent;
+        }
+
+        .ant-select-arrow {
+          display: none;
+        }
+
+        .ant-select-selection-selected-value {
+          color: #606266;
+        }
+      }
+
+      .DATE-container {
+        .ant-input {
+          padding: 0;
+          text-align: center;
+          border: 0 !important;
+          background-color: transparent;
+        }
+
+        .ant-calendar-picker-icon {
+          display: none;
+        }
+      }
+
+      .SELECT-container {
+        .ant-select-selection {
+          max-width: 100%;
+        }
+      }
+    }
+  }
+}
+
+.formTable-page {
+  width: 100%;
+  min-height: 100px;
+  max-height: 350px;
+
+  .vxe-table {
+    &.vxe-table--render-default .vxe-body--column:not(.col--ellipsis),
+    &.vxe-table--render-default .vxe-footer--column:not(.col--ellipsis),
+    &.vxe-table--render-default .vxe-header--column:not(.col--ellipsis) {
+      padding: 0;
+    }
+
+    .vxe-table--body-wrapper::-webkit-scrollbar {
+      width: 10px;
+      height: 10px;
+    }
+
+    .vxe-table--empty-content {
+      height: 100%;
+      max-height: 100%;
+
+      > div {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height: 100%;
+        max-height: 100%;
+      }
+    }
+
+    .vxe-cell {
+      width: 100%;
+      padding: 9px 10px;
+      max-height: unset;
+      line-height: unset;
+      height: unset;
+      min-height: 32px;
+      justify-content: center;
+      text-overflow: inherit !important;
+
+      .tableItem-select {
+        width: 100%;
+      }
+
+      textarea {
+        line-height: 20px;
+        height: 100%;
+        resize: none;
+      }
+
+      .select-content {
+        width: 100%;
+      }
+
+      .table-form-age {
+        display: flex;
+        width: 100%;
+        line-height: unset;
+
+        .table-age-input {
+          flex: 1;
+        }
+
+        .table-age-select {
+          .ant-select-selection__placeholder {
+            font-size: 12px;
+          }
+        }
+      }
+
+      .span-required {
+        color: red;
+      }
+    }
+
+    .vxe-body--column.col--ellipsis,
+    .vxe-editable .vxe-body--column,
+    .vxe-footer--column.col--ellipsis,
+    .vxe-header--column.col--ellipsis {
+      height: 40px;
+    }
+
+    .span-remark-icon {
+      color: #337ab7;
+      margin-left: 6px;
+    }
+  }
+}

package/es/packages/grid/index2.mjs

@@ -1,12 +1,14 @@
-import { KEY_COMPONENT_NAME } from 'cnhis-design-vue/es/src/global/variable';
-import { safeComponentRegister, getComponentName } from 'cnhis-design-vue/es/src/utils';
+import { COMPONENT_NAMESPACE } from 'cnhis-design-vue/es/src/global/variable';
+import { safeComponentRegister } from 'cnhis-design-vue/es/src/utils';
 import { loadVxeTable } from 'cnhis-design-vue/es/src/utils/loadVxe';
+import { expandXEUtils } from 'cnhis-design-vue/es/src/utils/utilExpand';
 import script from './src/Grid2.mjs';
 
 const Grid = script;
 Grid.install = function(app) {
-  safeComponentRegister(app, Grid, KEY_COMPONENT_NAME + getComponentName(Grid));
+  safeComponentRegister(app, Grid, COMPONENT_NAMESPACE + "Grid");
   loadVxeTable(app);
+  expandXEUtils();
 };
 
 export { Grid as default };

package/es/packages/grid/style/index.less

@@ -1,13 +1,13 @@
-// 兼容style插件所创建的空样式
-.vxe-table--footer-wrapper.body--wrapper,
-.vxe-table--body-wrapper {
-  &::-webkit-scrollbar {
-    width: 10px;
-    height: 10px;
-    background-color: #f2f2f2;
-  }
-
-  &::-webkit-scrollbar-thumb:hover {
-    background-color: #b2b2b2;
-  }
+// 兼容style插件所创建的空样式
+.vxe-table--footer-wrapper.body--wrapper,
+.vxe-table--body-wrapper {
+  &::-webkit-scrollbar {
+    width: 10px;
+    height: 10px;
+    background-color: #f2f2f2;
+  }
+
+  &::-webkit-scrollbar-thumb:hover {
+    background-color: #b2b2b2;
+  }
 }