amis 1.9.0-beta.13 → 1.9.0-beta.14

package/lib/utils/handleAction.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var api_1 = require("./api");
 function handleAction(e, action, props, data) {
     // https://reactjs.org/docs/legacy-event-pooling.html
-    e.persist();
+    // e.persist(); // react 17之后去掉 event pooling 了，这个应该没用了
     var onAction = props.onAction;
     var onClick = action.onClick;
     if (typeof onClick === 'string') {

package/lib/utils/handleAction.js.map

@@ -6,8 +6,8 @@
         "/src/utils/handleAction.ts"
     ],
     "names": [],
-    "mappings": ";AAAA;;GAEG;;AAIH,6BAAiD;AAEjD,SAAwB,YAAY,CAClC,CAAwB,EACxB,MAAoB,EACpB,KAAoB,EACpB,IAAU;IAEV,qDAAqD;IACrD,CAAC,CAAC,OAAO,EAAE,CAAC;IAEZ,IAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IAChC,IAAI,OAAO,GAAQ,MAAM,CAAC,OAAO,CAAC;IAElC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,OAAO,GAAG,IAAA,kBAAY,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;KAC3D;IACD,IAAM,MAAM,GAAQ,OAAO,IAAI,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;IAErE,IAAI,CAAC,CAAC,kBAAkB,EAAE,IAAI,MAAM,KAAK,KAAK,IAAI,CAAC,QAAQ,EAAE;QAC3D,OAAO;KACR;IAED,CAAC,CAAC,cAAc,EAAE,CAAC;IAEnB,wBAAwB;IACxB,IAAI,MAAM,CAAC,UAAU,KAAK,UAAU,EAAE;QACpC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC;QAC3B,IAAM,GAAG,GAAG,IAAA,kBAAY,EAAE,MAA2B,CAAC,GAAG,CAAC,CAAC;QAC3D,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC;QACzB,MAA2B,CAAC,GAAG,GAAG,GAAG,CAAC;KACxC;IAED,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;AAC1C,CAAC;AAhCD,+BAgCC",
+    "mappings": ";AAAA;;GAEG;;AAIH,6BAAiD;AAEjD,SAAwB,YAAY,CAClC,CAAwB,EACxB,MAAoB,EACpB,KAAoB,EACpB,IAAU;IAEV,qDAAqD;IACrD,uDAAuD;IAEvD,IAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IAChC,IAAI,OAAO,GAAQ,MAAM,CAAC,OAAO,CAAC;IAElC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,OAAO,GAAG,IAAA,kBAAY,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;KAC3D;IACD,IAAM,MAAM,GAAQ,OAAO,IAAI,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;IAErE,IAAI,CAAC,CAAC,kBAAkB,EAAE,IAAI,MAAM,KAAK,KAAK,IAAI,CAAC,QAAQ,EAAE;QAC3D,OAAO;KACR;IAED,CAAC,CAAC,cAAc,EAAE,CAAC;IAEnB,wBAAwB;IACxB,IAAI,MAAM,CAAC,UAAU,KAAK,UAAU,EAAE;QACpC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC;QAC3B,IAAM,GAAG,GAAG,IAAA,kBAAY,EAAE,MAA2B,CAAC,GAAG,CAAC,CAAC;QAC3D,GAAG,CAAC,YAAY,GAAG,MAAM,CAAC;QACzB,MAA2B,CAAC,GAAG,GAAG,GAAG,CAAC;KACxC;IAED,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;AAC1C,CAAC;AAhCD,+BAgCC",
     "sourcesContent": [
-        "/**\n * 后续好多地方可能都要支持 action，所以提取公共功能\n */\n\nimport {RendererProps} from '../factory';\nimport {ActionSchema, AjaxActionSchema} from '../renderers/Action';\nimport {normalizeApi, str2function} from './api';\n\nexport default function handleAction(\n  e: React.MouseEvent<any>,\n  action: ActionSchema,\n  props: RendererProps,\n  data?: any\n) {\n  // https://reactjs.org/docs/legacy-event-pooling.html\n  e.persist();\n\n  const onAction = props.onAction;\n  let onClick: any = action.onClick;\n\n  if (typeof onClick === 'string') {\n    onClick = str2function(onClick, 'event', 'props', 'data');\n  }\n  const result: any = onClick && onClick(e, props, data || props.data);\n\n  if (e.isDefaultPrevented() || result === false || !onAction) {\n    return;\n  }\n\n  e.preventDefault();\n\n  // download 是一种 ajax 的简写\n  if (action.actionType === 'download') {\n    action.actionType = 'ajax';\n    const api = normalizeApi((action as AjaxActionSchema).api);\n    api.responseType = 'blob';\n    (action as AjaxActionSchema).api = api;\n  }\n\n  onAction(e, action, data || props.data);\n}\n"
+        "/**\n * 后续好多地方可能都要支持 action，所以提取公共功能\n */\n\nimport {RendererProps} from '../factory';\nimport {ActionSchema, AjaxActionSchema} from '../renderers/Action';\nimport {normalizeApi, str2function} from './api';\n\nexport default function handleAction(\n  e: React.MouseEvent<any>,\n  action: ActionSchema,\n  props: RendererProps,\n  data?: any\n) {\n  // https://reactjs.org/docs/legacy-event-pooling.html\n  // e.persist(); // react 17之后去掉 event pooling 了，这个应该没用了\n\n  const onAction = props.onAction;\n  let onClick: any = action.onClick;\n\n  if (typeof onClick === 'string') {\n    onClick = str2function(onClick, 'event', 'props', 'data');\n  }\n  const result: any = onClick && onClick(e, props, data || props.data);\n\n  if (e.isDefaultPrevented() || result === false || !onAction) {\n    return;\n  }\n\n  e.preventDefault();\n\n  // download 是一种 ajax 的简写\n  if (action.actionType === 'download') {\n    action.actionType = 'ajax';\n    const api = normalizeApi((action as AjaxActionSchema).api);\n    api.responseType = 'blob';\n    (action as AjaxActionSchema).api = api;\n  }\n\n  onAction(e, action, data || props.data);\n}\n"
     ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis",
-  "version": "1.9.0-beta.13",
+  "version": "1.9.0-beta.14",
   "description": "一种MIS页面生成工具",
   "main": "lib/index.js",
   "scripts": {
@@ -162,7 +162,7 @@
     "prismjs": "^1.25.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "react-router": "^5.2.1",
+    "react-router": "5.2.1",
     "react-router-dom": "5.3.0",
     "react-test-renderer": "^18.0.0",
     "ts-jest": "^27.1.4",

package/scss/_properties.scss

@@ -241,6 +241,7 @@
   --Button--light-onHover-color: var(--Button--light-color);
   --Button--link-color: var(--primary);
   --Button--link-onDisabled-color: #{$gray600};
+  --Button--link-onDisabled-backgroundColor: transparent;
   --Button--link-onHover-color: var(--primary-onHover);
   --Button--link-onActive-color: var(--primary-onActive);
   --Button--md-fontSize: var(--Button-fontSize);

package/scss/components/_button.scss

@@ -48,7 +48,6 @@
     box-shadow: none;
     cursor: not-allowed;
     color: var(--text--muted-color);
-    pointer-events: auto;
     border: var(--Button-borderWidth) solid var(--Button-onDisabled-borderColor);
     background: var(--Button-onDisabled-bg);
 
@@ -62,9 +61,44 @@
     cursor: pointer;
   }
 
-  &.cxd-Button--link.is-disabled {
-    background: transparent;
+  &--link {
+    width: auto;
+    min-width: auto;
+    font-weight: var(--fontWeightNormal);
+    color: var(--Button--link-color);
+    text-decoration: var(--link-decoration);
     border: none;
+    height: auto;
+
+    @include hover-focus {
+      color: var(--Button--link-onHover-color);
+      box-shadow: none;
+    }
+
+    @include hover-active {
+      color: var(--Button--link-onActive-color);
+      box-shadow: none;
+    }
+
+    &:disabled,
+    &.is-disabled {
+      color: var(--text--muted-color);
+      border: none;
+      background: var(--Button--link-onDisabled-backgroundColor);
+
+      @include hover-active {
+        color: var(--text--muted-color);
+      }
+    }
+  }
+
+  &--block {
+    display: block;
+    width: 100%;
+
+    + .#{$ns}Button--block {
+      margin-top: var(--gap-base);
+    }
   }
 
   > .pull-left,
@@ -317,42 +351,6 @@ fieldset:disabled a.#{$ns}Button {
   @include button-loading-icon();
 }
 
-.#{$ns}Button--link {
-  width: auto;
-  min-width: auto;
-  font-weight: var(--fontWeightNormal);
-  color: var(--Button--link-color);
-  text-decoration: var(--link-decoration);
-  border: none;
-  height: auto;
-
-  @include hover-focus {
-    color: var(--Button--link-onHover-color);
-    box-shadow: none;
-  }
-
-  @include hover-active {
-    color: var(--Button--link-onActive-color);
-    box-shadow: none;
-  }
-
-  &:disabled,
-  &.is-disabled {
-    color: var(--text--muted-color);
-    pointer-events: none;
-    background: var(--Button-onDisabled-bg);
-  }
-}
-
-.#{$ns}Button--block {
-  display: block;
-  width: 100%;
-
-  + .#{$ns}Button--block {
-    margin-top: var(--gap-base);
-  }
-}
-
 input[type='submit'],
 input[type='reset'],
 input[type='button'] {

package/sdk/ang-ie11.css

@@ -25915,7 +25915,6 @@ readers do not read off random characters that represent icons */
   box-shadow: none;
   cursor: not-allowed;
   color: #99a6ad;
-  pointer-events: auto;
   border: 0.0625rem solid #dee2e6;
   background: #f2f3f3;
 }
