sync: hosted cloud

backend-server/application/src/main/resources/sysconfig/strings.json

@@ -11755,7 +11755,7 @@
     "column": "field",
     "column_chart": "Column Chart",
     "columns_count_limit_tips": "Hey, your datasheet has exceeded the maximum ${column_limit} columns.",
-    "comfirm_close_filter_switch": "If turning off the filter, the filter conditions will be cleared afterwards",
+    "comfirm_close_filter_switch": "If you turn off the filter and sort, the conditions will be cleared",
     "comma": ",",
     "comma_style": "Separator",
     "command_add_record": " added record",
@@ -13525,6 +13525,7 @@
     "lookup_field": "Select a dimension row from ${datasheetName}",
     "lookup_field_err": "Please add a Magic Link field first",
     "lookup_filter_condition_tip": "This field type has been converted. Please confirm the filter criteria",
+    "lookup_filter_sort_description": "Add condition",
     "lookup_filter_waring": "The filter column of this field has type conversion, please check.",
     "lookup_help": "https://help.apitable.com/docs/guide/manual-field-lookup",
     "lookup_link": "Select a Magic Link field",
@@ -49720,7 +49721,7 @@
     "column": "列",
     "column_chart": "柱状图",
     "columns_count_limit_tips": "哟，你的维格表已经超过了 ${column_limit} 列的限制",
-    "comfirm_close_filter_switch": "请确定关闭筛选，关闭后筛选条件将被清空",
+    "comfirm_close_filter_switch": "关闭筛选和排序后，条件将被清空，请确定是否继续",
     "comma": "，",
     "comma_style": "千分位",
     "command_add_record": "添加了记录",

packages/core/src/config/stringkeys.interface.ts

