@zgfe/modules-page 1.0.1-alpha.11 → 1.0.1-alpha.13

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

@@ -21,6 +21,9 @@ var PageContent = function PageContent(props) {
     }
     return data;
   }, [pageGroupList, props.groupId]);
+  var columns = useMemo(function () {
+    return getColumns(props.type, props.hasUserGroup, props.onClick, props.onEdit);
+  }, [props.type, props.hasUserGroup]);
   if (props.type === 'pageGroup' && !groupList.length) {
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-empty")
@@ -43,9 +46,8 @@ 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)
+    columns: columns
   }));
 };
 export default PageContent;

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

@@ -151,7 +151,7 @@ var GroupModal = function GroupModal(props) {
     name: "initPage",
     rules: [{
       validator: function validator(_, value) {
-        var reg = /^(?:(http|https|ftp):\/\/)?((?:[\w-]+\.)+[a-z0-9]+)((?:\/[^/?#]*)+)?(\?[^#]+)?(#.+)?$/i;
+        var reg = /^((http:\/\/)|(https:\/\/)|(\/\/))[A-Za-z0-9]/;
         if (!value || !/\S+/.test(value)) return Promise.reject("\u8BF7\u8F93\u5165\u80CC\u666F\u9875\u5730\u5740");
         if (!reg.test(value)) return Promise.reject('必须是合法的网页链接');
         return Promise.resolve();

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

@@ -123,7 +123,10 @@ var PageSelect = function PageSelect(props) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-panel-icon").concat(!props.enableAdd ? ' disabled' : ''),
     type: "shaixuan",
-    onClick: props.onAdd
+    onClick: function onClick() {
+      if (!props.enableAdd) return;
+      props.onAdd && props.onAdd();
+    }
   }))));
 };
 export default PageSelect;

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

@@ -1,5 +1,5 @@
 import React from 'react';
 import { SearchPanelProps } from './types';
 import './index.less';
-declare const SearchPanel: React.FC<SearchPanelProps>;
+declare const SearchPanel: React.ForwardRefExoticComponent<SearchPanelProps & React.RefAttributes<any>>;
 export default SearchPanel;

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

@@ -11,7 +11,7 @@ import "./index.less";
 import { BizAttrConditionGroup, BizGlobalDataContext, BizUserGroup, IconFont } from '@zgfe/business-lib';
 import PageSelect from "../pageSelect";
 import { formValue, formatValue } from "./util";
-var SearchPanel = function SearchPanel(props) {
+var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var classPrefix = 'page-search-panel';
   // form 值
   var _Form$useForm = Form.useForm(),
@@ -103,7 +103,9 @@ var SearchPanel = function SearchPanel(props) {
       className: "biz-icon",
       type: 'tianjia1'
     }), "\u6DFB\u52A0\u7528\u6237\u7FA4"));
-  }), /*#__PURE__*/React.createElement(Form.Item, {
+  }), /*#__PURE__*/React.createElement("div", {
+    ref: ref
+  }, /*#__PURE__*/React.createElement(Form.Item, {
     className: "".concat(classPrefix, "-title")
   }, " \u9875\u9762 "), /*#__PURE__*/React.createElement(Form.Item, {
     className: "".concat(classPrefix, "-item2"),
@@ -119,6 +121,6 @@ var SearchPanel = function SearchPanel(props) {
     onlyAnd: true,
     enableDelete: true,
     onConditionsCount: setCount
-  })))));
-};
+  }))))));
+});
 export default SearchPanel;

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