@@ -25931,9 +25930,45 @@ readers do not read off random characters that represent icons */
   cursor: pointer;
 }
 
-.amis-scope .a-Button.cxd-Button--link.is-disabled {
-  background: transparent;
+.amis-scope .a-Button--link {
+  width: auto;
+  min-width: auto;
+  font-weight: 400;
+  color: #7266ba;
+  text-decoration: none;
   border: none;
+  height: auto;
+}
+
+.amis-scope .a-Button--link:hover:focus {
+  color: #4f86f4;
+  box-shadow: none;
+}
+
+.amis-scope .a-Button--link:hover:active {
+  color: #1c53c1;
+  box-shadow: none;
+}
+
+.amis-scope .a-Button--link:disabled,
+.amis-scope .a-Button--link.is-disabled {
+  color: #99a6ad;
+  border: none;
+  background: transparent;
+}
+
+.amis-scope .a-Button--link:disabled:hover:active,
+.amis-scope .a-Button--link.is-disabled:hover:active {
+  color: #99a6ad;
+}
+
+.amis-scope .a-Button--block {
+  display: block;
+  width: 100%;
+}
+
+.amis-scope .a-Button--block + .a-Button--block {
+  margin-top: 0.75rem;
 }
 
 .amis-scope .a-Button > .pull-left,
@@ -26415,42 +26450,6 @@ readers do not read off random characters that represent icons */
   animation: spin 1s infinite linear;
 }
 
