@zgfe/modules-page 1.0.1-alpha.3 → 1.0.1-alpha.5

package/dist/esm/components/content/index.d.ts

@@ -7,7 +7,7 @@ declare const PageContent: React.FC<{
     value?: PageColumnType[];
     groupId?: number;
     hasUserGroup?: boolean;
-    onClick?: (data: any) => void;
+    onClick?: (data: ModulesPageTypes.PageGroup | ModulesPageTypes.Page) => void;
     onEdit?: (data: ModulesPageTypes.PageGroup) => void;
     onCreate?: () => void;
 }>;

package/dist/esm/components/content/index.js

@@ -43,6 +43,7 @@ var PageContent = function PageContent(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement(BizTable, {
+    rowKey: props.type === 'pageGroup' ? 'id' : 'pageUrl',
     dataSource: props.type === 'pageGroup' ? groupList : props.value,
     columns: getColumns(props.type, props.hasUserGroup, props.onClick, props.onEdit)
   }));

package/dist/esm/components/content/utils.d.ts

@@ -1,17 +1,6 @@
-import { ColumnGroupType, ColumnType, ColumnsType } from 'antd/lib/table';
-import React from 'react';
-export declare const getColumns: (type: string, hasUserGroup?: boolean, onClickCallback?: Function, onEditCallback?: Function) => ((ColumnGroupType<object> | ColumnType<object>)[] & ColumnsType<any>) | ({
-    title: string;
-    dataIndex: string;
-    key: string;
-    render: (txt: string, record: any) => React.JSX.Element;
-    width?: undefined;
-} | {
-    title: string;
-    dataIndex: string;
-    key: string;
-    width: number;
-    render?: undefined;
-})[];
+import { ColumnsType } from 'antd/lib/table';
+import { PageColumnType } from './types';
+import { ModulesPageTypes } from '../../modules/home/types';
+export declare const getColumns: (type: string, hasUserGroup?: boolean, onClickCallback?: Function, onEditCallback?: Function) => ColumnsType<PageColumnType> | ColumnsType<ModulesPageTypes.PageGroup>;
 export declare const getNumPer: (viewUser: number, clickUser: number) => string;
 export declare const toThousands: (num?: number) => string | number | undefined;

package/dist/esm/components/content/utils.js