@@ -38,7 +38,7 @@ export var formatValue = function formatValue(source) {
     }
   });
   return {
-    userGroup: group,
+    userGroup: group.length ? group : [0],
     pageTitle: (_data$page = data.page) === null || _data$page === void 0 ? void 0 : _data$page.pageTitle,
     pageUrl: (_data$page2 = data.page) === null || _data$page2 === void 0 ? void 0 : _data$page2.pageUrl,
     pageGroup: (_data$page3 = data.page) === null || _data$page3 === void 0 ? void 0 : _data$page3.pageGroup,

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

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useContext, useEffect, useMemo, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import EmptyPanel from "../empty";
 import { BizGlobalDataContext, BizLayout } from '@zgfe/business-lib';
 import { Button, Spin } from 'antd';
@@ -22,6 +22,7 @@ import { ModulesPageContext } from "./types";
 import GroupModal from "../../components/groupModal";
 import { getPageGroupList, getPageList, getPageResult, onDownload as _onDownload } from "./utils";
 import DetailContent from "../../components/detail";
+import _ from 'lodash';
 var classPrefix = 'modules-page';
 var ModulesPage = function ModulesPage(props) {
   // 页面类型
@@ -29,58 +30,66 @@ var ModulesPage = function ModulesPage(props) {
     _useState2 = _slicedToArray(_useState, 2),
     currentType = _useState2[0],
     setCurrentType = _useState2[1];
-  // 查询条件
+  // 最新查询条件
   var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),
     searchValue = _useState4[0],
     setSearchValue = _useState4[1];
-  // 是否展示分组弹窗
-  var _useState5 = useState(false),
+  // 上一次查询条件
+  var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
-    showGroup = _useState6[0],
-    setShowGroup = _useState6[1];
-  // 页面列表
-  var _useState7 = useState([]),
+    originSearchValue = _useState6[0],
+    setOriginSearchValue = _useState6[1];
+
+  // 是否展示分组弹窗
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    pageList = _useState8[0],
-    setPageList = _useState8[1];
-  // 页面分组列表
+    showGroup = _useState8[0],
+    setShowGroup = _useState8[1];
+  // 页面列表
   var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    pageGroupList = _useState10[0],
-    setPageGroupList = _useState10[1];
-  // 查询结果
+    pageList = _useState10[0],
+    setPageList = _useState10[1];
+  // 页面分组列表
   var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    result = _useState12[0],
-    setResult = _useState12[1];
-  var _useState13 = useState(true),
+    pageGroupList = _useState12[0],
+    setPageGroupList = _useState12[1];
+  // 查询结果
+  var _useState13 = useState([]),
     _useState14 = _slicedToArray(_useState13, 2),
-    loading = _useState14[0],
-    setLoading = _useState14[1];
+    result = _useState14[0],
+    setResult = _useState14[1];
   var _useState15 = useState(true),
     _useState16 = _slicedToArray(_useState15, 2),
-    pageLoading = _useState16[0],
-    setPageLoading = _useState16[1];
-  // 要编辑的分组
-  var _useState17 = useState(),
+    loading = _useState16[0],
+    setLoading = _useState16[1];
+  var _useState17 = useState(true),
     _useState18 = _slicedToArray(_useState17, 2),
-    editGroup = _useState18[0],
-    setEditGroup = _useState18[1];
-  // 当前页面类型 list/detail
-  var _useState19 = useState('list'),
+    pageLoading = _useState18[0],
+    setPageLoading = _useState18[1];
+  // 要编辑的分组
+  var _useState19 = useState(),
     _useState20 = _slicedToArray(_useState19, 2),
-    pageType = _useState20[0],
-    setPageType = _useState20[1];
-  var _useState21 = useState(0),
+    editGroup = _useState20[0],
+    setEditGroup = _useState20[1];
+  // 当前页面类型 list/detail
+  var _useState21 = useState('list'),
     _useState22 = _slicedToArray(_useState21, 2),
-    timer = _useState22[0],
-    setTimer = _useState22[1];
-  //当前点击内容（用于同步查询条件中的内容）
-  var _useState23 = useState(),
+    pageType = _useState22[0],
+    setPageType = _useState22[1];
+  var _useState23 = useState(0),
     _useState24 = _slicedToArray(_useState23, 2),
-    currentClickPage = _useState24[0],
-    setCurrentClickPage = _useState24[1];
+    timer = _useState24[0],
+    setTimer = _useState24[1];
+  //当前点击内容（用于同步查询条件中的内容）
+  var _useState25 = useState(),
+    _useState26 = _slicedToArray(_useState25, 2),
+    currentClickPage = _useState26[0],
+    setCurrentClickPage = _useState26[1];
+  // 查询条件ref
+  var selectRef = useRef(null);
   var _useContext = useContext(BizGlobalDataContext),
     eventGroupList = _useContext.eventGroupList,
     currentApp = _useContext.currentApp;
@@ -112,7 +121,6 @@ var ModulesPage = function ModulesPage(props) {
   useEffect(function () {
     if (isEmpty) return;
     if (!searchValue) return;
-    console.log('searchValue:', searchValue);
     var type = searchValue !== null && searchValue !== void 0 && searchValue.pageGroup || (searchValue === null || searchValue === void 0 ? void 0 : searchValue.pageGroup) === 0 ? 'pageGroup' : 'page';
     setCurrentType(type);
     // 选择概览时，跳到列表页
@@ -121,7 +129,10 @@ var ModulesPage = function ModulesPage(props) {
     }
     if (type === 'pageGroup' && !(searchValue !== null && searchValue !== void 0 && searchValue.pageGroup)) return;
     if (type === 'page' || pageType === 'detail') {
-      fetch();
+      if (!_.isEqual(originSearchValue, searchValue)) {
+        setOriginSearchValue(_.cloneDeep(searchValue));
+        fetch();
+      }
     }
   }, [searchValue]);
   // 查询结果
@@ -134,7 +145,7 @@ var ModulesPage = function ModulesPage(props) {
       var param = _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: 3,
-        modules: 'page'
+        module: 'page'
       }, searchValue);
       getPageResult(param, setResult, setLoading);
     }, 500));