-.amis-scope .a-Button--link {
-  width: auto;
-  min-width: auto;
-  font-weight: 400;
-  color: #7266ba;
-  text-decoration: none;
-  border: none;
-  height: auto;
-}
-
-.amis-scope .a-Button--link:hover:focus {
-  color: #4f86f4;
-  box-shadow: none;
-}
-
-.amis-scope .a-Button--link:hover:active {
-  color: #1c53c1;
-  box-shadow: none;
-}
-
-.amis-scope .a-Button--link:disabled,
-.amis-scope .a-Button--link.is-disabled {
-  color: #99a6ad;
-  pointer-events: none;
-  background: #f2f3f3;
-}
-
-.amis-scope .a-Button--block {
-  display: block;
-  width: 100%;
-}
-
-.amis-scope .a-Button--block + .a-Button--block {
-  margin-top: 0.75rem;
-}
-
 .amis-scope input[type=submit].a-Button--block,
 .amis-scope input[type=reset].a-Button--block,
 .amis-scope input[type=button].a-Button--block {

package/sdk/ang.css

@@ -13387,6 +13387,7 @@ readers do not read off random characters that represent icons */
   --Button--light-onHover-color: var(--Button--light-color);
   --Button--link-color: var(--primary);
   --Button--link-onDisabled-color: #4b5563;
+  --Button--link-onDisabled-backgroundColor: transparent;
   --Button--link-onHover-color: var(--primary-onHover);
   --Button--link-onActive-color: var(--primary-onActive);
   --Button--md-fontSize: var(--Button-fontSize);
@@ -27404,7 +27405,6 @@ readers do not read off random characters that represent icons */
   box-shadow: none;
   cursor: not-allowed;
   color: var(--text--muted-color);
-  pointer-events: auto;
   border: var(--Button-borderWidth) solid var(--Button-onDisabled-borderColor);
   background: var(--Button-onDisabled-bg);
 }
@@ -27420,9 +27420,45 @@ readers do not read off random characters that represent icons */
   cursor: pointer;
 }
 