@@ -1,7 +1,6 @@
 /* eslint-disable max-len */
 export type StringKeysMapType = {
   'ANNUAL': 'ANNUAL',
-  'Add condition': 'Add condition',
   'BIANNUAL': 'BIANNUAL',
   'CNY': 'CNY',
   'DAYS': 'DAYS',
@@ -2685,6 +2684,7 @@ export type StringKeysMapType = {
   'lookup_field': 'lookup_field',
   'lookup_field_err': 'lookup_field_err',
   'lookup_filter_condition_tip': 'lookup_filter_condition_tip',
+  'lookup_filter_sort_description': 'lookup_filter_sort_description',
   'lookup_filter_waring': 'lookup_filter_waring',
   'lookup_help': 'lookup_help',
   'lookup_link': 'lookup_link',
@@ -5039,6 +5039,8 @@ export type StringKeysMapType = {
   'upload_on_your_phone': 'upload_on_your_phone',
   'upload_success': 'upload_success',
   'url_batch_recog_failure_message': 'url_batch_recog_failure_message',
+  'url_cell_edit': 'url_cell_edit',
+  'url_jump_link': 'url_jump_link',
   'url_preview_limit_message': 'url_preview_limit_message',
   'url_preview_setting': 'url_preview_setting',
   'url_recog_failure_message': 'url_recog_failure_message',

packages/core/src/formula_parser/evaluate.ts

@@ -89,9 +89,6 @@ function resolverWrapper(context: IFormulaContext): ResolverFunction {
     }
     if (fieldBasicValueType === BasicValueType.String) {
       // TODO what if field is undefined?
-      if (field?.type === FieldType.URL) {
-        return Field.bindContext(field!, state).cellValueToURL(cellValue as any);
-      }
       return Field.bindContext(field!, state).cellValueToString(cellValue as any);
     }
     if (fieldBasicValueType === BasicValueType.Array) {

packages/core/src/model/field/url_field.ts

@@ -24,7 +24,6 @@ import { FieldType, IField, IHyperlinkSegment, ISegment, IURLField } from 'types
 import { DatasheetActions } from '../datasheet';
 import { ICellValue } from '../record';
 import { TextBaseField } from './text_base_field';
-import { Strings, t } from '../../exports/i18n';
 
 export class URLField extends TextBaseField {
   constructor(public override field: IURLField, public override state: IReduxState) {
@@ -67,36 +66,54 @@ export class URLField extends TextBaseField {
     return (cv as IHyperlinkSegment[]).map(seg => seg?.text || seg?.title).join('') || null;
   }
 
-  override cellValueToString(cellValue: ICellValue): string | null {
+  cellValueToTitle(cellValue: ICellValue): string | null {
     if (cellValue === null) {
-      return null;
+      return '';
     }
 
     const cv = [cellValue].flat();
 
     return (cv as IHyperlinkSegment[]).map(seg => seg?.title || seg?.text).join('') || null;
   }
 
-  override get openValueJsonSchema() {
-    return {
-      type: 'array',
-      title: this.field.name,
-      items: {
-        type: 'object',
-        properties: {
-          title: {
-            type: 'string',
-            title: t(Strings.robot_variables_join_url_title),
-          },
-          link: {
-            type: 'string',
-            title: t(Strings.robot_variables_join_url_link),
-          },
-        },
-      }
-    };
+  override cellValueToString(cellValue: ICellValue): string | null {
+    if (cellValue === null) {
+      return null;
+    }
+
+    const cv = [cellValue].flat();
+
+    return (cv as IHyperlinkSegment[]).map(seg => seg?.text || seg?.title).join('') || null;
   }
 
+  // TODO(kailang) https://github.com/vikadata/vikadata/issues/5253
+  // override cellValueToOpenValue(cellValue: ICellValue): any {
+  //   if (!cellValue) {
+  //     return null;
+  //   }
+  //   return cellValue[0];
+  // }
+  //
+  // override get openValueJsonSchema() {
+  //   return {
+  //     type: 'array',
+  //     title: this.field.name,
+  //     items: {
+  //       type: 'object',
+  //       properties: {
+  //         title: {
+  //           type: 'string',
+  //           title: t(Strings.robot_variables_join_url_title),
+  //         },
+  //         text: {
+  //           type: 'string',
+  //           title: t(Strings.robot_variables_join_url_link),
+  //         },
+  //       },
+  //     }
+  //   };
+  // }
+
   override validateProperty() {
     return URLField.propertySchema.validate(this.field.property);
   }

packages/core/src/modules/database/store/selectors/resource/datasheet/cell_calc.ts

@@ -105,7 +105,7 @@ export const calcCellValueAndString = ({
   const instance = Field.bindContext(field, state);
   return {
     cellValue,
-    cellStr: instance.cellValueToString(cellValue),
+    cellStr: field.type === FieldType.URL ? Field.bindContext(field, state).cellValueToTitle(cellValue) : instance.cellValueToString(cellValue),
     ignoreCache: workerCompute() ? false : !instance.isComputed,
   };
 };

packages/datasheet/public/file/langs/strings.en-US.json

@@ -1,6 +1,5 @@
 {
   "ANNUAL": "ANNUAL",
-  "Add condition": "Add condition",
   "BIANNUAL": "BIANNUAL",
   "CNY": "CNY",
   "DAYS": "Day",
@@ -356,7 +355,7 @@
   "api_params_link_field_recordids_empty_error": "field:{field} recordId value can't be empty array or null",
   "api_params_link_field_recordids_not_exists": "The linked field specifies a record ({recordId}) that does not exist",
   "api_params_link_field_records_max_count_error": "field:{field} The Magic Link field was set to receive one recordId only",
-  "api_params_lookup_can_not_operate": "Rollup field can't be edited",
+  "api_params_lookup_can_not_operate": "Lookup field can't be edited",
   "api_params_max_count_error": "{property} must contain no more than {value} elements",
   "api_params_max_error": "{property} must not be greater than {value}",
   "api_params_max_length_error": "${property}'s length must not be greater than ${value}",
@@ -914,7 +913,7 @@
   "column": "field",
   "column_chart": "Column Chart",
   "columns_count_limit_tips": "Hey, your datasheet has exceeded the maximum ${column_limit} columns.",
-  "comfirm_close_filter_switch": "If turning off the filter, the filter conditions will be cleared afterwards",
+  "comfirm_close_filter_switch": "If you turn off the filter and sort, the conditions will be cleared",
   "comma": ",",
   "comma_style": "Separator",
   "command_add_record": " added record",
@@ -1563,7 +1562,7 @@
   "field_configuration_err": "There is a configuration error in this field. Please check the formula or the configuration used by the field.",
   "field_configuration_numerical_value_format": "Format",
   "field_configuration_optional": "Optional",
-  "field_created_by_property_subscription": "Creator auto-watch data updates",
+  "field_created_by_property_subscription": "Creator auto-watch record",
   "field_created_by_property_subscription_close_tip": "After closing, the members under the creator column will automatically cancel the records they have followed",
   "field_created_by_property_subscription_open_tip": "This option only applies to newly created records",
   "field_desc": "Field description",
@@ -1627,7 +1626,7 @@
   "field_member_property_multi": "Allow adding multiple members",
   "field_member_property_notify": "Notify members once they're selected",
   "field_member_property_notify_tip": "Due to the option of 'selected members will automatically follow updates to row data' being enabled, the members under this member column will automatically cancel the following records after closing it",
-  "field_member_property_subscription": "Selected members auto-watch data updates",
+  "field_member_property_subscription": "Selected members auto-watch record",
   "field_member_property_subscription_close_tip": "After closing, the members under the member column will automatically cancel the records they have followed",
   "field_member_property_subscription_open_tip": "This option only applies to newly selected members",
   "field_name_formula": "Formula",
@@ -1677,7 +1676,7 @@
   "field_title_last_modified_by": "Last edited by",
   "field_title_last_modified_time": "Last edited time",
   "field_title_link": "Magic link",
-  "field_title_lookup": "Rollup",
+  "field_title_lookup": "Lookup",
   "field_title_member": "Member",
   "field_title_multi_select": "Multi-select",
   "field_title_number": "Number",
@@ -1841,7 +1840,7 @@
   "function_arrayflatten_example": "ARRAYFLATTEN([1, 2, \" \", 3, ],[false])\n=> [1, 2, 3 ,false]",
   "function_arrayflatten_summary": "Flattens the array by removing any array nesting. All items become elements of a single array.",
   "function_arrayjoin_example": "ARRAYJOIN(values, \"; \") ",
-  "function_arrayjoin_summary": "Join the array of rollup items into a string with a separator.",
+  "function_arrayjoin_summary": "Join the array of lookup items into a string with a separator.",
   "function_arrayunique_example": "ARRAYUNIQUE([1,2,3,3,1])\n=> \"[1,2,3]\"",
   "function_arrayunique_summary": "Returns only unique items in the array.",
   "function_associate_sheet": "Records from ${datasheetname}",
@@ -2650,7 +2649,7 @@
   "logout_warning": "Since your account managed spaces with multiple members(more than or equal to 2 members), please change the main admin to someone else on the \"Space Settings\" page before deleting the account.",
   "long_time_no_operate": "The datasheet has not been operated for a long time, please refresh the page to keep the data up-to-date~",
   "long_time_not_editor": "Loading...",
-  "lookup": "Rollup",
+  "lookup": "Lookup",
   "lookup_and": "And operation",
   "lookup_and_example": "AND(1, 1, 1, 1) => 1 ",
   "lookup_and_summary": "Returns true if all the values are true, that is, not empty",
@@ -2684,6 +2683,7 @@
   "lookup_field": "Select a dimension row from ${datasheetName}",
   "lookup_field_err": "Please add a Magic Link field first",
   "lookup_filter_condition_tip": "This field type has been converted. Please confirm the filter criteria",
+  "lookup_filter_sort_description": "Add condition",
   "lookup_filter_waring": "The filter column of this field has type conversion, please check.",
   "lookup_help": "https://help.apitable.com/docs/guide/manual-field-lookup",
   "lookup_link": "Select a Magic Link field",
@@ -4838,7 +4838,7 @@
   "test_function_modal_info_render_prompt": "After the optimized rendering mode is enabled, scrolling to view a datasheet with a large amount of data can be smoothier (the latency will be lower)",
   "test_function_modal_info_robot": "<p>Vika Robots are the guardians for your work efficiency on the Vika Planet. Human beings are meant to do more creative things! <a href=\"https://help.vika.cn/docs/guide/manual-automation-robot\" target =\"_blank\"> View documentation</a></p>\n\n<p>Example Robots:</p>\n\n<ul><li> Robot Alpha: When a record is created,  Alpha will automatically send a message to the Slack channel</li>\n\n<li>Robot Beta: When a specific form is submitted, Beta will automatically send a message to the Lark chat group</li>\n\n<li>Robot Delta: when a record meets a specific condition, Delta will automatically update another record in another datasheet </li> </ul>",
   "test_function_modal_info_view_manual_save": "<p>Conflicts often arise when members modify filtering, grouping, or sorting in the same view, as each wants to configure it to suit their needs. After enabling this feature, temporary view configuration is supported in \"Datasheet\" and \"Mirror\" to reduce conflicts. </p>\n\n<p>After this feature is enabled, it affects:</p>\n<ul>\n<li>After members in \"View\" modify the view configuration, it will only take effect temporarily for themselves. After refreshing, the default configuration will be restored. Members can choose to manually save the view configuration and sync it to other members</li>\n<li>Temporary view configurations are also supported on Mirror. Special case: The filter conditions of the source datasheet view cannot be modified in the mirror</li>\n<li>Users with \"read-only\" permission are also allowed to temporarily modify the view configuration.</li>\n<li>View configuration includes: filter, group, sort, hide fields, style, layout, field order, statistics, etc.</li>\n</ul>",
-  "test_function_modal_info_widget": "<p>As vikadata is essentially a visualized database, the widget is the best helper to quickly turn the database into different applications. Now, vikadata supports custom widgets, allowing developers to make full use of widget SDK to develop widgets that meet business scenarios and personal needs. <a href=\"https://vika.cn/developers/widget/introduction\" target=\"_blank\">See documentation</a></p>\n\n<p>Examples of custom widgets:</p>\n\n<ul><li>Cell viewer: help you easily browse data from different column types, such as Magic Link, Rollup, and Attachments</li>\n\n<li>Vika map: help you quickly render the addresses from a datasheet in a Google map </li>\n\n<li>URL preview: help you preview the webpage content from a URL</li></ul>",
+  "test_function_modal_info_widget": "<p>As vikadata is essentially a visualized database, the widget is the best helper to quickly turn the database into different applications. Now, vikadata supports custom widgets, allowing developers to make full use of widget SDK to develop widgets that meet business scenarios and personal needs. <a href=\"https://vika.cn/developers/widget/introduction\" target=\"_blank\">See documentation</a></p>\n\n<p>Examples of custom widgets:</p>\n\n<ul><li>Cell viewer: help you easily browse data from different column types, such as Magic Link, Lookup, and Attachments</li>\n\n<li>Vika map: help you quickly render the addresses from a datasheet in a Google map </li>\n\n<li>URL preview: help you preview the webpage content from a URL</li></ul>",
   "test_function_normal_modal_close_content": "Disabled. Please refresh the page.",
   "test_function_normal_modal_open_content": "Enabled. Please refresh the page.",
   "test_function_note_async_compute": "*It may cause data to be out of sync. Suggest enabling it only for non-sensitive data.",
@@ -5038,6 +5038,8 @@
   "upload_on_your_phone": "Upload from mobile",
   "upload_success": "Uploaded",
   "url_batch_recog_failure_message": "Fail to display titles of some URLs",
+  "url_cell_edit": "Customize the URL cell",
+  "url_jump_link": "Go to the URL",
   "url_preview_limit_message": "You can display title of no more than 300 URLs at a time.",
   "url_preview_setting": "Auto display title when added URL",
   "url_recog_failure_message": "Fail to display the title of URL",