Merge "amis-saas-2569 图标select回滚" into pre-release

packages/amis-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "5.2.0-i18n.5",
+  "version": "5.2.0-i18n.7",
   "description": "amis 可视化编辑器",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -114,4 +114,4 @@
     "amis-ui": "*",
     "i18n-runtime": "*"
   }
-}
+}

packages/amis-editor/src/component/BaseControl.ts

@@ -463,10 +463,12 @@ export function remarkTpl(config: {
                   }
                 ]
               },
-              getSchemaTpl('icon', {
+              {
                 name: 'icon',
-                label: '图标'
+                label: '图标',
-              }),
+                type: 'icon-picker',
+                className: 'fix-icon-picker-overflow'
+              },
               {
                 name: 'className',
                 label: 'CSS 类名',

packages/amis-editor/src/locale/en-US.ts

@@ -79,7 +79,7 @@ extendLocale('en-US', {
   'e7a707f9fc7da36828db940ca2960f4b':
     'The audio control can be used to play various audio files.',
   '997c7a5d34f6fc628893f509d0df32e0': 'Feature',
-  '22b777e6fcb613b8ba83ced9594cd07e': 'Ordinary',
+  '22b777e6fcb613b8ba83ced9594cd07e': 'Properties',
   '37b12f2666b9e4e37f33eb5e83533d5e':
     '<p>Currently, this feature is configured for the field content node. If you select the upper layer, more configurations exist. </p>',
   'f8f176147db276063e7ec15f076e39e0': 'Audio address',
@@ -98,7 +98,7 @@ extendLocale('en-US', {
   '54c6bb48170611ec995f634319312156': 'Autoplay',
   '56e6ecf97176d30c06b30cfa428ef832': 'Loop play',
   '2fb0853874c2cc8cc42f0c7520af662a': 'Inlink mode',
-  '33bf801796fd255b5f6147e33146669b': 'Display and hide',
+  '33bf801796fd255b5f6147e33146669b': 'Display',
   '4c50eef3bdaf0b4164ce179e576f2b2d': 'Portrait',
   '18dc831ec12d358d05902bef1f00e1f1': 'User portrait',
   '027446c2f9070b0f5b16a18208bf5fc7': 'Display',
@@ -1429,7 +1429,7 @@ extendLocale('en-US', {
   '710ad08b11419332713360d2750cd707': 'Disable',
   '7abf78a41095c6d21a1cc89b4a876233':
     'Delete form item value when it is hidden',
-  'cd8992b644e6c18367861a4d913fd116': 'Verification',
+  'cd8992b644e6c18367861a4d913fd116': 'Verify',
   '1040279cf7b8dbdb842f597c30095f62': 'Check API',
   '133886b10fd9721e6cf91b76f2df5b6e':
     'Separately check the API of this form item',
@@ -3252,26 +3252,36 @@ extendLocale('en-US', {
   '6006074bdabc639b86f42aa18876e33a': 'Fired when code changes',
   '28e5fd494ea37a09fd2ad36d0f98bacc': 'Deleted item',
   '046de1a6cb21ff83af74958342c0db64': 'Activated item',
-  'f6e5fc909971d2e5f6ffe23edae93584': 'If there is a lot of data and the comparison is stuck, you can turn on this configuration item',
+  'f6e5fc909971d2e5f6ffe23edae93584':
-  '31dae237cbd03ae0d2dcf7ad2fd4fb76': 'The data returned after the initial interface request is successful',
+    'If there is a lot of data and the comparison is stuck, you can turn on this configuration item',
-  '850c62f7b1ebfb4b89182ecd51202a7d': 'Triggered after the form is submitted successfully. If the event source is a button and the type of the button is "Submit", the submit success event will be triggered even if the current form is not configured with "Save Interface"',
+  '31dae237cbd03ae0d2dcf7ad2fd4fb76':
-  '88b2930823f9fd6706473805e9b11797': 'Save the data returned after the interface request is successful',
+    'The data returned after the initial interface request is successful',
-  '3e07258baf3c4389c1ffd4a98c20b8fe': 'Save the error information returned after the interface request fails',
+  '850c62f7b1ebfb4b89182ecd51202a7d':
+    'Triggered after the form is submitted successfully. If the event source is a button and the type of the button is "Submit", the submit success event will be triggered even if the current form is not configured with "Save Interface"',
+  '88b2930823f9fd6706473805e9b11797':
+    'Save the data returned after the interface request is successful',
+  '3e07258baf3c4389c1ffd4a98c20b8fe':
+    'Save the error information returned after the interface request fails',
   '0d6581b6dd51f6c03a4edf26475d75c6': 'Removed item',
   '4ea280a2e54969de1d1b9bbd5b708e63': 'Click option',
   'f05520432bb87ced419a1da818c6cc9d': 'Fired when an option is clicked',
   '91f7b7fdf9b91073ca3519260f7a62d7': 'Option clicked',
   '6afde638796d237377b0755506d08ded': 'target component',
   'fee99f2bcced486e4753a8f58f511d3f': 'Append data',
-  '3f3f4c71c1b736e7f01cf910a553ff43': 'When "Yes" is selected, the data domain variables of the source component will be synchronized to the data domain of the target component.<br/>If the target component is a CRUD component, and the data pull interface of the CRUD component is a get request, the data domain variable where the source component is located will be appended to the target component\'s initialization request query.',
+  '3f3f4c71c1b736e7f01cf910a553ff43':
+    'When "Yes" is selected, the data domain variables of the source component will be synchronized to the data domain of the target component.<br/>If the target component is a CRUD component, and the data pull interface of the CRUD component is a get request, the data domain variable where the source component is located will be appended to the target component\'s initialization request query.',
   '2aecb19ca1655d66fc80fc27a783cc9e': 'Append method',
-  'b67b01a3b9170f1daf78082cfd0df793': 'When "Merge" is selected, the data is merged into the data field of the target component.<br/>When "Override" is selected, the data will directly overwrite the data field of the target component.',
+  'b67b01a3b9170f1daf78082cfd0df793':
+    'When "Merge" is selected, the data is merged into the data field of the target component.<br/>When "Override" is selected, the data will directly overwrite the data field of the target component.',
   'bd81577a6fd4956e676cec499bb70d00': 'Merge',
-  'e09fea40f7e4abd4b2a495b315940688': 'Override',
+  'e09fea40f7e4abd4b2a495b315940688': 'Cover',
-  '9a5500b6013ec1ebf61bdf0e18452348': 'The data defaults to the data field where the source component is located, you can select "Custom" to customize the required data',
+  '9a5500b6013ec1ebf61bdf0e18452348':
-  'f30bcdccf71b19e858c37d8881d2b206': 'The data domain where the source component is located',
+    'The data defaults to the data field where the source component is located, you can select "Custom" to customize the required data',
+  'f30bcdccf71b19e858c37d8881d2b206':
+    'The data domain where the source component is located',
   'fa644cb20c66f7530d8a376d4fa6a36e': 'Component data',
-  '7d9260bd45b2e85a09398f218c25f220': 'Update the data field of the target component or the data value of the target form item',
+  '7d9260bd45b2e85a09398f218c25f220':
+    'Update the data field of the target component or the data value of the target form item',
   'e7af71fb102cc86ab3be6a2fb32b5e3f': 'Data settings',
   '77b1081c177fa3334cc93c99f0ecee75': 'Direct assignment',
   'f5c5e3d69daee06ea1606378ef466765': 'Member assignment'

packages/amis-editor/src/plugin/Avatar.tsx

@@ -96,11 +96,13 @@ export class AvatarPlugin extends BasePlugin {
                   className: 'ae-ExtendMore mb-3',
                   body: [
                     // 图标
-                    getSchemaTpl('icon', {
+                    {
-                      name: 'icon',
                       label: '图标',
+                      name: 'icon',
+                      type: 'icon-picker',
+                      className: 'fix-icon-picker-overflow',
                       visibleOn: 'data.showtype === "icon"'
-                    }),
+                    },
                     // 图片
                     getSchemaTpl('valueFormula', {
                       rendererSchema: {

packages/amis-editor/src/plugin/Breadcrumb.tsx

@@ -73,10 +73,12 @@ export class BreadcrumbPlugin extends BasePlugin {
                 name: 'href',
                 placeholder: '链接'
               },
-              getSchemaTpl('icon', {
+              {
                 name: 'icon',
-                label: '图标'
+                label: '图标',
-              })
+                type: 'icon-picker',
+                className: 'fix-icon-picker-overflow'
+              }
             ]
           }
         ]

packages/amis-editor/src/plugin/CollapseGroup.tsx

@@ -96,16 +96,18 @@ export class CollapseGroupPlugin extends BasePlugin {
                   autoFocus: false,
                   form: {
                     body: [
-                      getSchemaTpl('icon', {
+                      {
-                        name: 'expandIcon',
                         label: '图标',
+                        name: 'expandIcon',
+                        type: 'icon-picker',
+                        className: 'fix-icon-picker-overflow',
                         pipeIn: (value: any) => value?.icon,
                         pipeOut: (value: any) => ({
                           type: 'icon',
                           vendor: '',
                           icon: value
                         })
-                      })
+                      }
                     ]
                   },
                   pipeIn: (value: string) => {

packages/amis-editor/src/plugin/Form/InputTable.tsx

@@ -189,11 +189,13 @@ export class TableControlPlugin extends BasePlugin {
             visibleOn: 'data.addable',
             pipeIn: defaultValue('')
           },
-          getSchemaTpl('icon', {
+          {
             name: 'addBtnIcon',
             label: '增加按钮图标',
+            type: 'icon-picker',
+            className: 'fix-icon-picker-overflow',
             visibleOn: 'data.addable'
-          }),
+          },
           getSchemaTpl('api', {
             name: 'addApi',
             label: '新增时提交的 API',
@@ -210,11 +212,13 @@ export class TableControlPlugin extends BasePlugin {
             visibleOn: 'data.removable',
             pipeIn: defaultValue('')
           },
-          getSchemaTpl('icon', {
+          {
             name: 'deleteBtnIcon',
             label: '删除按钮图标',
+            type: 'icon-picker',
+            className: 'fix-icon-picker-overflow',
             visibleOn: 'data.removable'
-          }),
+          },
           getSchemaTpl('api', {
             name: 'deleteApi',
             label: '删除时提交的 API',
@@ -231,11 +235,13 @@ export class TableControlPlugin extends BasePlugin {
             visibleOn: 'data.editable',
             pipeIn: defaultValue('')
           },
-          getSchemaTpl('icon', {
+          {
             name: 'editBtnIcon',
             label: '编辑按钮图标',
+            type: 'icon-picker',
+            className: 'fix-icon-picker-overflow',
             visibleOn: 'data.editable'
-          }),
+          },
           getSchemaTpl('switch', {
             label: '是否可复制',
             name: 'copyable'
@@ -247,11 +253,13 @@ export class TableControlPlugin extends BasePlugin {
             visibleOn: 'data.copyable',
             pipeIn: defaultValue('')
           },
-          getSchemaTpl('icon', {
+          {
             name: 'copyBtnIcon',
             label: '复制按钮图标',
+            type: 'icon-picker',
+            className: 'fix-icon-picker-overflow',
             visibleOn: 'data.copyable'
-          }),
+          },
           getSchemaTpl('api', {
             name: 'updateApi',
             label: '修改时提交的 API',
@@ -264,11 +272,13 @@ export class TableControlPlugin extends BasePlugin {
             visibleOn: 'data.editable',
             pipeIn: defaultValue('')
           },
-          getSchemaTpl('icon', {
+          {
             name: 'confirmBtnIcon',
             label: '确认编辑按钮图标',
+            type: 'icon-picker',
+            className: 'fix-icon-picker-overflow',
             visibleOn: 'data.editable'
-          }),
+          },
           {
             type: 'input-text',
             name: 'cancelBtnLabel',
@@ -276,11 +286,13 @@ export class TableControlPlugin extends BasePlugin {
             visibleOn: 'data.editable',
             pipeIn: defaultValue('')
           },
-          getSchemaTpl('icon', {
+          {
             name: 'cancelBtnIcon',
             label: '取消编辑按钮图标',
+            type: 'icon-picker',
+            className: 'fix-icon-picker-overflow',
             visibleOn: 'data.editable'
-          }),
+          },
           getSchemaTpl('switch', {
             label: '是否可拖拽排序',
             name: 'draggable'

packages/amis-editor/src/plugin/Nav.tsx

@@ -66,10 +66,12 @@ export class NavPlugin extends BasePlugin {
           required: true
         },
 
-        getSchemaTpl('icon', {
+        {
+          type: 'icon-picker',
           name: 'icon',
-          label: '图标'
+          label: '图标',
-        }),
+          className: 'fix-icon-picker-overflow'
+        },
 
         {
           type: 'group',

packages/amis-editor/src/tpl/common.tsx

@@ -509,8 +509,9 @@ setSchemaTpl('expression', {
 
 setSchemaTpl('icon', {
   label: '图标',
-  type: 'icon-select',
+  type: 'icon-picker',
   name: 'icon',
+  className: 'fix-icon-picker-overflow',
   placeholder: '点击选择图标',
   clearable: true,
   description: ''
@@ -1046,13 +1047,31 @@ setSchemaTpl(
   'iconLink',
   (schema: {name: 'icon' | 'rightIcon'; visibleOn: boolean}) => {
     const {name, visibleOn} = schema;
-    return getSchemaTpl('icon', {
+    return {
       name: name,
       visibleOn,
       label: '图标',
+      type: 'icon-picker',
+      className: 'fix-icon-picker-overflow',
       placeholder: '点击选择图标',
       clearable: true,
       description: ''
-    });
+    };
+  }
+);
+
+setSchemaTpl(
+  'iconLink',
+  (schema: {name: 'icon' | 'rightIcon'; visibleOn: boolean}) => {
+    const {name, visibleOn} = schema;
+    return {
+      name: name,
+      visibleOn,
+      label: '图标',
+      type: 'icon-picker',
+      placeholder: '点击选择图标',
+      clearable: true,
+      description: ''
+    };
   }
 );