-.amis-scope .a-Button.cxd-Button--link.is-disabled {
-  background: transparent;
+.amis-scope .a-Button--link {
+  width: auto;
+  min-width: auto;
+  font-weight: var(--fontWeightNormal);
+  color: var(--Button--link-color);
+  text-decoration: var(--link-decoration);
   border: none;
+  height: auto;
+}
+
+.amis-scope .a-Button--link:hover:focus {
+  color: var(--Button--link-onHover-color);
+  box-shadow: none;
+}
+
+.amis-scope .a-Button--link:hover:active {
+  color: var(--Button--link-onActive-color);
+  box-shadow: none;
+}
+
+.amis-scope .a-Button--link:disabled,
+.amis-scope .a-Button--link.is-disabled {
+  color: var(--text--muted-color);
+  border: none;
+  background: var(--Button--link-onDisabled-backgroundColor);
+}
+
+.amis-scope .a-Button--link:disabled:hover:active,
+.amis-scope .a-Button--link.is-disabled:hover:active {
+  color: var(--text--muted-color);
+}
+
+.amis-scope .a-Button--block {
+  display: block;
+  width: 100%;
+}
+
+.amis-scope .a-Button--block + .a-Button--block {
+  margin-top: var(--gap-base);
 }
 
 .amis-scope .a-Button > .pull-left,
@@ -27864,42 +27900,6 @@ readers do not read off random characters that represent icons */
   animation: var(--Button-animation-spin);
 }
 
-.amis-scope .a-Button--link {
-  width: auto;
-  min-width: auto;
-  font-weight: var(--fontWeightNormal);
-  color: var(--Button--link-color);
-  text-decoration: var(--link-decoration);
-  border: none;
-  height: auto;
-}
-
-.amis-scope .a-Button--link:hover:focus {
-  color: var(--Button--link-onHover-color);
-  box-shadow: none;
-}
-
-.amis-scope .a-Button--link:hover:active {
-  color: var(--Button--link-onActive-color);
-  box-shadow: none;
-}
-
-.amis-scope .a-Button--link:disabled,
-.amis-scope .a-Button--link.is-disabled {
-  color: var(--text--muted-color);
-  pointer-events: none;
-  background: var(--Button-onDisabled-bg);
-}
-
-.amis-scope .a-Button--block {
-  display: block;
-  width: 100%;
-}
-
-.amis-scope .a-Button--block + .a-Button--block {
-  margin-top: var(--gap-base);
-}
-
 .amis-scope input[type=submit].a-Button--block,
 .amis-scope input[type=reset].a-Button--block,
 .amis-scope input[type=button].a-Button--block {

package/sdk/antd-ie11.css

@@ -25915,7 +25915,6 @@ readers do not read off random characters that represent icons */
   box-shadow: none;
   cursor: not-allowed;
   color: #999;
-  pointer-events: auto;
   border: 0.0625rem solid #d9d9d9;
   background: #f2f3f3;
 }
@@ -25931,9 +25930,45 @@ readers do not read off random characters that represent icons */
   cursor: pointer;
 }
 
-.amis-scope .antd-Button.cxd-Button--link.is-disabled {
-  background: transparent;
+.amis-scope .antd-Button--link {
+  width: auto;
+  min-width: auto;
+  font-weight: 400;
+  color: #1890ff;
+  text-decoration: none;
   border: none;
+  height: auto;
+}
+
+.amis-scope .antd-Button--link:hover:focus {
+  color: #4f86f4;
+  box-shadow: none;
+}
+
+.amis-scope .antd-Button--link:hover:active {
+  color: #1c53c1;
+  box-shadow: none;
+}
+
+.amis-scope .antd-Button--link:disabled,
+.amis-scope .antd-Button--link.is-disabled {
+  color: #999;
+  border: none;
+  background: transparent;
+}
+
+.amis-scope .antd-Button--link:disabled:hover:active,
+.amis-scope .antd-Button--link.is-disabled:hover:active {
+  color: #999;
+}
+
+.amis-scope .antd-Button--block {
+  display: block;
+  width: 100%;
+}
+
+.amis-scope .antd-Button--block + .antd-Button--block {
+  margin-top: 0.75rem;
 }
 
 .amis-scope .antd-Button > .pull-left,
@@ -26395,42 +26430,6 @@ readers do not read off random characters that represent icons */
   animation: spin 1s infinite linear;
 }
 
