@aplus-frontend/ui 6.18.0 → 6.19.1

package/lib/src/tests/wrapper.d.ts

@@ -1,8 +1,8 @@
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
 export declare const Wrapper: DefineComponent<{
-    uiMode?: "admin" | "aplus" | undefined;
-    lang?: "en" | "zh-cn" | undefined;
+    uiMode?: ("admin" | "aplus") | undefined;
+    lang?: ("en" | "zh-cn") | undefined;
 }, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<{
-    uiMode?: "admin" | "aplus" | undefined;
-    lang?: "en" | "zh-cn" | undefined;
+    uiMode?: ("admin" | "aplus") | undefined;
+    lang?: ("en" | "zh-cn") | undefined;
 }> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.18.0";
+declare const _default: "6.19.1";
 export default _default;

package/lib/src/version.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.18.0";exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.19.1";exports.default=e;

package/lib/src/work-order-modal/work-order-modal.vue.d.ts

@@ -1,13 +1,14 @@
 import { WorkOrderModalProps } from './interfaces';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions, ComponentInternalInstance, ExtractPropTypes, PropType, HTMLAttributes, VNodeProps, AllowedComponentProps, ComponentCustomProps, CreateComponentPublicInstanceWithMixins, GlobalComponents, GlobalDirectives, Slot, ComponentPublicInstance, ComponentOptionsBase, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties } from 'vue';
-import { ButtonSize, SizeType } from '@aplus-frontend/antdv/es/button';
 import { ColSize } from '@aplus-frontend/antdv/es/grid';
-import { FormLabelAlign, ValidateMessages, FieldData, ValidateErrorEntity, NamePath, ValidateOptions, InternalNamePath } from '@aplus-frontend/antdv/es/form/interface';
+import { FormLabelAlign, ValidateMessages, FieldData, ValidateErrorEntity, NamePath, RuleObject, ValidateOptions, InternalNamePath } from '@aplus-frontend/antdv/es/form/interface';
 import { RuleObject } from '@aplus-frontend/antdv/es/form';
 import { RequiredMark } from '@aplus-frontend/antdv/es/form/Form';
 import { Options } from '../../node_modules/scroll-into-view-if-needed';
 import { Recordable } from '../type';
 import { VueTypeDef, VueTypeValidableDef } from '../../node_modules/vue-types';
+import { SizeType } from '@aplus-frontend/antdv/es/config-provider';
+import { SizeType } from '@aplus-frontend/antdv/es/button';
 import { VueNode } from '@aplus-frontend/antdv/es/_util/type';
 import { ApFormProps, UpdateModelOptimizeFn, ApFormInternalInstance, WatchFunc } from '..';
 import { OnCleanup } from '@vue/reactivity';
@@ -22,7 +23,7 @@ declare const _default: DefineComponent<WorkOrderModalProps, {}, {}, {}, {}, Com
         $: ComponentInternalInstance;
         $data: {};
         $props: {
-            readonly size?: ButtonSize;
+            readonly size?: "small" | "large" | "middle" | undefined;
             readonly onSubmit?: ((e: Event) => void) | undefined;
             readonly layout?: string | undefined;
             readonly disabled?: boolean | undefined;
@@ -112,7 +113,7 @@ declare const _default: DefineComponent<WorkOrderModalProps, {}, {}, {}, {}, Com
             readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
             readonly initialValues?: Recordable | undefined;
             readonly onValuesChange?: ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void) | undefined;
-            readonly syncToUrl?: boolean | ((values: Recordable, type: "get" | "set") => Recordable) | undefined;
+            readonly syncToUrl?: (boolean | ((values: Recordable, type: "get" | "set") => Recordable)) | undefined;
             readonly syncToUrlPriority?: boolean | undefined;
         } & VNodeProps & AllowedComponentProps & ComponentCustomProps;
         $attrs: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "6.18.0",