@@ -194,10 +205,12 @@ var ModulesPage = function ModulesPage(props) {
     title: "\u9875\u9762\u5206\u6790",
     hasCollapse: true,
     topPanel: /*#__PURE__*/React.createElement(SearchPanel, {
+      ref: selectRef,
       value: searchValue,
       onChange: onChange
     }),
-    topRender: props.onClickWarn ? render : null
+    topRender: props.onClickWarn ? render : null,
+    collapseRef: selectRef
   }, /*#__PURE__*/React.createElement(Spin, {
     spinning: pageLoading
   }, /*#__PURE__*/React.createElement(TopContent, {
@@ -212,9 +225,9 @@ var ModulesPage = function ModulesPage(props) {
     onDownload: function onDownload() {
       return _onDownload(searchValue, currentApp);
     }
-  }), /*#__PURE__*/React.createElement(Spin, {
-    spinning: loading
-  }, pageType === 'list' ? /*#__PURE__*/React.createElement(PageContent, {
+  }), loading ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-content")
+  }, /*#__PURE__*/React.createElement(Spin, null)) : pageType === 'list' ? /*#__PURE__*/React.createElement(PageContent, {
     type: currentType,
     value: result,
     groupId: searchValue === null || searchValue === void 0 ? void 0 : searchValue.pageGroup,
@@ -227,7 +240,7 @@ var ModulesPage = function ModulesPage(props) {
   }) : /*#__PURE__*/React.createElement(DetailContent, {
     params: searchValue,
     result: result
-  })), showGroup ? /*#__PURE__*/React.createElement(GroupModal, {
+  }), showGroup ? /*#__PURE__*/React.createElement(GroupModal, {
     value: editGroup,
     onCancel: function onCancel() {
       return setShowGroup(false);

package/dist/esm/modules/home/style/index.less

@@ -19,4 +19,14 @@
     border: 1px solid #ecedf0;
     border-radius: 8px;
   }
+
+  &-content {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    min-height: 300px;
+    margin-top: 60px;
+    background-color: #fff;
+  }
 }

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

@@ -4,10 +4,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 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 { ajax, util, base64 } from '@zgfe/business-lib';
 import api from "../../constants/api";
-import base64 from "./base64";
-
 // 获取页面列表
 export var getPageList = function getPageList(data, callback) {
   ajax(api.getPageList, {
@@ -91,10 +89,10 @@ export var onDownload = function onDownload(params, currentApp) {
     data: _objectSpread(_objectSpread({
       appId: currentApp.appId,
       platform: 3,
-      modules: 'page'
+      module: 'page'
     }, params), {}, {
       down: {
-        fname: base64.encode(title),
+        fname: base64.encode(title, false),
         titles: []
       }
     }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.1-alpha.11",
+  "version": "1.0.1-alpha.13",
   "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.80-page.0",
+    "@zgfe/business-lib": "1.1.81-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": "cbcc8106b272e3b033d7b63e9ad5f699f7ff7d7f"
+  "gitHead": "a7331df09d89599400b2f29f0cc0759a3f159ff5"
 }

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

@@ -1,23 +0,0 @@
-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

@@ -1,132 +0,0 @@
-/**
- * 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;
-  }
-};