@@ -19,7 +19,10 @@ export var getColumns = function getColumns(type, hasUserGroup, onClickCallback,
       return /*#__PURE__*/React.createElement("div", {
         className: "table-td-page",
         onClick: function onClick() {
-          return onClickCallback && onClickCallback(record);
+          return onClickCallback && onClickCallback({
+            pageTitle: record.pageTitle,
+            pageUrl: record.pageUrl
+          });
         }
       }, /*#__PURE__*/React.createElement(Tooltip, {
         title: record.pageTitle
@@ -37,9 +40,10 @@ export var getColumns = function getColumns(type, hasUserGroup, onClickCallback,
         onClick: function onClick(e) {
           var _navigator, _navigator$clipboard;
           e.stopPropagation();
-          (_navigator = navigator) === null || _navigator === void 0 ? void 0 : (_navigator$clipboard = _navigator.clipboard) === null || _navigator$clipboard === void 0 ? void 0 : _navigator$clipboard.writeText(record.pageUrl).catch(function () {
+          if (!(record !== null && record !== void 0 && record.pageUrl)) return;
+          (_navigator = navigator) === null || _navigator === void 0 ? void 0 : (_navigator$clipboard = _navigator.clipboard) === null || _navigator$clipboard === void 0 ? void 0 : _navigator$clipboard.writeText(record === null || record === void 0 ? void 0 : record.pageUrl).catch(function () {
             var el = document.createElement('textarea');
-            el.value = record.pageUrl;
+            el.value = record.pageUrl || '';
             document.body.appendChild(el);
             el.select();
             document.execCommand('copy');
@@ -117,7 +121,7 @@ export var getColumns = function getColumns(type, hasUserGroup, onClickCallback,
     },
     showSorterTooltip: false,
     render: function render(_txt, record) {
-      return getNumPer(record.viewUser, record.clickUser);
+      return getNumPer(record.viewUser || 0, record.clickUser || 0);
     }
   }];
   if (hasUserGroup) {
@@ -140,7 +144,7 @@ export var getColumns = function getColumns(type, hasUserGroup, onClickCallback,
         onClick: function onClick() {
           return onClickCallback && onClickCallback(record);
         }
-      }, ' ', txt), /*#__PURE__*/React.createElement(IconFont, {
+      }, txt), /*#__PURE__*/React.createElement(IconFont, {
         type: "bianji1",
         onClick: function onClick() {
           return onEditCallback && onEditCallback(record);
@@ -156,7 +160,7 @@ export var getColumns = function getColumns(type, hasUserGroup, onClickCallback,
   return type === 'page' ? pageColumns : groupColumns;
 };
 export var getNumPer = function getNumPer(viewUser, clickUser) {
-  if (viewUser === -1) {
+  if (!viewUser || viewUser === -1) {
     return '-';
   }
   return viewUser ? (clickUser / viewUser * 100).toFixed(1) + '%' : 0 + '%';
@@ -166,9 +170,4 @@ export var toThousands = function toThousands(num) {
     return num === -1 ? '-' : util.toThousands(num);
   }
   return num;
-};
-var sorter = function sorter(a, b) {
-  if (a.viewUser === -1 || !a.viewUser) return 0;
-  if (b.viewUser === -1 || !b.viewUser) return 1;
-  return a.clickUser / a.viewUser - b.clickUser / b.viewUser;
 };

package/dist/esm/components/detail/index.js

@@ -88,8 +88,8 @@ var DetailContent = function DetailContent(props) {
     });
     client.onConnected(function () {
       client.emit('openAutoTrack', _objectSpread({
-        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        platform: 3
       }, props.params));
     });
     client.onError(function (err) {
@@ -131,8 +131,8 @@ var DetailContent = function DetailContent(props) {
       href: pageUrl
     });
     client.emit('updateAutoTrackParam', _objectSpread({
-      app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-      platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
+      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+      platform: 3
     }, props.params));
     //   if (timer) {
     //     clearTimeout(timer);

package/dist/esm/components/groupModal/index.d.ts

@@ -1,10 +1,6 @@
 import React from 'react';
 import './index.less';
+import { GroupModalType } from './types';
 export declare const classPrefix = "group-modal";
-declare const GroupModal: React.FC<{
-    value?: any;
-    type?: string;
-    onOk?: () => void;
-    onCancel?: () => void;
-}>;
+declare const GroupModal: React.FC<GroupModalType.Props>;
 export default GroupModal;

package/dist/esm/components/groupModal/index.js

@@ -62,13 +62,14 @@ var GroupModal = function GroupModal(props) {
     });
   }, []);
   var onDelete = function onDelete() {
+    var _props$value;
     setLoading(true);
     ajax(api.deletePageGroup, {
       method: 'post',
       data: {
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: 3,
-        id: props.value.id
+        id: (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.id
       }
     }).then(function (res) {
       if (!res) {
@@ -86,7 +87,7 @@ var GroupModal = function GroupModal(props) {
     (_refForm$current = refForm.current) === null || _refForm$current === void 0 ? void 0 : _refForm$current.submit();
   };
   var onSubmit = function onSubmit(data) {
-    var _props$value;
+    var _props$value2;
     setValidate(true);
     var flag = true;
     data.filters.forEach(function (item) {
@@ -102,16 +103,16 @@ var GroupModal = function GroupModal(props) {
       data: _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: 3,
-        id: (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.id
+        id: (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.id
       }, data)
     }).then(function (res) {
-      var _props$value3;
+      var _props$value4;
       if (!res) {
-        var _props$value2;
-        message.error("".concat((_props$value2 = props.value) !== null && _props$value2 !== void 0 && _props$value2.id ? '修改' : '创建', "\u5931\u8D25"));
+        var _props$value3;
+        message.error("".concat((_props$value3 = props.value) !== null && _props$value3 !== void 0 && _props$value3.id ? '修改' : '创建', "\u5931\u8D25"));
         return;
       }
-      message.success("".concat((_props$value3 = props.value) !== null && _props$value3 !== void 0 && _props$value3.id ? '修改' : '创建', "\u6210\u529F"));
+      message.success("".concat((_props$value4 = props.value) !== null && _props$value4 !== void 0 && _props$value4.id ? '修改' : '创建', "\u6210\u529F"));
       props.onOk && props.onOk();
     }).finally(function () {
       setLoading(false);

package/dist/esm/components/groupModal/types.d.ts

@@ -2,6 +2,8 @@ import { ModulesPageTypes } from '../../modules/home/types';
 export declare namespace GroupModalType {
     interface Props {
         value?: ModulesPageTypes.PageGroup;
+        onOk?: () => void;
+        onCancel?: () => void;
     }
     interface ItemProps {
         value?: ModulesPageTypes.ItemValue[];

package/dist/esm/components/pageSelect/types.d.ts

@@ -1,8 +1,6 @@
 export declare namespace PageSelectTypes {
     interface Props {
         value?: Value;
-        pageList?: any[];
-        pageGroupList?: any[];
         enableAdd?: boolean;
         onAdd?: () => void;
         onChange?: (data: Value) => void;

package/dist/esm/components/searchPanel/index.js

@@ -89,6 +89,7 @@ var SearchPanel = function SearchPanel(props) {
         className: "".concat(classPrefix, "-item"),
         key: field.key
       }), /*#__PURE__*/React.createElement(BizUserGroup, {
+        enableDelete: fields.length > 1,
         onDelete: function onDelete() {
           return remove(index);
         }

package/dist/esm/constants/api.js

@@ -7,5 +7,5 @@ export default {
   getPageResult: '/zg/web/v2/data/pageDataList',
   getPageEsData: '/zg/web/v2/data/queryEsData',
   download: '/zg/web/v2/data/pagedownloadReport',
-  socket: 'wss://rt2.zhugeio.com/eventtracking/ws'
+  socket: '/eventtracking/ws'
 };

package/dist/esm/modules/home/base64.d.ts

@@ -0,0 +1,23 @@
+declare const _default: {
+    _keyStr: string;
+    _utf8_encode: (string: string) => string;
+    _utf8_decode: (utftext: string) => string;
+    encode: (input: string, type?: boolean) => string;
+    decode: (input: string) => string;
+    _$: string[];
+    pw: string;
+    gString: (O6b8: {
+        [x: string]: (arg0: number) => {
+            (): any;
+            new (): any;
+            [x: string]: () => any;
+        };
+    }[], O492: {
+        [x: string]: (arg0: number) => {
+            (): any;
+            new (): any;
+            [x: string]: () => any;
+        };
+    }[]) => string;
+};
+export default _default;

package/dist/esm/modules/home/base64.js

@@ -0,0 +1,132 @@
+/**
+ * Created by yqdong on 16/3/15.
+ * qq: 1013501639
+ * @author yqdong
+ *
+ */
+export default {
+  _keyStr: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=',
+  _utf8_encode: function _utf8_encode(string) {
+    string = string.replace(/\r\n/g, '\n');
+    var utftext = '';
+    for (var n = 0; n < string.length; n++) {
+      var c = string.charCodeAt(n);
+      if (c < 128) {
+        utftext += String.fromCharCode(c);
+      } else if (c > 127 && c < 2048) {
+        utftext += String.fromCharCode(c >> 6 | 192); // jshint ignore:line
+        utftext += String.fromCharCode(c & 63 | 128); // jshint ignore:line
+      } else {
+        utftext += String.fromCharCode(c >> 12 | 224); // jshint ignore:line
+        utftext += String.fromCharCode(c >> 6 & 63 | 128); // jshint ignore:line
+        utftext += String.fromCharCode(c & 63 | 128); // jshint ignore:line
+      }
+    }
+
+    return utftext;
+  },
+  _utf8_decode: function _utf8_decode(utftext) {
+    var string = '';
+    var i = 0,
+      c = 0,
+      c2 = 0,
+      c3 = 0;
+    while (i < utftext.length) {
+      c = utftext.charCodeAt(i);
+      if (c < 128) {
+        string += String.fromCharCode(c);
+        i++;
+      } else if (c > 191 && c < 224) {
+        c2 = utftext.charCodeAt(i + 1);
+        string += String.fromCharCode((c & 31) << 6 | c2 & 63); // jshint ignore:line
+        i += 2;
+      } else {
+        c2 = utftext.charCodeAt(i + 1);
+        c3 = utftext.charCodeAt(i + 2);
+        string += String.fromCharCode((c & 15) << 12 | (c2 & 63) << 6 | c3 & 63); // jshint ignore:line
+        i += 3;
+      }
+    }
+    return string;
+  },
+  encode: function encode(input, type) {
+    var output = '';
+    var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+    var i = 0;
+    input = this._utf8_encode(input);
+    while (i < input.length) {
+      chr1 = input.charCodeAt(i++);
+      chr2 = input.charCodeAt(i++);
+      chr3 = input.charCodeAt(i++);
+      enc1 = chr1 >> 2; // jshint ignore:line
+      enc2 = (chr1 & 3) << 4 | chr2 >> 4; // jshint ignore:line
+      enc3 = (chr2 & 15) << 2 | chr3 >> 6; // jshint ignore:line
+      enc4 = chr3 & 63; // jshint ignore:line
+      if (isNaN(chr2)) {
+        enc3 = enc4 = 64;
+      } else if (isNaN(chr3)) {
+        enc4 = 64;
+      }
+      output = output + this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) + this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
+    }
+    if (type) {
+      return output.replace(/[\+]?[\/]?[\=]?/g, '');
+    } else {
+      return output.replace(/\+/g, '-');
+    }
+  },
+  decode: function decode(input) {
+    input = input.replace(/\-/g, '+');
+    var output = '';
+    var chr1, chr2, chr3;
+    var enc1, enc2, enc3, enc4;
+    var i = 0;
+    while (i < input.length) {
+      enc1 = this._keyStr.indexOf(input.charAt(i++));
+      enc2 = this._keyStr.indexOf(input.charAt(i++));
+      enc3 = this._keyStr.indexOf(input.charAt(i++));
+      enc4 = this._keyStr.indexOf(input.charAt(i++));
+      chr1 = enc1 << 2 | enc2 >> 4; // jshint ignore:line
+      chr2 = (enc2 & 15) << 4 | enc3 >> 2; // jshint ignore:line
+      chr3 = (enc3 & 3) << 6 | enc4; // jshint ignore:line
+      output = output + String.fromCharCode(chr1);
+      if (enc3 != 64) {
+        output = output + String.fromCharCode(chr2);
+      }
+      if (enc4 != 64) {
+        output = output + String.fromCharCode(chr3);
+      }
+    }
+    output = this._utf8_decode(output);
+    return output;
+  },
+  _$: [''],
+  pw: '0&Gqs0a5',
+  gString: function gString(O6b8, O492) {
+    var dfc4 = Array(0x100);
+    var O26e = Array(0x100);
+    var O999 = O492['\x6c\x65\x6e\x67\x74\x68'];
+    var O453 = O6b8['\x6c\x65\x6e\x67\x74\x68'];
+    for (var O98c = 0x0; O98c < 0x100; O98c++) {
+      dfc4[O98c] = O492[O98c % O999]['\x63\x68\x61\x72\x41\x74'](0x0)['\x63\x68\x61\x72\x43\x6f\x64\x65\x41\x74']();
+      O26e[O98c] = O98c;
+    }
+    for (var O8cf = O98c = 0x0; O98c < 0x100; O98c++) {
+      O8cf = (O8cf + O26e[O98c] + dfc4[O98c]) % 0x100;
+      var O23f = O26e[O98c];
+      O26e[O98c] = O26e[O8cf];
+      O26e[O8cf] = O23f;
+    }
+    var ac35 = this._$[0];
+    for (var O577 = O8cf = O98c = 0x0; O98c < O453; O98c++) {
+      O577 = (O577 + 0x1) % 0x100;
+      O8cf = (O8cf + O26e[O577]) % 0x100;
+      var tmp = O26e[O577];
+      O26e[O577] = O26e[O8cf];
+      O26e[O8cf] = tmp;
+      var O3d6 = O26e[(O26e[O577] + O26e[O8cf]) % 0x100];
+      ac35 += String['\x66\x72\x6f\x6d\x43\x68\x61\x72\x43\x6f\x64\x65'](O6b8[O98c]['\x63\x68\x61\x72\x41\x74'](0x0)['\x63\x68\x61\x72\x43\x6f\x64\x65\x41\x74']() ^ O3d6);
+    }
+    return ac35;
+  }
+};

package/dist/esm/modules/home/index.js

@@ -119,6 +119,7 @@ var ModulesPage = function ModulesPage(props) {
     if (type === 'page' && !(searchValue !== null && searchValue !== void 0 && searchValue.pageUrl) || type === 'pageGroup' && !(searchValue !== null && searchValue !== void 0 && searchValue.pageGroup)) {
       setPageType('list');
     }
+    if (type === 'pageGroup' && !(searchValue !== null && searchValue !== void 0 && searchValue.pageGroup)) return;
     if (type === 'page' || pageType === 'detail') {
       fetch();
     }

package/dist/esm/modules/home/types.d.ts

@@ -29,6 +29,10 @@ export declare namespace ModulesPageTypes {
         param?: string;
         id?: string;
     }
+    interface Params {
+        appId?: number | string;
+        platform: number;
+    }
 }
 export declare const ModulesPageContext: import("react").Context<{
     pageList: ModulesPageTypes.Page[];

package/dist/esm/modules/home/utils.d.ts

@@ -1,7 +1,7 @@
 import { ModulesPageTypes } from './types';
 import { AppInfoProps } from '@zgfe/business-lib/es/context';
-export declare const getPageList: (data: any, callback: Function) => void;
-export declare const getPageGroupList: (data: any, callback: Function, loadingCallback?: Function) => void;
-export declare const getPageResult: (params: any, callback: Function, loadingCallback: Function) => void;
+export declare const getPageList: (data: ModulesPageTypes.Params, callback: Function) => void;
+export declare const getPageGroupList: (data: ModulesPageTypes.Params, callback: Function, loadingCallback?: Function) => void;
+export declare const getPageResult: (params: ModulesPageTypes.Params & ModulesPageTypes.Value, callback: Function, loadingCallback: Function) => void;
 export declare const getSocketSecret: () => string;
 export declare const onDownload: (params?: ModulesPageTypes.Value, currentApp?: AppInfoProps) => void;

package/dist/esm/modules/home/utils.js

@@ -6,6 +6,8 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { ajax, util } from '@zgfe/business-lib';
 import api from "../../constants/api";
+import base64 from "./base64";
+
 // 获取页面列表
 export var getPageList = function getPageList(data, callback) {
   ajax(api.getPageList, {
@@ -83,14 +85,20 @@ export var getSocketSecret = function getSocketSecret() {
 };
 export var onDownload = function onDownload(params, currentApp) {
   if (!params || !currentApp) return;
+  var title = params.pageTitle || '页面列表';
   ajax(api.download, {
     method: 'post',
-    data: _objectSpread({
+    data: _objectSpread(_objectSpread({
       appId: currentApp.appId,
       platform: 3
-    }, params),
+    }, params), {}, {
+      down: {
+        fname: base64.encode(title),
+        titles: []
+      }
+    }),
     responseType: 'blob',
-    fileName: '页面列表',
+    fileName: title,
     getResponse: true
   }).then(function () {});
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.1-alpha.3",
+  "version": "1.0.1-alpha.5",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -39,7 +39,7 @@
     "@types/lodash": "^4.14.197",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.76-page.0",
+    "@zgfe/business-lib": "1.1.80-page.0",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "father": "^4.0.0-rc.2",
@@ -50,5 +50,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "d0b4bcb08f0d51b7d891d84c3f0b12fd466f44a5"
+  "gitHead": "0f105de940a7565e234ddfb12d91232acba43e50"
 }