+  "version": "6.19.1",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -39,14 +39,14 @@
     "@aplus-frontend/utils": "1.0.61"
   },
   "peerDependencies": {
-    "@aplus-frontend/antdv": "^1.1.12",
+    "@aplus-frontend/antdv": "^1.2.0",
     "@aplus-frontend/icon": "^1.2.6",
     "@aplus-frontend/oss": "^1.1.2",
     "vue": "^3.5.14",
     "vxe-table": "4.11.29"
   },
   "devDependencies": {
-    "@aplus-frontend/antdv": "^1.1.12",
+    "@aplus-frontend/antdv": "^1.2.0",
     "@aplus-frontend/icon": "^1.2.6",
     "@aplus-frontend/oss": "^1.1.2",
     "@types/sortablejs": "^1.15.8",

package/theme/antd-global-overwrite/admin/alert.css

@@ -0,0 +1,37 @@
+.ant-alert .ant-alert-close-icon {
+  line-height: 18px;
+}
+.ant-alert .ant-alert-icon {
+  font-size: 16px;
+  margin-inline-end: 8px;
+}
+.ant-alert .ant-alert-message {
+  color: #333333;
+  font-weight: normal !important;
+  font-size: 12px;
+  line-height: 18px;
+}
+.ant-alert .ant-alert-message .href {
+  color: #1890ff;
+  cursor: pointer;
+}
+.ant-alert.ant-alert-with-description .ant-alert-message {
+  margin-bottom: 4px;
+  font-weight: bold !important;
+}
+.ant-alert.ant-alert-warning {
+  background: rgba(250, 173, 20, 0.1);
+  border: 1px solid rgba(250, 173, 20, 0.4);
+}
+.ant-alert.ant-alert-info {
+  background: rgba(24, 144, 255, 0.1);
+  border: 1px solid rgba(24, 144, 255, 0.4);
+}
+.ant-alert.ant-alert-success {
+  background: rgba(52, 183, 124, 0.1);
+  border: 1px solid rgba(52, 183, 124, 0.4);
+}
+.ant-alert.ant-alert-error {
+  background: rgba(255, 77, 79, 0.1);
+  border: 1px solid rgba(255, 77, 79, 0.4);
+}

package/theme/antd-global-overwrite/admin/alert.less

@@ -0,0 +1,51 @@
+@import '../../mixins/config.less';
+
+.ant-alert {
+  .ant-alert-close-icon {
+    line-height: 18px;
+  }
+
+  .ant-alert-icon {
+    font-size: 16px;
+    margin-inline-end: @spacing;
+  }
+
+  .ant-alert-message {
+    color: #333333;
+    font-weight: normal !important;
+    font-size: @font-size-base;
+    line-height: @line-height-base;
+
+    .href {
+      color: #1890ff;
+      cursor: pointer;
+    }
+  }
+
+  &.ant-alert-with-description {
+    .ant-alert-message {
+      margin-bottom: @spacing-xs;
+      font-weight: bold !important;
+    }
+  }
+
+  &.ant-alert-warning {
+    background: rgba(250, 173, 20, 0.1);
+    border: 1px solid rgba(250, 173, 20, 0.4);
+  }
+
+  &.ant-alert-info {
+    background: rgba(24, 144, 255, 0.1);
+    border: 1px solid rgba(24, 144, 255, 0.4);
+  }
+
+  &.ant-alert-success {
+    background: rgba(52, 183, 124, 0.1);
+    border: 1px solid rgba(52, 183, 124, 0.4);
+  }
+
+  &.ant-alert-error {
+    background: rgba(255, 77, 79, 0.1);
+    border: 1px solid rgba(255, 77, 79, 0.4);
+  }
+}

package/theme/antd-global-overwrite/admin/button.css

@@ -0,0 +1,27 @@
+.ant-btn {
+  box-shadow: none;
+}
+.ant-btn.ant-btn-primary[disabled],
+.ant-btn.ant-btn-primary[disabled]:hover {
+  color: #ffffff;
+  background: #d6f1e5;
+  border-color: #d6f1e5;
+}
+.ant-btn.ant-btn-dangerous.ant-btn-dangerous[disabled],
+.ant-btn.ant-btn-dangerous.ant-btn-dangerous[disabled]:hover {
+  color: #ffffff !important;
+  background: #ffdbdc !important;
+  border-color: #ffdbdc !important;
+}
+.ant-btn.ant-btn-default[disabled],
+.ant-btn.ant-btn-default[disabled]:hover {
+  color: #bfbfbf !important;
+  background: #fafafa !important;
+  border-color: #d9d9d9 !important;
+}
+.ant-btn.ant-btn-link[disabled],
+.ant-btn.ant-btn-link[disabled]:hover,
+.ant-btn.ant-btn-text[disabled],
+.ant-btn.ant-btn-text[disabled]:hover {
+  color: rgba(24, 144, 255, 0.2) !important;
+}

package/theme/antd-global-overwrite/admin/button.less

@@ -0,0 +1,31 @@
+.ant-btn {
+  box-shadow: none;
+
+  &.ant-btn-primary[disabled],
+  &.ant-btn-primary[disabled]:hover {
+    color: #ffffff;
+    background: #d6f1e5;
+    border-color: #d6f1e5;
+  }
+
+  &.ant-btn-dangerous.ant-btn-dangerous[disabled],
+  &.ant-btn-dangerous.ant-btn-dangerous[disabled]:hover {
+    color: #ffffff !important;
+    background: #ffdbdc !important;
+    border-color: #ffdbdc !important;
+  }
+
+  &.ant-btn-default[disabled],
+  &.ant-btn-default[disabled]:hover {
+    color: #bfbfbf !important;
+    background: #fafafa !important;
+    border-color: #d9d9d9 !important;
+  }
+
+  &.ant-btn-link[disabled],
+  &.ant-btn-link[disabled]:hover,
+  &.ant-btn-text[disabled],
+  &.ant-btn-text[disabled]:hover {
+    color: rgba(24, 144, 255, 0.2) !important;
+  }
+}

package/theme/antd-global-overwrite/admin/field.css

@@ -0,0 +1,42 @@
+.ant-checkbox:not(.ant-checkbox-checked) .ant-checkbox-inner {
+  border-color: #d9d9d9;
+}
+.ant-radio:not(.ant-radio-checked) .ant-radio-inner {
+  border-color: #d9d9d9;
+}
+.ant-input::-moz-placeholder {
+  color: #bfbfbf;
+}
+.ant-input::placeholder {
+  color: #bfbfbf;
+}
+.ant-select .ant-select-selection-placeholder {
+  color: #bfbfbf;
+}
+.ant-picker .ant-picker-input > input::-moz-placeholder {
+  color: #bfbfbf;
+}
+.ant-picker .ant-picker-input > input::placeholder {
+  color: #bfbfbf;
+}
+.ant-input-number .ant-input-number-input-wrap > input::-moz-placeholder {
+  color: #bfbfbf;
+}
+.ant-input-number .ant-input-number-input-wrap > input::placeholder {
+  color: #bfbfbf;
+}
+input[disabled].ant-input {
+  color: var(--ap-text-color-1);
+}
+textarea[disabled].ant-input {
+  color: var(--ap-text-color-1);
+}
+.ant-picker.ant-picker-disabled .ant-picker-input > input[disabled] {
+  color: var(--ap-text-color-1);
+}
+.ant-select-disabled .ant-select-selection-item {
+  color: var(--ap-text-color-1) !important;
+}
+.ant-input-clear-icon {
+  line-height: 18px;
+}

package/theme/antd-global-overwrite/admin/field.less

@@ -0,0 +1,43 @@
+.ant-checkbox:not(.ant-checkbox-checked) .ant-checkbox-inner {
+  border-color: #d9d9d9;
+}
+
+.ant-radio:not(.ant-radio-checked) .ant-radio-inner {
+  border-color: #d9d9d9;
+}
+
+.ant-input::placeholder {
+  color: #bfbfbf;
+}
+
+.ant-select .ant-select-selection-placeholder {
+  color: #bfbfbf;
+}
+
+.ant-picker .ant-picker-input > input::placeholder {
+  color: #bfbfbf;
+}
+
+.ant-input-number .ant-input-number-input-wrap > input::placeholder {
+  color: #bfbfbf;
+}
+
+input[disabled].ant-input {
+  color: var(--ap-text-color-1);
+}
+
+textarea[disabled].ant-input {
+  color: var(--ap-text-color-1);
+}
+
+.ant-picker.ant-picker-disabled .ant-picker-input > input[disabled] {
+  color: var(--ap-text-color-1);
+}
+
+.ant-select-disabled .ant-select-selection-item {
+  color: var(--ap-text-color-1) !important;
+}
+
+.ant-input-clear-icon {
+  line-height: 18px;
+}

package/theme/antd-global-overwrite/admin/form.css

@@ -0,0 +1,57 @@
+.ant-form .ant-form-item label {
+  font-weight: normal;
+}
+.ant-form .ant-form-item label svg {
+  color: #34b77c;
+}
+.ant-form .ant-form-item-control {
+  padding-left: 0;
+}
+.ant-form .ant-form-item-control .ant-form-item-explain-error {
+  font-size: 12px;
+}
+.ant-input::-moz-placeholder {
+  color: #bfbfbf;
+}
+.ant-input::placeholder {
+  color: #bfbfbf;
+}
+.ant-select .ant-select-selection-placeholder {
+  color: #bfbfbf;
+}
+.ant-picker .ant-picker-input > input::-moz-placeholder {
+  color: #bfbfbf;
+}
+.ant-picker .ant-picker-input > input::placeholder {
+  color: #bfbfbf;
+}
+.ant-input-number .ant-input-number-input-wrap > input::-moz-placeholder {
+  color: #bfbfbf;
+}
+.ant-input-number .ant-input-number-input-wrap > input::placeholder {
+  color: #bfbfbf;
+}
+div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'],
+div[class$='-basic-table-form-container ap-table--sticky'] form[class$='-basic-form--compact'] {
+  padding: 16px;
+}
+div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] div.ant-col[tableaction] .ant-form-item-control-input-content,
+div[class$='-basic-table-form-container ap-table--sticky'] form[class$='-basic-form--compact'] div.ant-col[tableaction] .ant-form-item-control-input-content {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] div.ant-col[tableaction] .ant-form-item-control-input-content button.ant-btn-primary,
+div[class$='-basic-table-form-container ap-table--sticky'] form[class$='-basic-form--compact'] div.ant-col[tableaction] .ant-form-item-control-input-content button.ant-btn-primary {
+  order: 1;
+}
+div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] div.ant-col[tableaction] .ant-form-item-control-input-content button.ant-btn-default,
+div[class$='-basic-table-form-container ap-table--sticky'] form[class$='-basic-form--compact'] div.ant-col[tableaction] .ant-form-item-control-input-content button.ant-btn-default {
+  order: 2;
+  margin-right: 0;
+}
+div[class$='-basic-table-form-container'] form[class$='-basic-form--compact'] div.ant-col[tableaction] .ant-form-item-control-input-content button.ant-btn-link,
+div[class$='-basic-table-form-container ap-table--sticky'] form[class$='-basic-form--compact'] div.ant-col[tableaction] .ant-form-item-control-input-content button.ant-btn-link {
+  order: 3;
+  margin-left: 0.5rem;
+}

