diff --git a/data/bindata.go b/data/bindata.go index be045306..ff8dc740 100644 --- a/data/bindata.go +++ b/data/bindata.go @@ -217,7 +217,7 @@ func uiIndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "ui/index.html", size: 11, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "ui/index.html", size: 11, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -237,7 +237,7 @@ func xgenSetupIndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xgen/setup/index.html", size: 11, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "xgen/setup/index.html", size: 11, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -257,7 +257,7 @@ func xgenV09IndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xgen/v0.9/index.html", size: 14, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "xgen/v0.9/index.html", size: 14, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -277,7 +277,7 @@ func xgenV10IndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xgen/v1.0/index.html", size: 50, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "xgen/v1.0/index.html", size: 50, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -297,7 +297,7 @@ func xgenV10Layouts__indexAsyncJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xgen/v1.0/layouts__index.async.js", size: 71, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "xgen/v1.0/layouts__index.async.js", size: 71, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -317,7 +317,7 @@ func xgenV10UmiJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "xgen/v1.0/umi.js", size: 71, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "xgen/v1.0/umi.js", size: 71, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -337,7 +337,7 @@ func yaoApisReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/apis/README.md", size: 13, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/apis/README.md", size: 13, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -357,7 +357,7 @@ func yaoApisChartHttpJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/apis/chart.http.json", size: 624, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/apis/chart.http.json", size: 624, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -377,7 +377,7 @@ func yaoApisImportHttpJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/apis/import.http.json", size: 1676, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/apis/import.http.json", size: 1676, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -397,7 +397,7 @@ func yaoApisPageHttpJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/apis/page.http.json", size: 609, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/apis/page.http.json", size: 609, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -417,7 +417,7 @@ func yaoApisStorageHttpJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/apis/storage.http.json", size: 1026, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/apis/storage.http.json", size: 1026, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -437,7 +437,7 @@ func yaoApisTableHttpJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/apis/table.http.json", size: 3213, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/apis/table.http.json", size: 3213, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -457,7 +457,7 @@ func yaoApisUserHttpJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/apis/user.http.json", size: 1453, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/apis/user.http.json", size: 1453, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -477,7 +477,7 @@ func yaoApisXiangHttpJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/apis/xiang.http.json", size: 1239, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/apis/xiang.http.json", size: 1239, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -497,7 +497,7 @@ func yaoDataAppJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/data/app.json", size: 277, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/data/app.json", size: 277, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -517,7 +517,7 @@ func yaoDataIcons404Png() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/data/icons/404.png", size: 9342, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/data/icons/404.png", size: 9342, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -537,7 +537,7 @@ func yaoDataIconsIconIcns() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/data/icons/icon.icns", size: 67465, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/data/icons/icon.icns", size: 67465, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -557,7 +557,7 @@ func yaoDataIconsIconIco() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/data/icons/icon.ico", size: 54993, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/data/icons/icon.ico", size: 54993, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -577,7 +577,7 @@ func yaoDataIconsIconPng() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/data/icons/icon.png", size: 34558, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/data/icons/icon.png", size: 34558, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -597,12 +597,12 @@ func yaoDataIndexHtml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/data/index.html", size: 282, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/data/index.html", size: 282, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _yaoFieldsModelTransJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\xcf\x6f\xdb\x36\x14\xbe\xeb\xaf\x20\xb4\x1c\x36\xc0\x0d\x8a\x1d\x76\xf0\xad\xad\x93\x35\xc3\xda\x0e\xb5\x31\x20\x18\x76\xa0\xc4\x17\x9b\x0b\x7f\x68\x22\x15\x37\x75\xf5\xbf\x0f\xa4\x24\x4b\x54\xa4\x54\x6d\x1c\x5b\xf6\x98\x43\x22\xbd\xf7\x48\x3e\x7e\xe4\xf7\x91\x92\x98\x4d\x80\x50\x78\x87\x53\x8a\x23\x06\x2a\x9c\x22\x63\x40\x28\x8c\x25\x93\xa9\xb9\x45\x61\x92\x52\x8e\xd3\xfb\x70\x8a\xc2\x1f\x2e\x2f\x2f\x2e\x5e\xbe\x0c\x51\x1e\x20\x94\x4f\x02\x53\x18\x33\x8a\x55\xb3\xa8\xd2\x29\x15\x4b\x13\x4e\xe0\x06\x67\x4c\x87\x93\xb2\xce\x15\x4e\x3b\xcc\x1c\x08\xcd\xf8\x02\x3e\x69\xe3\xd4\xe6\x6f\xe9\x61\x52\x2c\xbb\xec\x11\x15\x65\x42\x4d\x2b\xc1\x1a\x34\xe5\xb0\xf8\x6c\x1b\x29\xef\x2a\x6f\xed\x69\x5b\x95\xc6\x3c\xa9\x5d\xf6\xb6\xf6\x8b\xfb\x2b\xa1\x61\x09\x36\x73\x5a\x5e\x3a\xde\x38\x05\x0e\x42\xab\x8e\x80\x4c\x28\xba\x14\x40\x16\x8f\x56\xa3\x38\x66\xec\xab\xee\x47\x9a\x89\xe8\xb2\xbf\xb8\x75\x0e\xc8\xf1\xb5\x53\x49\x65\xbd\xea\x0e\x9e\xb7\x52\xee\x09\xbf\x9a\xd9\x06\x49\x75\x4f\xdd\x44\xb6\x76\x02\x31\xe5\x98\x19\xe3\x0d\x93\xb8\x1e\x52\x99\x45\x0c\x1e\x98\xab\xd6\x66\x75\xb1\xca\x74\xd9\x19\xb7\xad\xa6\x33\xec\xb7\xf9\x87\xf7\xc6\xf9\x8f\x92\xa2\xb2\x99\xeb\xa8\x6d\x34\x81\xaf\xdb\xc6\x2c\xa3\xa4\x63\x56\xd3\xe4\x15\x21\x29\x28\xd5\x35\xe3\x71\xdc\xe1\xac\x29\x75\x43\x81\x91\x06\xa3\xaa\x88\xca\x60\x43\x98\xb6\xd0\x57\x16\x84\xc2\x5b\xb0\x9c\x38\xdb\x30\x1c\x01\x43\x5f\xbe\xa0\x58\x72\x83\xb6\xb9\x14\x98\x43\x5e\x26\x50\x91\xc8\xe6\xbd\x5e\x41\x0a\xe7\x67\x1b\x1b\x70\xce\xb1\x8e\x57\xcd\x30\x20\x54\x3b\xcd\x98\x79\x7f\x9f\x58\x34\xaf\x44\x92\xe9\x46\x30\x32\x62\x21\x13\x55\xea\x06\xc3\x31\xac\x24\x23\xc5\x14\x39\xfb\xfd\xc7\x84\x01\x56\x80\xa8\x29\xf6\x13\x7a\x98\x67\x5e\x08\x4b\xf1\x53\x5d\xe5\x93\x6d\x9f\x65\xca\x77\xd1\xe3\xb2\xaf\x23\xed\xa5\xc6\xc5\x5c\x7d\x8e\x6e\xde\x51\x58\xf7\x75\x73\x51\x4b\x69\xbb\x97\x8d\x74\x47\x85\x59\x50\xa6\x54\xb0\x04\x44\xc6\xf7\x41\x11\xf8\x77\xe8\xcc\x99\x03\x83\xb8\x0f\x86\x86\x11\x3d\x02\x89\xb2\x75\x74\x63\x32\x71\xeb\x90\x89\xa6\x52\x58\x4d\x39\x3b\x2f\xda\xfe\x60\x4d\x9b\xc2\x93\x87\x8d\xf8\x11\x12\xed\x58\xe1\x3a\x18\x63\xf1\x72\xf4\x60\x9d\xe6\xd0\xbb\xc2\xa3\x8b\x2d\xea\xe6\xc0\xf4\x31\x02\xfe\x2a\x05\xfc\x34\x14\x1f\x91\xe0\x16\x88\x38\xd3\x72\x4e\x3f\x43\xa1\xe9\x9c\x8a\x8f\x72\x6d\x5a\xfa\x79\x62\x76\x38\x9f\xca\xbb\x5f\x1a\xf8\x8d\x94\x46\x52\x32\x4d\x93\xde\xd5\x4a\x53\x5d\x6c\x1e\xbf\xb6\x2c\x9d\xf6\x38\xb5\xe6\xbc\x79\x88\x1a\xd5\x62\x3b\xc3\x1a\xfe\xa0\xf1\xed\xf6\xe9\xe3\x3b\x81\xfd\x06\x19\x49\x8a\xe6\xaa\x67\xca\x71\xaf\xae\x47\x83\xcf\x3e\x74\xa0\xbd\xed\x6d\x6e\x76\x07\x13\x79\xec\x88\x06\x0d\x5c\xc3\x7b\xc0\xa9\x27\xec\x16\x3e\x0b\x87\x27\xec\x4e\xf0\xf1\x84\xdd\x11\xa2\x0e\x61\x09\xd6\x7e\x85\xad\xe1\xb3\x70\x78\xc2\xee\x04\x9f\x03\x13\xb6\x18\x20\x6c\x5f\xeb\x5f\x5f\x5f\x5f\xbf\x78\xf7\xee\xc5\x6c\x16\xa2\x23\x21\xf2\x00\xa4\x1f\x10\xd9\x6f\x97\x11\x0a\xd5\x4a\xae\x17\x25\x10\xcd\x39\xf0\xf6\xed\x94\xf3\xa9\x52\xe1\xe0\x47\xc5\xff\x0f\xc1\x77\x87\xd9\x08\xdf\x2b\x77\x0b\x01\xea\xea\xdb\x88\x95\xe1\xc9\x43\xe4\xa8\x45\xfd\x09\xd2\xcb\x85\x97\x0b\x2f\x17\x5e\x2e\xda\x43\x54\xc9\x45\xa1\x17\x74\xfb\x11\x7e\x84\xdf\x86\xdf\x67\x3c\xea\x85\xf6\xc4\xbe\x10\xef\xbb\xaf\x23\x24\xe8\x77\x7e\x27\xde\x13\x72\xce\x32\xdb\x3e\xb0\xe2\xe9\xe3\xe9\xe3\xe9\x33\xfc\xb0\x85\x3d\xf3\xe4\x29\x33\x5e\xca\x0c\xdc\xb8\x0c\xff\x8c\x48\xa8\x32\x94\x31\xd9\xea\x34\x83\xe3\xdd\x46\x3e\x07\xcd\x0e\x8b\xb6\x4b\xcd\xe2\xa8\xa4\x67\xe7\x69\xb3\xd3\xf3\x6f\x9f\x78\xba\x0c\x73\x4f\x11\x7b\xa6\x79\xa6\x79\xa6\x3d\x0f\xd3\x22\x29\x19\x60\x31\x3a\x8e\x7d\xc4\x84\xca\x5f\x53\x99\xf5\x1d\x1b\x73\x61\xaa\xcf\x1b\xfe\xe5\x38\x90\xe1\xa2\xcd\xd9\x54\x3a\x9d\x5e\x08\x3b\x89\x26\x28\xbc\xc3\x2c\x83\x72\xf1\x6f\x8e\x5e\x57\xa9\x59\xb1\x57\x68\x16\xbb\xc1\x4c\x81\xf3\x22\x09\xa1\xbf\x07\x4e\xe4\x03\x51\xf9\x94\x21\x3d\x94\x36\xcc\xd7\xd4\x9d\xd4\xfd\x78\xc6\x2b\x88\x6f\x81\xfc\xd9\x00\xa9\xb5\x25\xcd\xc4\x1b\x37\xc6\x22\x32\xe9\xac\xe6\xcd\x8a\x32\x92\x82\x70\xc7\xa0\xa7\x3e\x37\xb8\x82\xfe\x5b\x64\xc2\xfe\x3f\x8e\x3f\x81\xeb\x4f\xe0\x9e\xf4\x38\x05\xd5\xef\x3c\xc8\x83\xff\x02\x00\x00\xff\xff\xe4\x28\x2e\xc4\xb9\x39\x00\x00") +var _yaoFieldsModelTransJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\x4f\x6f\xdb\x36\x14\xbf\xfb\x53\x10\x5c\x0e\x1b\xe0\x1a\xc5\x0e\x3b\xf8\xd6\xd6\xc9\x9a\x61\x6d\x87\xda\x18\x10\x0c\x3b\xd0\xe2\x8b\xcd\x85\x7f\x34\x91\x8a\x9b\xba\xfa\xee\x03\x29\xc9\x12\x15\x29\x71\x16\xc7\x96\x5d\xf6\xd0\x8a\xef\x3d\x3e\x92\x3f\xf2\xf7\x48\x9a\xaf\xeb\x01\x42\xf8\x96\x24\x8c\xcc\x39\x68\x3c\x46\x56\x80\x10\x8e\x14\x57\x89\x2d\x22\x1c\x27\x4c\x90\xe4\x0e\x8f\x11\xfe\xe1\xe2\xe2\xfc\xfc\xf5\x6b\x8c\xb2\x01\x42\xd9\x70\x60\x2b\x13\xce\x88\xae\x57\xd5\x26\x61\x72\x61\xcd\x29\x5c\x93\x94\x1b\x3c\x2c\x7c\x2e\x49\xd2\x22\x16\x40\x59\x2a\x66\xf0\xc5\x58\xa5\xb1\xff\x16\x1a\xae\xe4\xa2\x4d\x3e\x67\xb2\xe8\x50\x5d\x4a\x89\x01\xc3\x04\xcc\xbe\xba\x46\x8a\x52\xa9\xad\x34\x4d\xa9\x36\x44\xc4\x95\xca\x15\x2b\xbd\xbc\xbb\x94\x06\x16\xe0\x7a\xce\x8a\x4f\x4f\x1b\x25\x20\x40\x1a\xdd\x62\x90\x4a\xcd\x16\x12\xe8\xec\x41\x37\x5a\x10\xce\x1f\x55\x3f\xd0\xcc\x9c\x2d\xba\xab\x3b\xe5\x16\x7d\x7c\xeb\x39\x29\xa5\x97\xed\xc6\xd3\x46\x97\x3b\xcc\x2f\x27\xae\x41\x5a\x96\x99\xdf\x91\x8d\x9c\x42\xc4\x04\xe1\x56\x78\xcd\x15\xa9\xa6\x54\xa5\x73\x0e\xf7\xc4\x65\x6b\x93\xaa\x5a\x29\xba\x68\xb5\xdb\xb8\x69\x35\xfb\x6d\xfa\xe9\xa3\x55\xfe\xa3\x95\x2c\x65\xf6\x7b\xde\x14\x5a\xc3\xb7\x4d\x61\x9a\x32\xda\xb2\xaa\x59\xfc\x86\xd2\x04\xb4\x6e\x5b\xf1\x24\x6a\x51\x56\x94\xba\x66\xc0\x69\x8d\x51\xa5\x45\x29\x70\x26\xdc\x38\xe8\x4b\x09\x42\xf8\x06\x1c\x27\xce\xd6\x9c\xcc\x81\xa3\x6f\xdf\x50\xa4\x84\x45\xdb\x7e\x4a\x22\x20\x2b\x3a\x50\x92\xc8\xf5\x7b\xb5\x84\x04\x46\x67\x6b\x67\x30\x12\xc4\x44\xcb\xba\x19\x50\x66\xbc\x66\xec\xba\xbf\x8b\x1d\x9a\x97\x32\x4e\x4d\xcd\x18\xd9\x60\xa1\x62\x5d\xc4\x0d\x4e\x22\x58\x2a\x4e\xf3\x25\x72\xf6\xfb\x8f\x31\x07\xa2\x01\x31\x5b\xed\x27\x74\xbf\x9f\x59\x1e\x58\xf2\x3f\xe5\x57\x36\xdc\x8c\x59\x25\x62\x17\x23\x2e\xc6\x5a\x57\xdd\x32\x58\x59\xd7\x59\x3f\x47\x6e\x48\xbe\x7e\x5f\x72\xe8\xd5\xe0\x5c\xc8\x1d\xd6\x46\x94\xa1\x7e\xe1\x32\x28\xd0\xc9\xd9\x01\x32\x15\xfb\xa0\x06\xfc\xbb\x2d\x2f\xa6\xc0\x21\xea\x82\xa1\x26\x44\x0f\x40\xa2\x9d\x8f\x76\x4c\x86\xbe\x0f\x15\x1b\xa6\xa4\x8b\x25\x67\xa3\xbc\xed\x4f\x4e\xb4\xce\x35\x19\xae\xd9\x1f\x88\x60\xa7\x08\xd7\x3e\x58\xd9\x86\xd7\x8c\x2c\x7a\x0f\xd6\x69\x4e\xbd\x1f\x78\x4c\x7e\x34\x5d\x1f\x98\x3e\x36\x5c\xbf\x49\x80\x3c\x0f\xc5\x07\x42\x70\x03\x44\x92\x1a\x35\x65\x5f\x21\x8f\xe9\x82\xc9\xcf\x6a\x65\x5b\xfa\x79\x68\x4f\x36\x5f\x8a\xd2\x2f\x35\xfc\x7a\x4a\x23\xa5\xb8\x61\x71\xe7\x6e\x65\x98\xc9\x0f\x8d\x8f\x6d\x4b\xa7\x3d\x4f\x8d\x35\x6f\x2f\x4f\xbd\xda\x6c\x27\xc4\xc0\x1f\x2c\xba\xd9\xdc\x3a\xfe\x27\xb0\x4f\x08\x23\x71\xde\x5c\x79\x97\xec\xf7\xee\x7a\x34\xf8\x1c\xcd\x21\xb7\xef\x88\x0e\x6a\xb8\xe2\x3b\x20\x49\x20\xec\x06\x3e\x07\x47\x20\xec\x4e\xf0\x09\x84\xdd\x11\xa2\x1e\x61\x29\x31\x61\x87\xad\xe0\x73\x70\x04\xc2\xee\x04\x9f\x03\x13\x36\x9f\x20\xe2\x7e\xce\xbf\xba\xba\xba\x7a\xf5\xe1\xc3\xab\xc9\x04\xa3\x23\x21\xf2\x16\x48\xdf\x23\x72\x38\x2e\x23\x84\xf5\x52\xad\x66\x05\x10\xf5\x35\xf0\xfe\xfd\x58\x88\xb1\xd6\x78\xeb\xab\xe2\xf7\x43\xf0\xdd\x61\x76\xb0\xeb\x75\xf5\x34\xd7\x84\xab\x3d\x10\xa0\xb6\xb1\xf5\x38\x32\x3c\x7b\x8a\xbc\x68\x51\x3d\x3d\x86\x70\x11\xc2\x45\x08\x17\x21\x5c\x34\xa7\xa8\x0c\x17\x79\xbc\x60\x9b\xc7\xf7\x1e\xbe\x09\x7f\x4c\xc5\xbc\x13\xda\xe3\x7a\x19\xee\xdd\x58\x7b\x48\xd0\xa7\xf3\x6f\x9f\xc8\x79\xdb\x6c\x33\x51\x25\xd0\x27\xd0\x27\xd0\x67\xfb\x64\x0b\x97\xeb\x14\x28\xd3\x5f\xca\x6c\x79\x70\xd9\xfe\x19\x91\x32\x6d\x29\x63\x7b\x6b\x92\x14\x8e\xf7\x18\xf9\x12\x34\x3b\x2c\xda\x3e\x35\xf3\x14\xc9\xc0\xce\xd3\x66\x67\xe0\xdf\x3e\xf1\xf4\x19\xe6\x67\x0f\x07\xa6\x05\xa6\x05\xa6\xbd\x0c\xd3\xe6\x4a\x71\x20\xb2\x77\x1c\xfb\x4c\x28\x53\xbf\x26\x2a\xed\x4a\x1b\xf3\x61\xaa\xf2\x0d\xff\xf2\x14\xc8\x72\xd1\xf5\xd9\x3a\x1d\x8f\xcf\xa5\x5b\x44\x43\x84\x6f\x09\x4f\xa1\xd8\xfc\xeb\xb3\xd7\x56\x6b\x92\x9f\x15\xea\xd5\xae\x09\xd7\xe0\xfd\x90\x84\xd0\xdf\x5b\x2e\xe4\x03\x51\xf9\x94\x21\x3d\x54\x6c\x98\xae\x98\xbf\xa8\xbb\xf1\x8c\x96\x10\xdd\x00\xfd\xb3\x06\x52\xe3\x48\x9a\xca\x77\xbe\x8d\x43\x64\xd8\xea\xe6\xdd\x92\x71\x9a\x80\xf4\xe7\xa0\xc3\x9f\x6f\x5c\x42\xff\x94\x30\xe1\xfe\x1f\xce\x7e\x32\x70\xab\xf7\xed\x48\x89\x38\x75\x39\x1a\x18\x64\xa4\x28\x93\x8b\x91\xed\xc8\xe8\xdc\x96\x00\x3f\x33\x21\xb4\xd3\xfd\x04\x9c\xfb\x3d\x5d\x44\x4e\x3a\xcb\xf7\xb1\x29\xec\x3a\x3e\xed\x27\x25\xf8\xb4\x56\xc0\xa0\xfc\x3b\x1b\x64\x83\xff\x02\x00\x00\xff\xff\xfb\xb3\xf6\x5c\x6f\x3a\x00\x00") func yaoFieldsModelTransJsonBytes() ([]byte, error) { return bindataRead( @@ -617,7 +617,7 @@ func yaoFieldsModelTransJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/fields/model.trans.json", size: 14777, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/fields/model.trans.json", size: 14959, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -637,7 +637,7 @@ func yaoFlowsReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/flows/README.md", size: 12, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/flows/README.md", size: 12, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -657,7 +657,7 @@ func yaoFlowsAdminGuardFlowJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/flows/admin/guard.flow.json", size: 559, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/flows/admin/guard.flow.json", size: 559, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -677,7 +677,7 @@ func yaoFlowsMenuFlowJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/flows/menu.flow.json", size: 1045, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/flows/menu.flow.json", size: 1045, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -697,7 +697,7 @@ func yaoFlowsUserFindFlowJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/flows/user/find.flow.json", size: 328, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/flows/user/find.flow.json", size: 328, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -717,7 +717,7 @@ func yaoLangsEnUsJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/langs/en-US.json", size: 66, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/langs/en-US.json", size: 66, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -737,7 +737,7 @@ func yaoLangsZhCnGlobalYml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/langs/zh-cn/global.yml", size: 1629, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/langs/zh-cn/global.yml", size: 1629, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -757,7 +757,7 @@ func yaoLangsZhCnLoginsAdminLoginYml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/langs/zh-cn/logins/admin.login.yml", size: 94, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/langs/zh-cn/logins/admin.login.yml", size: 94, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -777,7 +777,7 @@ func yaoLangsZhCnLoginsUserLoginYml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/langs/zh-cn/logins/user.login.yml", size: 90, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/langs/zh-cn/logins/user.login.yml", size: 90, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -797,7 +797,7 @@ func yaoLangsZhHkGlobalYml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/langs/zh-hk/global.yml", size: 1629, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/langs/zh-hk/global.yml", size: 1629, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -817,7 +817,7 @@ func yaoLangsZhHkLoginsAdminLoginYml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/langs/zh-hk/logins/admin.login.yml", size: 94, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/langs/zh-hk/logins/admin.login.yml", size: 94, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -837,7 +837,7 @@ func yaoLangsZhHkLoginsUserLoginYml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/langs/zh-hk/logins/user.login.yml", size: 90, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/langs/zh-hk/logins/user.login.yml", size: 90, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -857,7 +857,7 @@ func yaoModelsReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/models/README.md", size: 15, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/models/README.md", size: 15, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -877,7 +877,7 @@ func yaoModelsMenuModJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/models/menu.mod.json", size: 2378, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/models/menu.mod.json", size: 2378, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -897,7 +897,7 @@ func yaoModelsUserModJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/models/user.mod.json", size: 8826, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/models/user.mod.json", size: 8826, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -917,7 +917,7 @@ func yaoModelsWorkflowModJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/models/workflow.mod.json", size: 3333, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/models/workflow.mod.json", size: 3333, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -937,7 +937,7 @@ func yaoTablesReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/tables/README.md", size: 15, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/tables/README.md", size: 15, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -957,7 +957,7 @@ func yaoTablesMenuTabJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/tables/menu.tab.json", size: 10471, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/tables/menu.tab.json", size: 10471, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -977,7 +977,7 @@ func yaoTablesUserTabJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "yao/tables/user.tab.json", size: 2357, mode: os.FileMode(420), modTime: time.Unix(1666927855, 0)} + info := bindataFileInfo{name: "yao/tables/user.tab.json", size: 2357, mode: os.FileMode(420), modTime: time.Unix(1668091290, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/widgets/component/component.go b/widgets/component/component.go index 482ac211..c0274248 100644 --- a/widgets/component/component.go +++ b/widgets/component/component.go @@ -36,9 +36,10 @@ func (dsl DSL) Map() map[string]interface{} { // Clone Component func (dsl *DSL) Clone() *DSL { new := DSL{ - Bind: dsl.Bind, - Type: dsl.Type, - Props: PropsDSL{}, + Bind: dsl.Bind, + Type: dsl.Type, + Compute: dsl.Compute, + Props: PropsDSL{}, } if dsl.Props != nil { for key, val := range dsl.Props { diff --git a/widgets/component/compute.go b/widgets/component/compute.go index 82ba4656..785397f0 100644 --- a/widgets/component/compute.go +++ b/widgets/component/compute.go @@ -18,6 +18,11 @@ var defaults = []CArg{ {IsExp: true, key: "id", value: nil}, } +// NewExp create a new exp CArg +func NewExp(key string) CArg { + return CArg{IsExp: true, key: key, value: nil} +} + // Value compute value func (compute *Compute) Value(data maps.MapStr, sid string, global map[string]interface{}) (interface{}, error) { diff --git a/widgets/component/handlers.go b/widgets/component/handlers.go index 8be94a33..7695c592 100644 --- a/widgets/component/handlers.go +++ b/widgets/component/handlers.go @@ -8,6 +8,7 @@ import ( var hanlders = map[string]ComputeHanlder{ "Get": Get, "Trim": Trim, + "Hide": Hide, "Concat": Concat, "QueryString": Trim, "ImagesView": Trim, @@ -55,3 +56,8 @@ func Get(args ...interface{}) (interface{}, error) { } return args[0], nil } + +// Hide value +func Hide(args ...interface{}) (interface{}, error) { + return nil, nil +} diff --git a/widgets/form/fields.go b/widgets/form/fields.go index 25307baf..191ae594 100644 --- a/widgets/form/fields.go +++ b/widgets/form/fields.go @@ -5,6 +5,7 @@ import ( "strings" "github.com/yaoapp/gou" + "github.com/yaoapp/yao/widgets/component" "github.com/yaoapp/yao/widgets/field" "github.com/yaoapp/yao/widgets/table" ) @@ -29,6 +30,20 @@ func (fields *FieldsDSL) BindModel(m *gou.Model) error { // append columns if _, has := fields.Form[formField.Key]; !has { fields.Form[formField.Key] = *formField + + // PASSWORD Fields + if col.Crypt == "PASSWORD" { + if fields.Form[formField.Key].View != nil { + fields.Form[formField.Key].View.Compute = &component.Compute{ + Process: "Hide", + Args: []component.CArg{component.NewExp("value")}, + } + } + + if fields.Form[formField.Key].Edit != nil { + fields.Form[formField.Key].Edit.Props["type"] = "password" + } + } fields.formMap[col.Name] = fields.Form[formField.Key] } } diff --git a/widgets/form/form_test.go b/widgets/form/form_test.go index c60c5a5f..127d4b2c 100644 --- a/widgets/form/form_test.go +++ b/widgets/form/form_test.go @@ -13,6 +13,7 @@ import ( "github.com/yaoapp/yao/table" "github.com/yaoapp/yao/widgets/expression" "github.com/yaoapp/yao/widgets/field" + "github.com/yaoapp/yao/widgets/test" ) func TestLoad(t *testing.T) { @@ -21,17 +22,22 @@ func TestLoad(t *testing.T) { if err != nil { t.Fatal(err) } - assert.Equal(t, 8, len(Forms)) + assert.Equal(t, 9, len(Forms)) } func prepare(t *testing.T, language ...string) { - runtime.Load(config.Conf) - i18n.Load(config.Conf) + runtime.Load(config.Conf) + err := test.LoadEngine(language...) + if err != nil { + t.Fatal(err) + } + + i18n.Load(config.Conf) share.DBConnect(config.Conf.DB) // removed later // load scripts - err := script.Load(config.Conf) + err = script.Load(config.Conf) if err != nil { t.Fatal(err) } diff --git a/widgets/login/process.go b/widgets/login/process.go index 81e3e82f..c328eac6 100644 --- a/widgets/login/process.go +++ b/widgets/login/process.go @@ -94,7 +94,7 @@ func auth(field string, value string, password string, sid string) maps.Map { err = bcrypt.CompareHashAndPassword([]byte(passwordHash), []byte(password)) if err != nil { - exception.New("登录密码错误", 403, value).Throw() + exception.New("登录密码错误 (%v)", 403, value).Throw() } expiresAt := time.Now().Unix() + 3600 diff --git a/widgets/table/fields.go b/widgets/table/fields.go index e8b96fd9..6db2e5e6 100644 --- a/widgets/table/fields.go +++ b/widgets/table/fields.go @@ -5,6 +5,7 @@ import ( "strings" "github.com/yaoapp/gou" + "github.com/yaoapp/yao/widgets/component" "github.com/yaoapp/yao/widgets/field" ) @@ -33,6 +34,21 @@ func (fields *FieldsDSL) BindModel(m *gou.Model) error { // append columns if _, has := fields.Table[tableField.Key]; !has { fields.Table[tableField.Key] = *tableField + + // PASSWORD Fields + if col.Crypt == "PASSWORD" { + if fields.Table[tableField.Key].View != nil { + fields.Table[tableField.Key].View.Compute = &component.Compute{ + Process: "Hide", + Args: []component.CArg{component.NewExp("value")}, + } + } + + if fields.Table[tableField.Key].Edit != nil { + fields.Table[tableField.Key].Edit.Props["type"] = "password" + } + } + fields.tableMap[col.Name] = fields.Table[tableField.Key] } diff --git a/widgets/table/table_test.go b/widgets/table/table_test.go index 0f38e181..bf093c5c 100644 --- a/widgets/table/table_test.go +++ b/widgets/table/table_test.go @@ -23,7 +23,7 @@ func TestLoad(t *testing.T) { if err != nil { t.Fatal(err) } - assert.Equal(t, 10, len(Tables)) + assert.Equal(t, 11, len(Tables)) } func TestLoadID(t *testing.T) { diff --git a/widgets/widgets_test.go b/widgets/widgets_test.go index 2046f19d..7cf5b1f2 100644 --- a/widgets/widgets_test.go +++ b/widgets/widgets_test.go @@ -10,6 +10,7 @@ import ( "github.com/yaoapp/yao/runtime" "github.com/yaoapp/yao/script" "github.com/yaoapp/yao/share" + "github.com/yaoapp/yao/widgets/test" ) func TestLoad(t *testing.T) { @@ -19,12 +20,18 @@ func TestLoad(t *testing.T) { } func prepare(t *testing.T, language ...string) { + + err := test.LoadEngine(language...) + if err != nil { + t.Fatal(err) + } + runtime.Load(config.Conf) i18n.Load(config.Conf) share.DBConnect(config.Conf.DB) // removed later // load scripts - err := script.Load(config.Conf) + err = script.Load(config.Conf) if err != nil { t.Fatal(err) } diff --git a/yao/fields/model.trans.json b/yao/fields/model.trans.json index cc8d9efe..cf074490 100644 --- a/yao/fields/model.trans.json +++ b/yao/fields/model.trans.json @@ -48,6 +48,7 @@ "form": { "key": "${label || comment || name}", "bind": "${name}", + "view": {}, "edit": { "type": "Input", "props": { "placeholder": "$L(please input) ${label || comment}" } @@ -56,10 +57,7 @@ "table": { "key": "${label || comment || name}", "bind": "${name}", - "view": { - "type": "Text", - "props": {} - }, + "view": { "type": "Text", "props": {} }, "edit": { "type": "Input", "props": { "placeholder": "$L(please input) ${label || comment}" } @@ -540,8 +538,10 @@ "form": { "key": "${label || comment || name}", "bind": "${name}", + "view": { "compute": "encoding.json.Encode" }, "edit": { "type": "TextArea", + "compute": "encoding.json.Decode", "props": { "placeholder": "$L(please input) ${label || comment}", "autoSize": { "minRows": 2, "maxRows": 6 } @@ -553,10 +553,12 @@ "bind": "${name}", "view": { "type": "Tooltip", + "compute": "encoding.json.Encode", "props": { "title": "${label || comment}" } }, "edit": { "type": "TextArea", + "compute": "encoding.json.Decode", "props": { "placeholder": "$L(please input) ${label || comment}", "autoSize": { "minRows": 2, "maxRows": 6 }