-.amis-scope .antd-Button--link {
-  width: auto;
-  min-width: auto;
-  font-weight: 400;
-  color: #1890ff;
-  text-decoration: none;
-  border: none;
-  height: auto;
-}
-
-.amis-scope .antd-Button--link:hover:focus {
-  color: #4f86f4;
-  box-shadow: none;
-}
-
-.amis-scope .antd-Button--link:hover:active {
-  color: #1c53c1;
-  box-shadow: none;
-}
-
-.amis-scope .antd-Button--link:disabled,
-.amis-scope .antd-Button--link.is-disabled {
-  color: #999;
-  pointer-events: none;
-  background: #f2f3f3;
-}
-
-.amis-scope .antd-Button--block {
-  display: block;
-  width: 100%;
-}
-
-.amis-scope .antd-Button--block + .antd-Button--block {
-  margin-top: 0.75rem;
-}
-
 .amis-scope input[type=submit].antd-Button--block,
 .amis-scope input[type=reset].antd-Button--block,
 .amis-scope input[type=button].antd-Button--block {

package/sdk/antd.css

@@ -13391,6 +13391,7 @@ readers do not read off random characters that represent icons */
   --Button--light-onHover-color: var(--Button--light-color);
   --Button--link-color: var(--primary);
   --Button--link-onDisabled-color: #4b5563;
+  --Button--link-onDisabled-backgroundColor: transparent;
   --Button--link-onHover-color: var(--primary-onHover);
   --Button--link-onActive-color: var(--primary-onActive);
   --Button--md-fontSize: var(--Button-fontSize);
@@ -27513,7 +27514,6 @@ readers do not read off random characters that represent icons */
   box-shadow: none;
   cursor: not-allowed;
   color: var(--text--muted-color);
-  pointer-events: auto;
   border: var(--Button-borderWidth) solid var(--Button-onDisabled-borderColor);
   background: var(--Button-onDisabled-bg);
 }
@@ -27529,9 +27529,45 @@ readers do not read off random characters that represent icons */
   cursor: pointer;
 }
 
-.amis-scope .antd-Button.cxd-Button--link.is-disabled {
-  background: transparent;
+.amis-scope .antd-Button--link {
+  width: auto;
+  min-width: auto;
+  font-weight: var(--fontWeightNormal);
+  color: var(--Button--link-color);
+  text-decoration: var(--link-decoration);
   border: none;
+  height: auto;
+}
+
+.amis-scope .antd-Button--link:hover:focus {
+  color: var(--Button--link-onHover-color);
+  box-shadow: none;
+}
+
+.amis-scope .antd-Button--link:hover:active {
+  color: var(--Button--link-onActive-color);
+  box-shadow: none;
+}
+
+.amis-scope .antd-Button--link:disabled,
+.amis-scope .antd-Button--link.is-disabled {
+  color: var(--text--muted-color);
+  border: none;
+  background: var(--Button--link-onDisabled-backgroundColor);
+}
+
+.amis-scope .antd-Button--link:disabled:hover:active,
+.amis-scope .antd-Button--link.is-disabled:hover:active {
+  color: var(--text--muted-color);
+}
+
+.amis-scope .antd-Button--block {
+  display: block;
+  width: 100%;
+}
+
+.amis-scope .antd-Button--block + .antd-Button--block {
+  margin-top: var(--gap-base);
 }
 
 .amis-scope .antd-Button > .pull-left,
@@ -27973,42 +28009,6 @@ readers do not read off random characters that represent icons */
   animation: var(--Button-animation-spin);
 }
 
-.amis-scope .antd-Button--link {
-  width: auto;
-  min-width: auto;
-  font-weight: var(--fontWeightNormal);
-  color: var(--Button--link-color);
-  text-decoration: var(--link-decoration);
-  border: none;
-  height: auto;
-}
-
-.amis-scope .antd-Button--link:hover:focus {
-  color: var(--Button--link-onHover-color);
-  box-shadow: none;
-}
-
-.amis-scope .antd-Button--link:hover:active {
-  color: var(--Button--link-onActive-color);
-  box-shadow: none;
-}
-
-.amis-scope .antd-Button--link:disabled,
-.amis-scope .antd-Button--link.is-disabled {
-  color: var(--text--muted-color);
-  pointer-events: none;
-  background: var(--Button-onDisabled-bg);
-}
-
-.amis-scope .antd-Button--block {
-  display: block;
-  width: 100%;
-}
-
-.amis-scope .antd-Button--block + .antd-Button--block {
-  margin-top: var(--gap-base);
-}
-
 .amis-scope input[type=submit].antd-Button--block,
 .amis-scope input[type=reset].antd-Button--block,
 .amis-scope input[type=button].antd-Button--block {