package/theme/antd-global-overwrite/admin/form.less

@@ -0,0 +1,97 @@
+.ant-form {
+  .ant-form-item {
+    // label style
+    label {
+      font-weight: normal;
+
+      svg {
+        color: #34b77c;
+      }
+    }
+  }
+
+  .ant-form-item-control {
+    padding-left: 0;
+    // error style
+    .ant-form-item-explain-error {
+      font-size: 12px;
+    }
+    // Radio style
+    // .ant-radio-wrapper .ant-radio {
+    //   &.ant-radio-checked {
+    //     .ant-radio-inner {
+    //       background-color: #ffffff;
+    //       border-color: #34b77c;
+
+    //       &::after {
+    //         background-color: #34b77c;
+    //       }
+    //     }
+    //   }
+    // }
+    // Select style
+    // .ant-select {
+    //   &.ant-select-open {
+    //     .ant-select-selection-item {
+    //       color: #bfbfbf;
+    //     }
+    //   }
+    // }
+  }
+}
+
+// placeholder style
+.ant-input::placeholder {
+  color: #bfbfbf;
+}
+
+.ant-select .ant-select-selection-placeholder {
+  color: #bfbfbf;
+}
+
+.ant-picker .ant-picker-input > input::placeholder {
+  color: #bfbfbf;
+}
+
+.ant-input-number .ant-input-number-input-wrap > input::placeholder {
+  color: #bfbfbf;
+}
+
+// input disabled styles
+// input.ant-input[disabled] {
+//   color: #666666;
+// }
+
+// 兼容 table 里面 过滤器样式
+// 新增对sticky表格的样式类型
+div[class$='-basic-table-form-container'],
+div[class$='-basic-table-form-container ap-table--sticky'] {
+  form[class$='-basic-form--compact'] {
+    // 关于 过滤器 底部 16px问题 浩龙已经处理过了
+    // 利用 row-gap 所以这里需要设置 padding
+    padding: 16px;
+    // 查询 重置按钮 交换位置
+    // 利用flexbox布局 order
+    div.ant-col[tableaction] {
+      .ant-form-item-control-input-content {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        button.ant-btn-primary {
+          order: 1;
+        }
+
+        button.ant-btn-default {
+          order: 2;
+          margin-right: 0;
+        }
+
+        button.ant-btn-link {
+          order: 3;
+          margin-left: 0.5rem;
+        }
+      }
+    }
+  }
+}

package/theme/antd-global-overwrite/admin/message.css

@@ -0,0 +1,10 @@
+.ant-message div.ant-message-notice-content {
+  padding: 10px 16px;
+  font-size: 14px;
+  line-height: 22px;
+  box-shadow: 0 3px 6px 0 rgba(44, 54, 69, 0.102);
+}
+.ant-message .ant-message-notice .anticon {
+  margin-bottom: 1px;
+  margin-inline-end: 9px;
+}

package/theme/antd-global-overwrite/admin/message.less

@@ -0,0 +1,13 @@
+.ant-message {
+  div.ant-message-notice-content {
+    padding: 10px 16px;
+    font-size: 14px;
+    line-height: 22px;
+    box-shadow: 0 3px 6px 0 rgba(44, 54, 69, 0.102);
+  }
+
+  .ant-message-notice .anticon {
+    margin-bottom: 1px;
+    margin-inline-end: 9px;
+  }
+}

package/theme/antd-global-overwrite/admin/modal.css

@@ -0,0 +1,94 @@
+.ant-modal-root .ant-modal .ant-modal-close {
+  top: 14px;
+  inset-inline-end: 18px;
+  color: #666666;
+}
+.ant-modal-root .ant-modal .ant-modal-close:hover {
+  background-color: transparent;
+}
+.ant-modal-root .ant-modal .ant-modal-close-x {
+  line-height: 0;
+}
+.ant-modal-root .ant-modal .ant-modal-content {
+  padding: 0;
+}
+.ant-modal-root .ant-modal .ant-modal-content .ant-modal-header {
+  margin-bottom: 0;
+  padding: 12px 20px;
+  border-bottom: 1px solid #E9E9E9;
+}
+.ant-modal-root .ant-modal .ant-modal-content .ant-modal-body {
+  padding: 16px 20px;
+}
+.ant-modal-root .ant-modal .ant-modal-content .ant-modal-body > .scrollbar {
+  padding: 0;
+}
+.ant-modal-root .ant-modal .ant-modal-content .ant-modal-body .scrollbar__wrap {
+  margin-bottom: 0 !important;
+}
+.ant-modal-root .ant-modal .ant-modal-content .ant-modal-body:has([class*='ap-modal-body-wrapper']) {
+  padding: 20px 0 !important;
+}
+.ant-modal-root .ant-modal .ant-modal-content .ant-modal-body:has([class*='ap-modal-body-wrapper']) [class*='ap-modal-body-wrapper'] {
+  padding: 0 20px;
+  overflow: hidden auto;
+}
+.ant-modal-root .ant-modal .ant-modal-content .ant-modal-footer {
+  margin-top: 0;
+  padding: 0 20px 12px;
+  border-top: none;
+}
+.ant-modal-root .ant-modal .ant-modal-content .ant-modal-footer button {
+  min-width: 72px;
+}
+.ant-modal-root .ant-modal .ant-modal-content .ant-modal-footer .ant-btn + .ant-btn:not(.ant-dropdown-trigger) {
+  margin-inline-start: 8px;
+}
+.ant-modal-root .ant-modal-confirm .ant-modal-content .ant-modal-body {
+  padding: 20px 24px;
+}
+.ant-modal-root .ant-modal-confirm .ant-modal-content .ant-modal-body .ant-modal-confirm-body > .anticon {
+  margin-inline-end: 10px;
+  font-size: 22px;
+}
+.ant-modal-root .ant-modal-confirm .ant-modal-content .ant-modal-body .ant-modal-confirm-body .ant-modal-confirm-title {
+  color: #333333;
+  font-weight: normal;
+  font-size: 16px;
+  line-height: 24px;
+}
+.ant-modal-root .ant-modal-confirm .ant-modal-content .ant-modal-body .ant-modal-confirm-body .ant-modal-confirm-content {
+  max-width: calc(100% - 40px);
+  color: #999999;
+  font-weight: normal;
+  font-size: 14px;
+  line-height: 200%;
+  margin-block-start: 4px;
+  margin-inline-start: 34px;
+}
+.ant-modal-root .ant-modal-confirm .ant-modal-content .ant-modal-body .ant-modal-confirm-body .ant-modal-confirm-content > * {
+  color: #999999;
+}
+.ant-modal-root .ant-modal-confirm .ant-modal-content .ant-modal-body .ant-modal-confirm-btns {
+  margin-top: 0;
+  padding-top: 16px;
+}
+.ant-modal-root .ant-modal-confirm .ant-modal-content .ant-modal-body .ant-modal-confirm-btns button {
+  min-width: 72px;
+}
+.ant-modal-root .ant-modal-confirm .ant-modal-content .ant-modal-body .ant-modal-confirm-btns .ant-btn + .ant-btn:not(.ant-dropdown-trigger) {
+  margin-inline-start: 8px;
+}
+.ant-modal-confirm-success .ant-modal-confirm-body > .anticon {
+  color: #06c687;
+}
+.ant-modal-confirm-info .ant-modal-confirm-body > .anticon {
+  color: #1890ff;
+}
+.ant-modal-confirm-warning .ant-modal-confirm-body > .anticon,
+.ant-modal-confirm-confirm .ant-modal-confirm-body > .anticon {
+  color: #faad14;
+}
+.ant-modal-confirm-error .ant-modal-confirm-body > .anticon {
+  color: #ff4d4f;
+}